xntpd version 3.3z from UDel

9 files changed, 51 insertions, 51 deletions

diff --git a/usr.sbin/xntpd/authstuff/authspeed.c b/usr.sbin/xntpd/authstuff/authspeed.c
index 05af132..c83d5b2 100644
--- a/usr.sbin/xntpd/authstuff/authspeed.c
+++ b/usr.sbin/xntpd/authstuff/authspeed.c
@@ -65,12 +65,12 @@ char *argv[];
 	int loops;
 	int i;
 	int errflg = 0;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
 	loops = DEFLOOPS;
-	while ((c = getopt_l(argc, argv, "cdmn:")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "cdmn:")) != EOF)
 		switch (c) {
 		case 'c':
 			totalcost++;
@@ -82,11 +82,11 @@ char *argv[];
 			domd5 = 16;	/* offset into list of keys */
 			break;
 		case 'n':
-			loops = atoi(optarg);
+			loops = atoi(ntp_optarg);
 			if (loops <= 0) {
 				(void) fprintf(stderr, 
 			"%s: %s is unlikely to be a useful number of loops\n",
-				    progname, optarg);
+					       progname, ntp_optarg);
 				errflg++;
 			}
 			break;
@@ -94,7 +94,7 @@ char *argv[];
 			errflg++;
 			break;
 		}
-	if (errflg || optind == argc) {
+	if (errflg || ntp_optind == argc) {
 		(void) fprintf(stderr,
 		    "usage: %s [-d] [-n loops] [ -c ] auth.samplekeys\n",
 		    progname);
@@ -108,7 +108,7 @@ char *argv[];
 	printf(" based authentication.\n");
 
 	init_auth();
-	authreadkeys(argv[optind]);
+	authreadkeys(argv[ntp_optind]);
 	for (i = 0; i < 16; i++) {
 		if (!auth_havekey(i + domd5)) {
 			errflg++;
diff --git a/usr.sbin/xntpd/authstuff/keyparity.c b/usr.sbin/xntpd/authstuff/keyparity.c
index 45a7061..424fade 100644
--- a/usr.sbin/xntpd/authstuff/keyparity.c
+++ b/usr.sbin/xntpd/authstuff/keyparity.c
@@ -49,11 +49,11 @@ char *argv[];
 	int errflg = 0;
 	int keytype;
 	U_LONG key[2];
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
-	while ((c = getopt_l(argc, argv, "adno:s")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "adno:s")) != EOF)
 		switch (c) {
 		case 'a':
 			asciiflag = 1;
@@ -68,10 +68,10 @@ char *argv[];
 			stdflag = 1;
 			break;
 		case 'o':
-			if (*optarg == 'n') {
+			if (*ntp_optarg == 'n') {
 				ntpoutflag = 1;
 				gotoopt = 1;
-			} else if (*optarg == 's') {
+			} else if (*ntp_optarg == 's') {
 				ntpoutflag = 0;
 				gotoopt = 1;
 			} else {
@@ -85,7 +85,7 @@ char *argv[];
 			errflg++;
 			break;
 		}
-	if (errflg || optind == argc) {
+	if (errflg || ntp_optind == argc) {
 		(void) fprintf(stderr,
 		    "usage: %s -n|-s [-a] [-o n|s] key [...]\n",
 		    progname);
@@ -118,11 +118,11 @@ char *argv[];
 	else
 		keytype = KEY_TYPE_STD;
 
-	for (; optind < argc; optind++) {
-		if (!decodekey(keytype, argv[optind], key)) {
+	for (; ntp_optind < argc; ntp_optind++) {
+		if (!decodekey(keytype, argv[ntp_optind], key)) {
 			(void) fprintf(stderr,
 			    "%s: format of key %s invalid\n",
-			    progname, argv[optind]);
+			    progname, argv[ntp_optind]);
 			exit(1);
 		}
 		(void) parity(key);
@@ -242,7 +242,7 @@ decodekey(keytype, str, key)
 		/*
 		 * Make up key from ascii representation
 		 */
-		bzero(keybytes, sizeof(keybytes));
+		memset(keybytes, 0, sizeof(keybytes));
 		for (i = 0; i < 8 && i < len; i++)
 			keybytes[i] = *cp++ << 1;
 		key[0] = keybytes[0] << 24 | keybytes[1] << 16
diff --git a/usr.sbin/xntpd/authstuff/makeIPFP.c b/usr.sbin/xntpd/authstuff/makeIPFP.c
index 51f8a55..50b31f4 100644
--- a/usr.sbin/xntpd/authstuff/makeIPFP.c
+++ b/usr.sbin/xntpd/authstuff/makeIPFP.c
@@ -28,11 +28,11 @@ char *argv[];
 {
 	int c;
 	int errflg = 0;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
-	while ((c = getopt_l(argc, argv, "d")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "d")) != EOF)
 		switch (c) {
 		case 'd':
 			++debug;
@@ -183,7 +183,7 @@ doit()
 	int ind4, ind5, ind6, ind7;
 	int octbits;
 
-	bzero((char *)bits, sizeof bits);
+	memset((char *)bits, 0, sizeof bits);
 
 	/*
 	 * Do the rounds for the IP table.  We save the results of
diff --git a/usr.sbin/xntpd/authstuff/makePC1.c b/usr.sbin/xntpd/authstuff/makePC1.c
index c010989..337353c 100644
--- a/usr.sbin/xntpd/authstuff/makePC1.c
+++ b/usr.sbin/xntpd/authstuff/makePC1.c
@@ -25,11 +25,11 @@ char *argv[];
 {
 	int c;
 	int errflg = 0;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
-	while ((c = getopt_l(argc, argv, "d")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "d")) != EOF)
 		switch (c) {
 		case 'd':
 			++debug;
@@ -82,8 +82,8 @@ permute(bits, cp, dp)
 	u_char c[28];
 	u_char d[28];
 
-	bzero((char *)c, sizeof c);
-	bzero((char *)d, sizeof d);
+	memset((char *)c, 0, sizeof c);
+	memset((char *)d, 0, sizeof d);
 
 	for (i = 0; i < 28; i++) {
 		c[i] = bits[PC1_C[i]];
@@ -140,7 +140,7 @@ doit()
 	U_LONG d;
 	u_char bits[64];
 
-	bzero((char *)bits, sizeof bits);
+	memset((char *)bits, 0, sizeof bits);
 
 	printf("static U_LONG PC1_CL[8] = {");
 	for (i = 0; i < 4; i++) {
diff --git a/usr.sbin/xntpd/authstuff/makePC2.c b/usr.sbin/xntpd/authstuff/makePC2.c
index d92d2b2..9795b62 100644
--- a/usr.sbin/xntpd/authstuff/makePC2.c
+++ b/usr.sbin/xntpd/authstuff/makePC2.c
@@ -26,11 +26,11 @@ char *argv[];
 {
 	int c;
 	int errflg = 0;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
-	while ((c = getopt_l(argc, argv, "d")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "d")) != EOF)
 		switch (c) {
 		case 'd':
 			++debug;
@@ -87,7 +87,7 @@ permc(bits, resp)
 	register U_LONG mask;
 	u_char res[24];
 
-	bzero((char *)res, sizeof res);
+	memset((char *)res, 0, sizeof res);
 
 	for (i = 0; i < 24; i++) {
 		res[i] = bits[PC2_C[i]];
@@ -117,7 +117,7 @@ permd(bits, resp)
 	register U_LONG mask;
 	u_char res[24];
 
-	bzero((char *)res, sizeof res);
+	memset((char *)res, 0, sizeof res);
 
 	for (i = 0; i < 24; i++) {
 		res[i] = bits[PC2_D[i]];
@@ -168,7 +168,7 @@ doit()
 	U_LONG res;
 	u_char bits[28];
 
-	bzero((char *)bits, sizeof bits);
+	memset((char *)bits, 0, sizeof bits);
 
 	printf("static U_LONG PC2_C[4][64] = {");
 	for (i = 0; i < 4; i++) {
diff --git a/usr.sbin/xntpd/authstuff/makeSP.c b/usr.sbin/xntpd/authstuff/makeSP.c
index bfeb82c..7bfd93e 100644
--- a/usr.sbin/xntpd/authstuff/makeSP.c
+++ b/usr.sbin/xntpd/authstuff/makeSP.c
@@ -25,11 +25,11 @@ char *argv[];
 {
 	int c;
 	int errflg = 0;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
-	while ((c = getopt_l(argc, argv, "d")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "d")) != EOF)
 		switch (c) {
 		case 'd':
 			++debug;
@@ -165,7 +165,7 @@ doit()
 	U_LONG result;
 	int sixbits;
 
-	bzero((char *)bits, sizeof bits);
+	memset((char *)bits, 0, sizeof bits);
 	printf("static U_LONG SP[8][64] = {");
 	for (selno = 0; selno < 8; selno++) {
 		for (sixbits = 0; sixbits < 64; sixbits++) {
diff --git a/usr.sbin/xntpd/authstuff/md5driver.c b/usr.sbin/xntpd/authstuff/md5driver.c
index 73db940..b85348f 100644
--- a/usr.sbin/xntpd/authstuff/md5driver.c
+++ b/usr.sbin/xntpd/authstuff/md5driver.c
@@ -25,9 +25,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
-#ifdef	__bsdi__
+#ifdef	SYS_BSDI
 #include <sys/time.h>
-#endif	/* __bsdi__ */
+#endif	/* SYS_BSDI */
 #include "md5.h"
 
 #define	MD5
diff --git a/usr.sbin/xntpd/authstuff/mkrandkeys.c b/usr.sbin/xntpd/authstuff/mkrandkeys.c
index 3bb987a..454b341 100644
--- a/usr.sbin/xntpd/authstuff/mkrandkeys.c
+++ b/usr.sbin/xntpd/authstuff/mkrandkeys.c
@@ -34,14 +34,14 @@ char *argv[];
 	int numkeys;
 	U_LONG tmp;
 	char *passwd;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 	extern char *getpass();
 
 	numkeys = 0;
 	progname = argv[0];
 	passwd = NULL;
-	while ((c = getopt_l(argc, argv, "dnp:s")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "dnp:s")) != EOF)
 		switch (c) {
 		case 'd':
 			++debug;
@@ -50,7 +50,7 @@ char *argv[];
 			std = 0;
 			break;
 		case 'p':
-			passwd = optarg;
+			passwd = ntp_optarg;
 			break;
 		case 's':
 			std = 1;
@@ -61,11 +61,11 @@ char *argv[];
 		}
 
 	numkeys = 0;
-	for (; !errflg && optind < argc; optind++) {
-		c = atoi(argv[optind]);
+	for (; !errflg && ntp_optind < argc; ntp_optind++) {
+		c = atoi(argv[ntp_optind]);
 		if (c <= 0 || c > 15) {
-			(void) fprintf("%s: invalid key number `%s'\n",
-			    progname, argv[optind]);
+			(void) fprintf(stderr, "%s: invalid key number `%s'\n",
+				       progname, argv[ntp_optind]);
 			exit(2);
 		}
 		dokey[c] = 1;
diff --git a/usr.sbin/xntpd/authstuff/omakeIPFP.c b/usr.sbin/xntpd/authstuff/omakeIPFP.c
index 887cc58..0751a5d 100644
--- a/usr.sbin/xntpd/authstuff/omakeIPFP.c
+++ b/usr.sbin/xntpd/authstuff/omakeIPFP.c
@@ -34,11 +34,11 @@ char *argv[];
 {
 	int c;
 	int errflg = 0;
-	extern int optind;
-	extern char *optarg;
+	extern int ntp_optind;
+	extern char *ntp_optarg;
 
 	progname = argv[0];
-	while ((c = getopt_l(argc, argv, "d")) != EOF)
+	while ((c = ntp_getopt(argc, argv, "d")) != EOF)
 		switch (c) {
 		case 'd':
 			++debug;
@@ -188,7 +188,7 @@ doit()
 	int ind0, ind1, ind2, ind3;
 	int quadbits;
 
-	bzero((char *)bits, sizeof bits);
+	memset((char *)bits, 0, sizeof bits);
 
 	/*
 	 * Do the rounds for the IPL table.  We save the results of