From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 19 Feb 2007 05:14:29 +0000 (-0500)
Subject: [Bug 776] Remove unimplemented "rate" flag from ntpdate
X-Git-Tag: NTP_4_2_4P0_RC4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33d1a83ef8f30a198ffe06caf2b406b43b218e6d;p=thirdparty%2Fntp.git

[Bug 776] Remove unimplemented "rate" flag from ntpdate

bk: 45d93235zgLOH-LuGRdRFPXBnjuuPQ
---

diff --git a/ChangeLog b/ChangeLog
index 65995326c..8d2c5e3a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 (4.2.4p1) Released by Harlan Stenn <stenn@ntp.org>
+* [Bug 776] Remove unimplemented "rate" flag from ntpdate.
 * [Bug 586] Avoid lookups if AI_NUMERICHOST is set.
 * [Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
 * [Bug 768] Fix io_setbclient() error message.
diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index c6ef27d3e..3372f49f2 100644
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS=	../util/ansi2knr
+#AUTOMAKE_OPTIONS=	../util/ansi2knr
 
 bindir=		${exec_prefix}/${BINSUBDIR}
 #bin_PROGRAMS=	ntpdate ntptimeset
diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 2ccb37d7a..af737e10d 100644
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -158,11 +158,6 @@ int simple_query = 0;
  */
 int unpriv_port = 0;
 
-/*
- * Time to spend measuring drift rate
- */
-int rate = 0;
-
 /*
  * Program name.
  */
@@ -278,10 +273,6 @@ void clear_globals()
    */
   unpriv_port = 0;
 
-  /*
-   * Time to spend measuring drift rate
-   */
-  rate = 0;
   /*
    * Systemwide parameters and flags
    */
@@ -432,17 +423,6 @@ ntpdatemain (
 		case 'q':
 			simple_query = 1;
 			break;
-		case 'r':
-			c = atoi(ntp_optarg);
-			if (c <= 0 || c > (60 * 60)) {
-				(void) fprintf(stderr,
-					   "%s: rate (%d) is invalid: 0 - %d\n",
-					   progname, c, (60 * 60));
-				errflg++;
-			} else {
-				rate = c;
-			}
-			break;
 		case 's':
 			syslogit = 1;
 			break;
@@ -474,7 +454,7 @@ ntpdatemain (
 	
 	if (errflg) {
 		(void) fprintf(stderr,
-		    "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n",
+		    "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-t timeo] server ...\n",
 		    progname);
 		exit(2);
 	}