12791 rpcgen: if main is not provided, _svcstate_lock should be extern

Reviewed by: Yuri Pankov <ypankov@tintri.com>
Approved by: Dan McDonald <danmcd@joyent.com>

5 files changed, 32 insertions, 46 deletions

diff --git a/usr/src/cmd/fm/fmd/common/fmd_main.c b/usr/src/cmd/fm/fmd/common/fmd_main.c
index d096b8bdbf..befc5fe6b0 100644
--- a/usr/src/cmd/fm/fmd/common/fmd_main.c
+++ b/usr/src/cmd/fm/fmd/common/fmd_main.c
@@ -46,6 +46,7 @@
 #include <fmd.h>
 
 fmd_t fmd;
+mutex_t _svcstate_lock = ERRORCHECKMUTEX;
 
 /*
  * For DEBUG builds, we define a set of hooks for libumem that provide useful
diff --git a/usr/src/cmd/gss/gssd/gssd.c b/usr/src/cmd/gss/gssd/gssd.c
index f49fc4cf26..9b9e1e5546 100644
--- a/usr/src/cmd/gss/gssd/gssd.c
+++ b/usr/src/cmd/gss/gssd/gssd.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Usermode daemon which assists the kernel when handling gssapi calls.
  * It is gssd that actually implements all gssapi calls.
@@ -62,7 +60,7 @@ extern int  svc_create_local_service();
 int _rpcpmstart = 0;		/* Started by a port monitor ? */
 int _rpcfdtype;			/* Whether Stream or Datagram ? */
 int _rpcsvcdirty;		/* Still serving ? */
-
+mutex_t _svcstate_lock = ERRORCHECKMUTEX;
 
 static void
 /* LINTED */
@@ -83,17 +81,14 @@ catch_hup(int sig_num)
 	syslog(LOG_INFO,
 	    "catch_hup: read gsscred.conf opts");
 	if (gssd_debug)
-		(void) fprintf(stderr,
-			"catch_hup: read gsscred.conf opts");
+		(void) fprintf(stderr, "catch_hup: read gsscred.conf opts");
 
 	(void) sigprocmask(SIG_SETMASK, &old_set, NULL);
 }
 
 
 int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
 {
 	register SVCXPRT *transp;
 	int maxrecsz = RPC_MAXDATASIZE;
@@ -105,7 +100,6 @@ char **argv;
 	setlocale(LC_ALL, "");
 	textdomain(TEXT_DOMAIN);
 
-
 	/*
 	 * Take special note that "getuid()" is called here.  This call is used
 	 * rather than app_krb5_user_uid(), to ensure gssd(1M) is running as
@@ -116,7 +110,7 @@ char **argv;
 #endif /* DEBUG */
 	if (getuid()) {
 		(void) fprintf(stderr,
-			gettext("[%s] must be run as root\n"), argv[0]);
+		    gettext("[%s] must be run as root\n"), argv[0]);
 #ifdef DEBUG
 		(void) fprintf(stderr, gettext(" warning only\n"));
 #else /* DEBUG */
@@ -128,11 +122,11 @@ char **argv;
 
 	while ((c = getopt(argc, argv, "d")) != -1)
 		switch (c) {
-		    case 'd':
+		case 'd':
 			/* turn on debugging */
 			gssd_debug = 1;
 			break;
-		    default:
+		default:
 			usage();
 		}
 
@@ -147,9 +141,8 @@ char **argv;
 	 * Started by inetd if name of module just below stream
 	 * head is either a sockmod or timod.
 	 */
-	if (!ioctl(0, I_LOOK, mname) &&
-		((strcmp(mname, "sockmod") == 0) ||
-			(strcmp(mname, "timod") == 0))) {
+	if (!ioctl(0, I_LOOK, mname) && ((strcmp(mname, "sockmod") == 0) ||
+	    (strcmp(mname, "timod") == 0))) {
 
 		char *netid;
 		struct netconfig *nconf;
@@ -168,14 +161,14 @@ char **argv;
 		if (strcmp(mname, "sockmod") == 0) {
 			if (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, "timod")) {
 				syslog(LOG_ERR,
-					gettext("could not get the "
-						"right module"));
+				    gettext("could not get the "
+				    "right module"));
 				exit(1);
 			}
 		}
 		if (!rpc_control(RPC_SVC_CONNMAXREC_SET, &maxrecsz)) {
 			syslog(LOG_ERR,
-				gettext("unable to set RPC max record size"));
+			    gettext("unable to set RPC max record size"));
 			exit(1);
 		}
 		/* XXX - is nconf even needed here? */
@@ -190,8 +183,8 @@ char **argv;
 		 */
 		if (!svc_reg(transp, GSSPROG, GSSVERS, gssprog_1, NULL)) {
 			syslog(LOG_ERR,
-				gettext("unable to register "
-					"(GSSPROG, GSSVERS)"));
+			    gettext("unable to register "
+			    "(GSSPROG, GSSVERS)"));
 			exit(1);
 		}
 
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.c b/usr/src/cmd/idmap/idmapd/idmapd.c
index cec90531bd..51db388832 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.c
+++ b/usr/src/cmd/idmap/idmapd/idmapd.c
@@ -69,6 +69,7 @@ extern void	init_dc_locator(void);
 extern void	fini_dc_locator(void);
 
 idmapd_state_t	_idmapdstate;
+mutex_t _svcstate_lock = ERRORCHECKMUTEX;
 
 SVCXPRT *xprt = NULL;
 
@@ -308,8 +309,6 @@ main(int argc, char **argv)
 			    rl.rlim_cur);
 	}
 
-	(void) mutex_init(&_svcstate_lock, USYNC_THREAD, NULL);
-
 	if (_idmapdstate.daemon_mode == TRUE) {
 		if (daemonize_start() < 0) {
 			idmapdlog(LOG_ERR, "unable to daemonize");
diff --git a/usr/src/cmd/krb5/kwarn/kwarnd.c b/usr/src/cmd/krb5/kwarn/kwarnd.c
index 87a7a49130..34355b4143 100644
--- a/usr/src/cmd/krb5/kwarn/kwarnd.c
+++ b/usr/src/cmd/krb5/kwarn/kwarnd.c
@@ -30,8 +30,6 @@
  * the code in this file was borrowed from gssd.c
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <rpc/rpc.h>
 #include <sys/syslog.h>
@@ -66,17 +64,16 @@ extern bool_t loadConfigFile(void);
 int _rpcpmstart = 0;		/* Started by a port monitor ? */
 int _rpcfdtype;			/* Whether Stream or Datagram ? */
 int _rpcsvcdirty;		/* Still serving ? */
+mutex_t _svcstate_lock = ERRORCHECKMUTEX;
 
 char myhostname[MAXHOSTNAMELEN] = {0};
 char progname[MAXNAMELEN] = {0};
 
 
 int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
 {
-	register SVCXPRT *transp;
+	SVCXPRT *transp;
 	extern int optind;
 	int c;
 	char mname[FMNAMESZ + 1];
@@ -103,7 +100,7 @@ char **argv;
 #endif /* DEBUG */
 	if (getuid()) {
 		(void) fprintf(stderr,
-			gettext("[%s] must be run as root\n"), argv[0]);
+		    gettext("[%s] must be run as root\n"), argv[0]);
 #ifdef DEBUG
 		(void) fprintf(stderr, gettext(" warning only\n"));
 #else /* !DEBUG */
@@ -113,11 +110,11 @@ char **argv;
 
 	while ((c = getopt(argc, argv, "d")) != -1)
 		switch (c) {
-		    case 'd':
+		case 'd':
 			/* turn on debugging */
 			kwarnd_debug = 1;
 			break;
-		    default:
+		default:
 			usage();
 		}
 
@@ -131,10 +128,8 @@ char **argv;
 	 * Started by inetd if name of module just below stream
 	 * head is either a sockmod or timod.
 	 */
-	if (!ioctl(0, I_LOOK, mname) &&
-		((strcmp(mname, "sockmod") == 0) ||
-			(strcmp(mname, "timod") == 0))) {
-
+	if (!ioctl(0, I_LOOK, mname) && ((strcmp(mname, "sockmod") == 0) ||
+	    (strcmp(mname, "timod") == 0))) {
 		char *netid;
 		struct netconfig *nconf;
 
@@ -151,9 +146,8 @@ char **argv;
 
 		if (strcmp(mname, "sockmod") == 0) {
 			if (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, "timod")) {
-				syslog(LOG_ERR,
-					gettext("could not get the "
-						"right module"));
+				syslog(LOG_ERR, gettext("could not get the "
+				    "right module"));
 				exit(1);
 			}
 		}
@@ -169,9 +163,8 @@ char **argv;
 		 * registered with rpcbind.
 		 */
 		if (!svc_reg(transp, KWARNPROG, KWARNVERS, kwarnprog_1, NULL)) {
-			syslog(LOG_ERR,
-				gettext("unable to register "
-					"(KWARNPROG, KWARNVERS)"));
+			syslog(LOG_ERR, gettext("unable to register "
+			    "(KWARNPROG, KWARNVERS)"));
 			exit(1);
 		}
 
@@ -200,11 +193,10 @@ char **argv;
 	(void) signal(SIGCHLD, SIG_IGN);
 
 	if (thr_create(NULL, 0,
-			(void *(*)(void *))kwarnd_check_warning_list, NULL,
-			THR_DETACHED | THR_DAEMON | THR_NEW_LWP,
-			NULL)) {
+	    (void *(*)(void *))kwarnd_check_warning_list, NULL,
+	    THR_DETACHED | THR_DAEMON | THR_NEW_LWP, NULL)) {
 		syslog(LOG_ERR,
-			gettext("unable to create cache_cleanup thread"));
+		    gettext("unable to create cache_cleanup thread"));
 		exit(1);
 	}
 
diff --git a/usr/src/cmd/rpcgen/rpc_svcout.c b/usr/src/cmd/rpcgen/rpc_svcout.c
index e9cdbb46e9..27e1588019 100644
--- a/usr/src/cmd/rpcgen/rpc_svcout.c
+++ b/usr/src/cmd/rpcgen/rpc_svcout.c
@@ -136,7 +136,8 @@ write_most(char *infile, int netflag, int nomain)
 "\t\t/* Number of requests being serviced */\n");
 
 			if (mtflag) {
-				f_print(fout, "mutex_t _svcstate_lock;");
+				f_print(fout, "%smutex_t _svcstate_lock;",
+				    nomain? "extern " : "");
 				f_print(fout,
 "\t\t/* lock for _rpcsvcstate, _rpcsvccount */\n");