summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-04-04 11:16:29 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-04-04 11:16:29 +0000
commit4ac08e240a8b70d239bb2fed6f0d1a09f8da3038 (patch)
tree86c1fd714dabc83b8d8d8ce4eb1cf22c8ac7d8c7 /usr/src
parent7ab3f5348d729755d5a5fe1c679174b62ec4861e (diff)
parent9bba04fed2291aa884d1da64bc62150d5562cc5b (diff)
downloadillumos-joyent-4ac08e240a8b70d239bb2fed6f0d1a09f8da3038.tar.gz
[illumos-gate merge]
commit 9bba04fed2291aa884d1da64bc62150d5562cc5b 9350 ypcmd: this statement may fall through
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/ypcmd/ypupdated/openchild.c29
-rw-r--r--usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c67
2 files changed, 31 insertions, 65 deletions
diff --git a/usr/src/cmd/ypcmd/ypupdated/openchild.c b/usr/src/cmd/ypcmd/ypupdated/openchild.c
index 38f9a49cb2..d8fecb7d48 100644
--- a/usr/src/cmd/ypcmd/ypupdated/openchild.c
+++ b/usr/src/cmd/ypcmd/ypupdated/openchild.c
@@ -32,12 +32,6 @@
* under license from the Regents of the University of California.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "%Z%%M% %I% %E% SMI";
-#endif
-
/*
* openchild.c
*
@@ -46,29 +40,17 @@ static char sccsid[] = "%Z%%M% %I% %E% SMI";
* interface, but for internal use only!
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
-extern void *malloc();
-extern char *strrchr();
-
-static char *basename();
+static char *basename(char *);
static char SHELL[] = "/bin/sh";
-extern int close();
-extern int dup();
-extern int execl();
-extern void exit();
-extern long fork();
-extern int pipe();
-extern unsigned int strlen();
-
/*
* returns pid, or -1 for failure
*/
int
-_openchild(command, fto, ffrom)
- char *command;
- FILE **fto;
- FILE **ffrom;
+_openchild(char *command, FILE **fto, FILE **ffrom)
{
int i;
int pid;
@@ -139,8 +121,7 @@ printf("openchild: error1");
}
static char *
-basename(path)
- char *path;
+basename(char *path)
{
char *p;
diff --git a/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c b/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c
index c38ad78523..0eed1a744b 100644
--- a/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c
+++ b/usr/src/cmd/ypcmd/ypupdated/rpc.ypupdated.c
@@ -32,6 +32,7 @@
#include <sys/time.h>
#include <sys/file.h>
#include <ctype.h>
+#define PORTMAP
#include <rpc/rpc.h>
#include <rpc/auth_des.h>
#include <sys/socket.h>
@@ -54,20 +55,16 @@
char YPDIR[] = "/var/yp";
char UPDATEFILE[] = "updaters";
-void ypupdate_prog();
-void detachfromtty();
+void ypupdate_prog(struct svc_req *rqstp, SVCXPRT *transp);
+void detachfromtty(void);
static int addr2netname(char *, SVCXPRT *);
-static int issock();
+static int issock(int);
int insecure;
-extern SVCXPRT *svctcp_create(int, uint_t, uint_t);
-extern SVCXPRT *svcudp_create();
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
char *cmd;
int connmaxrec = RPC_MAXDATASIZE;
@@ -81,7 +78,7 @@ main(argc, argv)
*/
if (stat(NTOL_MAP_FILE, &filestat) != -1) {
fprintf(stderr, "rpc.updated not supported in NIS to LDAP "
- "transition mode.");
+ "transition mode.");
exit(1);
}
@@ -101,6 +98,7 @@ main(argc, argv)
insecure = 0;
break;
}
+ /* FALLTHROUGH */
default:
fprintf(stderr, "%s: warning -- options ignored\n", cmd);
break;
@@ -129,7 +127,7 @@ main(argc, argv)
exit(1);
}
if (!svc_register(transp, YPU_PROG, YPU_VERS, ypupdate_prog,
- proto)) {
+ proto)) {
fprintf(stderr, "%s: couldn't register service\n", cmd);
exit(1);
}
@@ -157,8 +155,7 @@ main(argc, argv)
* Determine if a descriptor belongs to a socket or not
*/
static int
-issock(fd)
- int fd;
+issock(int fd)
{
struct stat st;
@@ -170,7 +167,7 @@ issock(fd)
void
-detachfromtty()
+detachfromtty(void)
{
int tt;
@@ -197,9 +194,7 @@ detachfromtty()
}
void
-ypupdate_prog(rqstp, transp)
- struct svc_req *rqstp;
- SVCXPRT *transp;
+ypupdate_prog(struct svc_req *rqstp, SVCXPRT *transp)
{
struct ypupdate_args args;
uint_t rslt;
@@ -208,6 +203,9 @@ ypupdate_prog(rqstp, transp)
char namebuf[MAXNETNAMELEN+1];
struct authunix_parms *aup;
+ CTASSERT(sizeof (struct authdes_cred) <= RQCRED_SIZE);
+ CTASSERT(sizeof (struct authunix_parms) <= RQCRED_SIZE);
+
switch (rqstp->rq_proc) {
case NULLPROC:
svc_sendreply(transp, xdr_void, NULL);
@@ -229,13 +227,10 @@ ypupdate_prog(rqstp, transp)
return;
}
- CTASSERT(sizeof (struct authdes_cred) <= RQCRED_SIZE);
- CTASSERT(sizeof (struct authunix_parms) <= RQCRED_SIZE);
-
switch (rqstp->rq_cred.oa_flavor) {
case AUTH_DES:
netname = ((struct authdes_cred *)
- rqstp->rq_clntcred)->adc_fullname.name;
+ rqstp->rq_clntcred)->adc_fullname.name;
break;
case AUTH_UNIX:
if (insecure) {
@@ -251,6 +246,7 @@ ypupdate_prog(rqstp, transp)
netname = namebuf;
break;
}
+ /* FALLTHROUGH */
default:
svcerr_weakauth(transp);
return;
@@ -261,8 +257,8 @@ ypupdate_prog(rqstp, transp)
return;
}
rslt = update(netname,
- args.mapname, op, args.key.yp_buf_len, args.key.yp_buf_val,
- args.datum.yp_buf_len, args.datum.yp_buf_val);
+ args.mapname, op, args.key.yp_buf_len, args.key.yp_buf_val,
+ args.datum.yp_buf_len, args.datum.yp_buf_val);
if (!svc_sendreply(transp, xdr_u_int, (const caddr_t)&rslt)) {
debug("svc_sendreply failed");
}
@@ -277,14 +273,8 @@ ypupdate_prog(rqstp, transp)
* if there is no access violation.
*/
int
-update(requester, mapname, op, keylen, key, datalen, data)
- char *requester;
- char *mapname;
- uint_t op;
- uint_t keylen;
- char *key;
- uint_t datalen;
- char *data;
+update(char *requester, char *mapname, uint_t op, uint_t keylen, char *key,
+ uint_t datalen, char *data)
{
char updater[MAXMAPNAMELEN + 40];
FILE *childargs;
@@ -306,7 +296,7 @@ update(requester, mapname, op, keylen, key, datalen, data)
/* check to see if we have a valid mapname */
strncpy(fake_key, "junk", 4);
err = yp_match(default_domain, mapname,
- fake_key, strlen(fake_key), &outval, &outval_len);
+ fake_key, strlen(fake_key), &outval, &outval_len);
switch (err) {
case 0:
case YPERR_KEY:
@@ -353,17 +343,15 @@ update(requester, mapname, op, keylen, key, datalen, data)
}
#if 0
-addr2netname(namebuf, addr)
- char *namebuf;
- struct sockaddr_in *addr;
+addr2netname(char *namebuf, struct sockaddr_in *addr)
{
struct hostent *h;
h = gethostbyaddr((const char *) &addr->sin_addr,
- sizeof (addr->sin_addr), AF_INET);
+ sizeof (addr->sin_addr), AF_INET);
if (h == NULL) {
host2netname(namebuf, (const char *) inet_ntoa(addr->sin_addr),
- NULL);
+ NULL);
} else {
host2netname(namebuf, h->h_name, NULL);
}
@@ -372,9 +360,7 @@ addr2netname(namebuf, addr)
static int
-addr2netname(namebuf, transp)
- char *namebuf;
- SVCXPRT *transp;
+addr2netname(char *namebuf, SVCXPRT *transp)
{
struct nd_hostservlist *hostservs = NULL;
struct netconfig *nconf;
@@ -383,8 +369,7 @@ addr2netname(namebuf, transp)
who = svc_getrpccaller(transp);
if ((who == NULL) || (who->len == 0))
return (-1);
- if ((nconf = getnetconfigent(transp->xp_netid))
- == (struct netconfig *)NULL)
+ if ((nconf = getnetconfigent(transp->xp_netid)) == NULL)
return (-1);
if (netdir_getbyaddr(nconf, &hostservs, who) != 0) {
(void) freenetconfigent(nconf);