From 49e7ca4919cec3229f6fab9730bafc7cf24dab23 Mon Sep 17 00:00:00 2001
From: peteh <none@none>
Date: Fri, 30 Sep 2005 09:44:20 -0700
Subject: 6271225 gcc and cmd/keyserv don't get along 6273831 gcc and
 cmd/rpcsvc don't get along

---
 usr/src/cmd/keyserv/newkey.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'usr/src/cmd/keyserv/newkey.c')

diff --git a/usr/src/cmd/keyserv/newkey.c b/usr/src/cmd/keyserv/newkey.c
index e746705d32..93861cc0af 100644
--- a/usr/src/cmd/keyserv/newkey.c
+++ b/usr/src/cmd/keyserv/newkey.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -82,10 +82,10 @@ static	char YPDBPATH[] = "/var/yp";
 static	char PKMAP[] = "publickey.byname";
 static	char UPDATEFILE[] = "updaters";
 static	char PKFILE[] = "/etc/publickey";
+static	void usage(void);
 
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 	char	name[MAXNETNAMELEN + 1];
 	char	public[HEXKEYBYTES + 1];
@@ -259,13 +259,13 @@ main(argc, argv)
 		}
 		exit(1);
 	}
-	exit(0);
-	/* NOTREACHED */
+	return (0);
 }
 
 /*
  * Set the entry in the public key file
  */
+int
 setpublicmap(name, public, secret, database, nis_princ, pw)
 	int database;
 	char *name;
@@ -322,7 +322,8 @@ setpublicmap(name, public, secret, database, nis_princ, pw)
 	return (1);
 }
 
-usage()
+void
+usage(void)
 {
 	(void) fprintf(stderr,
 		"usage:\t%s -u username [-s ldap | nisplus | nis | files]\n",
-- 
cgit v1.2.3