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

bk: 45d93235zgLOH-LuGRdRFPXBnjuuPQ

diff --git a/ChangeLog b/ChangeLog
index 65995326c51aec5ac104d2554345f04a3b73de12..8d2c5e3a6a65ca62f522133b868e0e74d8744ede 100644 (file)
--- 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 c6ef27d3e2ed457c6a0330b8af326e3d0eea0dc3..3372f49f2c332a28eac3046a7de637ee670c73e0 100644 (file)
--- 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 2ccb37d7a3a3e3bf1883ef1f65e0f916e110113e..af737e10d278f7a872a3a16fe05ad5499a5bb510 100644 (file)
--- 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);
        }