cleanup

bk: 551cf380cXhNyhXZl7SJJ_N7UzuR7A

diff --git a/ChangeLog b/ChangeLog
index 517ab018791f6be2bc17e9fce046c006e18d505d..b87d16a6ae0dce62edb04546439c86245653c78d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 ---
+
+* [Bug 2788] New flag -G (force_step_once).
+* [Bug 2794] Clean up kernel clock status reports.
+---
 (4.2.8p2-RC1) 2015/03/30 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 2794] Don't let reports on normal kernel status changes

diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi
index 46aee62345c890a727c142a7e0214c608c12e938..4d16b6c9c7e1f55cb58775c019da6fd6bcde0be6 100644 (file)
--- a/ntpd/invoke-ntpd.texi
+++ b/ntpd/invoke-ntpd.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpd.texi)
 #
-# It has been AutoGen-ed  March 30, 2015 at 04:46:11 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  April  2, 2015 at 07:30:50 AM by AutoGen 5.18.5pre6
 # From the definitions    ntpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -95,6 +95,7 @@ This software is released under the NTP license, <http://ntp.org/license>.
 * ntpd configfile::             configfile option (-c)
 * ntpd driftfile::              driftfile option (-f)
 * ntpd panicgate::              panicgate option (-g)
+* ntpd force-step-once::        force-step-once option (-G)
 * ntpd jaildir::                jaildir option (-i)
 * ntpd interface::              interface option (-I)
 * ntpd keyfile::                keyfile option (-k)
@@ -162,6 +163,7 @@ Usage:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
    -f Str driftfile      frequency drift file name
    -g no  panicgate      Allow the first adjustment to be Big
                                 - may appear multiple times
+   -G no  force-step-once Step any initial offset correction.
    -i Str jaildir        Jail directory
    -I Str interface      Listen on an interface name or address
                                 - may appear multiple times
@@ -298,7 +300,7 @@ The name and path of the frequency file,
 by default.
 This is the same operation as the
 @code{driftfile} @kbd{driftfile}
-configuration specification in the 
+configuration specification in the
 @file{/etc/ntp.conf}
 file.
 @node ntpd panicgate
@@ -326,6 +328,21 @@ options.
 See the
 @code{tinker}
 configuration file directive for other options.
+@node ntpd force-step-once
+@subsection force-step-once option (-G)
+@cindex ntpd-force-step-once
+
+This is the ``step any initial offset correction.'' option.
+Normally,
+@code{ntpd}
+steps the time if the time offset exceeds the step threshold,
+which is 128 ms by default, and otherwise slews the time.
+This option forces the initial offset correction to be stepped,
+so the highest time accuracy can be achieved quickly.
+However, this may also cause the time to be stepped back
+so this option must not be used if
+applications requiring monotonic time are running.
+See the @code{tinker} configuration file directive for other options.
 @node ntpd jaildir
 @subsection jaildir option (-i)
 @cindex ntpd-jaildir
@@ -370,7 +387,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-@code{interface} command, which is more versatile. 
+@code{interface} command, which is more versatile.
 @node ntpd keyfile
 @subsection keyfile option (-k)
 @cindex ntpd-keyfile

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 79d05d88076f4afc6397535932a9656509dfcb62..c9519e8f11d89f00d3ae2ea2cb2e469e42bdd412 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -290,14 +290,14 @@ ntp_adjtime_error_handler(
 #endif
 #ifdef TIME_INS
            case TIME_INS: /* 1: positive leap second warning */
-               msyslog(LOG_INFO, "kernel reports positive leap second warning state");
+               msyslog(LOG_INFO, "kernel reports leap second insertion scheduled");
            break;
 #else
 # warning TIME_INS is not defined
 #endif
 #ifdef TIME_DEL
            case TIME_DEL: /* 2: negative leap second warning */
-               msyslog(LOG_INFO, "kernel reports negative leap second warning state");
+               msyslog(LOG_INFO, "kernel reports leap second deletion scheduled");
            break;
 #else
 # warning TIME_DEL is not defined
@@ -311,13 +311,14 @@ ntp_adjtime_error_handler(
 #endif
 #ifdef TIME_WAIT
            case TIME_WAIT: /* 4: leap second has occured */
-               msyslog(LOG_INFO, "kernel reports leap second has occured");
+               msyslog(LOG_INFO, "kernel reports leap second has occurred");
            break;
 #else
 # warning TIME_WAIT is not defined
 #endif
 #ifdef TIME_ERROR
            case TIME_ERROR: /* 5: unsynchronized, or loss of synchronization */
+                               /* error (see status word) */
                if (pps_call && !(ptimex->status & STA_PPSSIGNAL))
                        report_event(EVNT_KERN, NULL,
                            "PPS no signal");
@@ -325,12 +326,22 @@ ntp_adjtime_error_handler(
                DPRINTF(1, ("kernel loop status (%s) %d %m\n",
                        k_st_flags(ptimex->status), errno));
                /*
-                * This code may be returned when ntp_adjtime() has just been called for
-                * the first time, quite a while after startup, when ntpd just starts to
-                * discipline the kernel time. In this case the occurrence of this message
+                * This code may be returned when ntp_adjtime() has just
+                * been called for the first time, quite a while after
+                * startup, when ntpd just starts to discipline the kernel
+                * time. In this case the occurrence of this message
                 * can be pretty confusing.
+                *
+                * HMS: How about a message when we begin kernel processing:
+                *    Determining kernel clock state...
+                * so an initial TIME_ERROR message is less confising,
+                * or skipping the first message (ugh),
+                * or ???
                 * msyslog(LOG_INFO, "kernel reports time synchronization lost");
                 */
+               errno = saved_errno;    /* may not be needed */
+               msyslog(LOG_INFO, "kernel reports TIME_ERROR: %#x: %s %m",
+                       ptimex->status, k_st_flags(ptimex->status));
            break;
 #else
 # warning TIME_ERROR is not defined

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index d8d7c6412bf22484adee190cee6a53221cfeb85c..4586f171087eb71f7a6cf5dd72daf5e45ee7ed57 100644 (file)
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *
- *  It has been AutoGen-ed  March 30, 2015 at 10:48:01 AM by AutoGen 5.18.4
+ *  It has been AutoGen-ed  April  2, 2015 at 07:30:34 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (ntpd_opt_strs+0)
-#define zLicenseDescrip (ntpd_opt_strs+340)
+#define zLicenseDescrip (ntpd_opt_strs+344)
 
 /*
  *  global included definitions
@@ -74,15 +74,15 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for ntpd options
  */
-static char const ntpd_opt_strs[3130] =
-/*     0 */ "ntpd 4.2.8p1\n"
+static char const ntpd_opt_strs[3141] =
+/*     0 */ "ntpd 4.2.8p2-RC1\n"
             "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  <http://ntp.org/license>\n"
             "  <http://opensource.org/licenses/ntp-license.php>\n\0"
-/*   340 */ "Permission to use, copy, modify, and distribute this software and its\n"
+/*   344 */ "Permission to use, copy, modify, and distribute this software and its\n"
             "documentation for any purpose with or without fee is hereby granted,\n"
             "provided that the above copyright notice appears in all copies and that\n"
             "both the copyright notice and this permission notice appear in supporting\n"
@@ -92,136 +92,136 @@ static char const ntpd_opt_strs[3130] =
             "Time Foundation makes no representations about the suitability this\n"
             "software for any purpose.  It is provided \"as is\" without express or\n"
             "implied warranty.\n\0"
-/*  1008 */ "Force IPv4 DNS name resolution\0"
-/*  1039 */ "IPV4\0"
-/*  1044 */ "ipv4\0"
-/*  1049 */ "Force IPv6 DNS name resolution\0"
-/*  1080 */ "IPV6\0"
-/*  1085 */ "ipv6\0"
-/*  1090 */ "Require crypto authentication\0"
-/*  1120 */ "AUTHREQ\0"
-/*  1128 */ "authreq\0"
-/*  1136 */ "Do not require crypto authentication\0"
-/*  1173 */ "AUTHNOREQ\0"
-/*  1183 */ "authnoreq\0"
-/*  1193 */ "Allow us to sync to broadcast servers\0"
-/*  1231 */ "BCASTSYNC\0"
-/*  1241 */ "bcastsync\0"
-/*  1251 */ "configuration file name\0"
-/*  1275 */ "CONFIGFILE\0"
-/*  1286 */ "configfile\0"
-/*  1297 */ "Increase debug verbosity level\0"
-/*  1328 */ "DEBUG_LEVEL\0"
-/*  1340 */ "debug-level\0"
-/*  1352 */ "Set the debug verbosity level\0"
-/*  1382 */ "SET_DEBUG_LEVEL\0"
-/*  1398 */ "set-debug-level\0"
-/*  1414 */ "frequency drift file name\0"
-/*  1440 */ "DRIFTFILE\0"
-/*  1450 */ "driftfile\0"
-/*  1460 */ "Allow the first adjustment to be Big\0"
-/*  1497 */ "PANICGATE\0"
-/*  1507 */ "panicgate\0"
-/*  1517 */ "Always step the time once at startup\0"
-/*  1554 */ "FORCE_STEP_ONCE\0"
-/*  1570 */ "force-step-once\0"
-/*  1586 */ "Jail directory\0"
-/*  1601 */ "JAILDIR\0"
-/*  1609 */ "jaildir\0"
-/*  1617 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0"
-/*  1696 */ "Listen on an interface name or address\0"
-/*  1735 */ "INTERFACE\0"
-/*  1745 */ "interface\0"
-/*  1755 */ "path to symmetric keys\0"
-/*  1778 */ "KEYFILE\0"
-/*  1786 */ "keyfile\0"
-/*  1794 */ "path to the log file\0"
-/*  1815 */ "LOGFILE\0"
-/*  1823 */ "logfile\0"
-/*  1831 */ "Do not listen to virtual interfaces\0"
-/*  1867 */ "NOVIRTUALIPS\0"
-/*  1880 */ "novirtualips\0"
-/*  1893 */ "Modify Multimedia Timer (Windows only)\0"
-/*  1932 */ "MODIFYMMTIMER\0"
-/*  1946 */ "modifymmtimer\0"
-/*  1960 */ "Do not fork\0"
-/*  1972 */ "NOFORK\0"
-/*  1979 */ "nofork\0"
-/*  1986 */ "Run at high priority\0"
-/*  2007 */ "NICE\0"
-/*  2012 */ "nice\0"
-/*  2017 */ "path to the PID file\0"
-/*  2038 */ "PIDFILE\0"
-/*  2046 */ "pidfile\0"
-/*  2054 */ "Process priority\0"
-/*  2071 */ "PRIORITY\0"
-/*  2080 */ "priority\0"
-/*  2089 */ "Set the time and quit\0"
-/*  2111 */ "QUIT\0"
-/*  2116 */ "quit\0"
-/*  2121 */ "Broadcast/propagation delay\0"
-/*  2149 */ "PROPAGATIONDELAY\0"
-/*  2166 */ "propagationdelay\0"
-/*  2183 */ "Save parsed configuration and quit\0"
-/*  2218 */ "SAVECONFIGQUIT\0"
-/*  2233 */ "saveconfigquit\0"
-/*  2248 */ "Statistics file location\0"
-/*  2273 */ "STATSDIR\0"
-/*  2282 */ "statsdir\0"
-/*  2291 */ "Trusted key number\0"
-/*  2310 */ "TRUSTEDKEY\0"
-/*  2321 */ "trustedkey\0"
-/*  2332 */ "Run as userid (or userid:groupid)\0"
-/*  2366 */ "USER\0"
-/*  2371 */ "user\0"
-/*  2376 */ "interval in seconds between scans for new or dropped interfaces\0"
-/*  2440 */ "UPDATEINTERVAL\0"
-/*  2455 */ "updateinterval\0"
-/*  2470 */ "make ARG an ntp variable (RW)\0"
-/*  2500 */ "VAR\0"
-/*  2504 */ "var\0"
-/*  2508 */ "make ARG an ntp variable (RW|DEF)\0"
-/*  2542 */ "DVAR\0"
-/*  2547 */ "dvar\0"
-/*  2552 */ "Seconds to wait for first clock sync\0"
-/*  2589 */ "WAIT_SYNC\0"
-/*  2599 */ "wait-sync\0"
-/*  2609 */ "Slew up to 600 seconds\0"
-/*  2632 */ "SLEW\0"
-/*  2637 */ "slew\0"
-/*  2642 */ "Use CPU cycle counter (Windows only)\0"
-/*  2679 */ "USEPCC\0"
-/*  2686 */ "usepcc\0"
-/*  2693 */ "Force CPU cycle counter use (Windows only)\0"
-/*  2736 */ "PCCFREQ\0"
-/*  2744 */ "pccfreq\0"
-/*  2752 */ "Register with mDNS as a NTP server\0"
-/*  2787 */ "MDNS\0"
-/*  2792 */ "mdns\0"
-/*  2797 */ "display extended usage information and exit\0"
-/*  2841 */ "help\0"
-/*  2846 */ "extended usage information passed thru pager\0"
-/*  2891 */ "more-help\0"
-/*  2901 */ "output version information and exit\0"
-/*  2937 */ "version\0"
-/*  2945 */ "NTPD\0"
-/*  2950 */ "ntpd - NTP daemon program - Ver. 4.2.8p1\n"
+/*  1012 */ "Force IPv4 DNS name resolution\0"
+/*  1043 */ "IPV4\0"
+/*  1048 */ "ipv4\0"
+/*  1053 */ "Force IPv6 DNS name resolution\0"
+/*  1084 */ "IPV6\0"
+/*  1089 */ "ipv6\0"
+/*  1094 */ "Require crypto authentication\0"
+/*  1124 */ "AUTHREQ\0"
+/*  1132 */ "authreq\0"
+/*  1140 */ "Do not require crypto authentication\0"
+/*  1177 */ "AUTHNOREQ\0"
+/*  1187 */ "authnoreq\0"
+/*  1197 */ "Allow us to sync to broadcast servers\0"
+/*  1235 */ "BCASTSYNC\0"
+/*  1245 */ "bcastsync\0"
+/*  1255 */ "configuration file name\0"
+/*  1279 */ "CONFIGFILE\0"
+/*  1290 */ "configfile\0"
+/*  1301 */ "Increase debug verbosity level\0"
+/*  1332 */ "DEBUG_LEVEL\0"
+/*  1344 */ "debug-level\0"
+/*  1356 */ "Set the debug verbosity level\0"
+/*  1386 */ "SET_DEBUG_LEVEL\0"
+/*  1402 */ "set-debug-level\0"
+/*  1418 */ "frequency drift file name\0"
+/*  1444 */ "DRIFTFILE\0"
+/*  1454 */ "driftfile\0"
+/*  1464 */ "Allow the first adjustment to be Big\0"
+/*  1501 */ "PANICGATE\0"
+/*  1511 */ "panicgate\0"
+/*  1521 */ "Step any initial offset correction.\0"
+/*  1557 */ "FORCE_STEP_ONCE\0"
+/*  1573 */ "force-step-once\0"
+/*  1589 */ "Jail directory\0"
+/*  1604 */ "JAILDIR\0"
+/*  1612 */ "jaildir\0"
+/*  1620 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0"
+/*  1699 */ "Listen on an interface name or address\0"
+/*  1738 */ "INTERFACE\0"
+/*  1748 */ "interface\0"
+/*  1758 */ "path to symmetric keys\0"
+/*  1781 */ "KEYFILE\0"
+/*  1789 */ "keyfile\0"
+/*  1797 */ "path to the log file\0"
+/*  1818 */ "LOGFILE\0"
+/*  1826 */ "logfile\0"
+/*  1834 */ "Do not listen to virtual interfaces\0"
+/*  1870 */ "NOVIRTUALIPS\0"
+/*  1883 */ "novirtualips\0"
+/*  1896 */ "Modify Multimedia Timer (Windows only)\0"
+/*  1935 */ "MODIFYMMTIMER\0"
+/*  1949 */ "modifymmtimer\0"
+/*  1963 */ "Do not fork\0"
+/*  1975 */ "NOFORK\0"
+/*  1982 */ "nofork\0"
+/*  1989 */ "Run at high priority\0"
+/*  2010 */ "NICE\0"
+/*  2015 */ "nice\0"
+/*  2020 */ "path to the PID file\0"
+/*  2041 */ "PIDFILE\0"
+/*  2049 */ "pidfile\0"
+/*  2057 */ "Process priority\0"
+/*  2074 */ "PRIORITY\0"
+/*  2083 */ "priority\0"
+/*  2092 */ "Set the time and quit\0"
+/*  2114 */ "QUIT\0"
+/*  2119 */ "quit\0"
+/*  2124 */ "Broadcast/propagation delay\0"
+/*  2152 */ "PROPAGATIONDELAY\0"
+/*  2169 */ "propagationdelay\0"
+/*  2186 */ "Save parsed configuration and quit\0"
+/*  2221 */ "SAVECONFIGQUIT\0"
+/*  2236 */ "saveconfigquit\0"
+/*  2251 */ "Statistics file location\0"
+/*  2276 */ "STATSDIR\0"
+/*  2285 */ "statsdir\0"
+/*  2294 */ "Trusted key number\0"
+/*  2313 */ "TRUSTEDKEY\0"
+/*  2324 */ "trustedkey\0"
+/*  2335 */ "Run as userid (or userid:groupid)\0"
+/*  2369 */ "USER\0"
+/*  2374 */ "user\0"
+/*  2379 */ "interval in seconds between scans for new or dropped interfaces\0"
+/*  2443 */ "UPDATEINTERVAL\0"
+/*  2458 */ "updateinterval\0"
+/*  2473 */ "make ARG an ntp variable (RW)\0"
+/*  2503 */ "VAR\0"
+/*  2507 */ "var\0"
+/*  2511 */ "make ARG an ntp variable (RW|DEF)\0"
+/*  2545 */ "DVAR\0"
+/*  2550 */ "dvar\0"
+/*  2555 */ "Seconds to wait for first clock sync\0"
+/*  2592 */ "WAIT_SYNC\0"
+/*  2602 */ "wait-sync\0"
+/*  2612 */ "Slew up to 600 seconds\0"
+/*  2635 */ "SLEW\0"
+/*  2640 */ "slew\0"
+/*  2645 */ "Use CPU cycle counter (Windows only)\0"
+/*  2682 */ "USEPCC\0"
+/*  2689 */ "usepcc\0"
+/*  2696 */ "Force CPU cycle counter use (Windows only)\0"
+/*  2739 */ "PCCFREQ\0"
+/*  2747 */ "pccfreq\0"
+/*  2755 */ "Register with mDNS as a NTP server\0"
+/*  2790 */ "MDNS\0"
+/*  2795 */ "mdns\0"
+/*  2800 */ "display extended usage information and exit\0"
+/*  2844 */ "help\0"
+/*  2849 */ "extended usage information passed thru pager\0"
+/*  2894 */ "more-help\0"
+/*  2904 */ "output version information and exit\0"
+/*  2940 */ "version\0"
+/*  2948 */ "NTPD\0"
+/*  2953 */ "ntpd - NTP daemon program - Ver. 4.2.8p2-RC1\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ <server1> ... <serverN> ]\n\0"
-/*  3081 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  3115 */ "\n\0"
-/*  3117 */ "ntpd 4.2.8p1";
+/*  3088 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  3122 */ "\n\0"
+/*  3124 */ "ntpd 4.2.8p2-RC1";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (ntpd_opt_strs+1008)
+#define IPV4_DESC      (ntpd_opt_strs+1012)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (ntpd_opt_strs+1039)
+#define IPV4_NAME      (ntpd_opt_strs+1043)
 /** Name string for the ipv4 option */
-#define IPV4_name      (ntpd_opt_strs+1044)
+#define IPV4_name      (ntpd_opt_strs+1048)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -233,11 +233,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (ntpd_opt_strs+1049)
+#define IPV6_DESC      (ntpd_opt_strs+1053)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (ntpd_opt_strs+1080)
+#define IPV6_NAME      (ntpd_opt_strs+1084)
 /** Name string for the ipv6 option */
-#define IPV6_name      (ntpd_opt_strs+1085)
+#define IPV6_name      (ntpd_opt_strs+1089)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -249,11 +249,11 @@ static int const aIpv6CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the authreq option */
-#define AUTHREQ_DESC      (ntpd_opt_strs+1090)
+#define AUTHREQ_DESC      (ntpd_opt_strs+1094)
 /** Upper-cased name for the authreq option */
-#define AUTHREQ_NAME      (ntpd_opt_strs+1120)
+#define AUTHREQ_NAME      (ntpd_opt_strs+1124)
 /** Name string for the authreq option */
-#define AUTHREQ_name      (ntpd_opt_strs+1128)
+#define AUTHREQ_name      (ntpd_opt_strs+1132)
 /** Other options that appear in conjunction with the authreq option */
 static int const aAuthreqCantList[] = {
     INDEX_OPT_AUTHNOREQ, NO_EQUIVALENT };
@@ -265,11 +265,11 @@ static int const aAuthreqCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the authnoreq option */
-#define AUTHNOREQ_DESC      (ntpd_opt_strs+1136)
+#define AUTHNOREQ_DESC      (ntpd_opt_strs+1140)
 /** Upper-cased name for the authnoreq option */
-#define AUTHNOREQ_NAME      (ntpd_opt_strs+1173)
+#define AUTHNOREQ_NAME      (ntpd_opt_strs+1177)
 /** Name string for the authnoreq option */
-#define AUTHNOREQ_name      (ntpd_opt_strs+1183)
+#define AUTHNOREQ_name      (ntpd_opt_strs+1187)
 /** Other options that appear in conjunction with the authnoreq option */
 static int const aAuthnoreqCantList[] = {
     INDEX_OPT_AUTHREQ, NO_EQUIVALENT };
@@ -280,11 +280,11 @@ static int const aAuthnoreqCantList[] = {
  *  bcastsync option description:
  */
 /** Descriptive text for the bcastsync option */
-#define BCASTSYNC_DESC      (ntpd_opt_strs+1193)
+#define BCASTSYNC_DESC      (ntpd_opt_strs+1197)
 /** Upper-cased name for the bcastsync option */
-#define BCASTSYNC_NAME      (ntpd_opt_strs+1231)
+#define BCASTSYNC_NAME      (ntpd_opt_strs+1235)
 /** Name string for the bcastsync option */
-#define BCASTSYNC_name      (ntpd_opt_strs+1241)
+#define BCASTSYNC_name      (ntpd_opt_strs+1245)
 /** Compiled in flag settings for the bcastsync option */
 #define BCASTSYNC_FLAGS     (OPTST_DISABLED)
 
@@ -292,11 +292,11 @@ static int const aAuthnoreqCantList[] = {
  *  configfile option description:
  */
 /** Descriptive text for the configfile option */
-#define CONFIGFILE_DESC      (ntpd_opt_strs+1251)
+#define CONFIGFILE_DESC      (ntpd_opt_strs+1255)
 /** Upper-cased name for the configfile option */
-#define CONFIGFILE_NAME      (ntpd_opt_strs+1275)
+#define CONFIGFILE_NAME      (ntpd_opt_strs+1279)
 /** Name string for the configfile option */
-#define CONFIGFILE_name      (ntpd_opt_strs+1286)
+#define CONFIGFILE_name      (ntpd_opt_strs+1290)
 /** Compiled in flag settings for the configfile option */
 #define CONFIGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -305,11 +305,11 @@ static int const aAuthnoreqCantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (ntpd_opt_strs+1297)
+#define DEBUG_LEVEL_DESC      (ntpd_opt_strs+1301)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1328)
+#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1332)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (ntpd_opt_strs+1340)
+#define DEBUG_LEVEL_name      (ntpd_opt_strs+1344)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -317,11 +317,11 @@ static int const aAuthnoreqCantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+1352)
+#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+1356)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1382)
+#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1386)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1398)
+#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1402)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -330,11 +330,11 @@ static int const aAuthnoreqCantList[] = {
  *  driftfile option description:
  */
 /** Descriptive text for the driftfile option */
-#define DRIFTFILE_DESC      (ntpd_opt_strs+1414)
+#define DRIFTFILE_DESC      (ntpd_opt_strs+1418)
 /** Upper-cased name for the driftfile option */
-#define DRIFTFILE_NAME      (ntpd_opt_strs+1440)
+#define DRIFTFILE_NAME      (ntpd_opt_strs+1444)
 /** Name string for the driftfile option */
-#define DRIFTFILE_name      (ntpd_opt_strs+1450)
+#define DRIFTFILE_name      (ntpd_opt_strs+1454)
 /** Compiled in flag settings for the driftfile option */
 #define DRIFTFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -343,11 +343,11 @@ static int const aAuthnoreqCantList[] = {
  *  panicgate option description:
  */
 /** Descriptive text for the panicgate option */
-#define PANICGATE_DESC      (ntpd_opt_strs+1460)
+#define PANICGATE_DESC      (ntpd_opt_strs+1464)
 /** Upper-cased name for the panicgate option */
-#define PANICGATE_NAME      (ntpd_opt_strs+1497)
+#define PANICGATE_NAME      (ntpd_opt_strs+1501)
 /** Name string for the panicgate option */
-#define PANICGATE_name      (ntpd_opt_strs+1507)
+#define PANICGATE_name      (ntpd_opt_strs+1511)
 /** Compiled in flag settings for the panicgate option */
 #define PANICGATE_FLAGS     (OPTST_DISABLED)
 
@@ -355,11 +355,11 @@ static int const aAuthnoreqCantList[] = {
  *  force_step_once option description:
  */
 /** Descriptive text for the force_step_once option */
-#define FORCE_STEP_ONCE_DESC      (ntpd_opt_strs+1517)
+#define FORCE_STEP_ONCE_DESC      (ntpd_opt_strs+1521)
 /** Upper-cased name for the force_step_once option */
-#define FORCE_STEP_ONCE_NAME      (ntpd_opt_strs+1554)
+#define FORCE_STEP_ONCE_NAME      (ntpd_opt_strs+1557)
 /** Name string for the force_step_once option */
-#define FORCE_STEP_ONCE_name      (ntpd_opt_strs+1570)
+#define FORCE_STEP_ONCE_name      (ntpd_opt_strs+1573)
 /** Compiled in flag settings for the force_step_once option */
 #define FORCE_STEP_ONCE_FLAGS     (OPTST_DISABLED)
 
@@ -368,11 +368,11 @@ static int const aAuthnoreqCantList[] = {
  */
 #ifdef HAVE_DROPROOT
 /** Descriptive text for the jaildir option */
-#define JAILDIR_DESC      (ntpd_opt_strs+1586)
+#define JAILDIR_DESC      (ntpd_opt_strs+1589)
 /** Upper-cased name for the jaildir option */
-#define JAILDIR_NAME      (ntpd_opt_strs+1601)
+#define JAILDIR_NAME      (ntpd_opt_strs+1604)
 /** Name string for the jaildir option */
-#define JAILDIR_name      (ntpd_opt_strs+1609)
+#define JAILDIR_name      (ntpd_opt_strs+1612)
 /** Compiled in flag settings for the jaildir option */
 #define JAILDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -381,19 +381,19 @@ static int const aAuthnoreqCantList[] = {
 #define JAILDIR_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
 #define JAILDIR_NAME      NULL
 /** Descriptive text for the jaildir option */
-#define JAILDIR_DESC      (ntpd_opt_strs+1617)
-#define JAILDIR_name      (ntpd_opt_strs+1609)
+#define JAILDIR_DESC      (ntpd_opt_strs+1620)
+#define JAILDIR_name      (ntpd_opt_strs+1612)
 #endif  /* HAVE_DROPROOT */
 
 /**
  *  interface option description:
  */
 /** Descriptive text for the interface option */
-#define INTERFACE_DESC      (ntpd_opt_strs+1696)
+#define INTERFACE_DESC      (ntpd_opt_strs+1699)
 /** Upper-cased name for the interface option */
-#define INTERFACE_NAME      (ntpd_opt_strs+1735)
+#define INTERFACE_NAME      (ntpd_opt_strs+1738)
 /** Name string for the interface option */
-#define INTERFACE_name      (ntpd_opt_strs+1745)
+#define INTERFACE_name      (ntpd_opt_strs+1748)
 /** Compiled in flag settings for the interface option */
 #define INTERFACE_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -402,11 +402,11 @@ static int const aAuthnoreqCantList[] = {
  *  keyfile option description:
  */
 /** Descriptive text for the keyfile option */
-#define KEYFILE_DESC      (ntpd_opt_strs+1755)
+#define KEYFILE_DESC      (ntpd_opt_strs+1758)
 /** Upper-cased name for the keyfile option */
-#define KEYFILE_NAME      (ntpd_opt_strs+1778)
+#define KEYFILE_NAME      (ntpd_opt_strs+1781)
 /** Name string for the keyfile option */
-#define KEYFILE_name      (ntpd_opt_strs+1786)
+#define KEYFILE_name      (ntpd_opt_strs+1789)
 /** Compiled in flag settings for the keyfile option */
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -415,11 +415,11 @@ static int const aAuthnoreqCantList[] = {
  *  logfile option description:
  */
 /** Descriptive text for the logfile option */
-#define LOGFILE_DESC      (ntpd_opt_strs+1794)
+#define LOGFILE_DESC      (ntpd_opt_strs+1797)
 /** Upper-cased name for the logfile option */
-#define LOGFILE_NAME      (ntpd_opt_strs+1815)
+#define LOGFILE_NAME      (ntpd_opt_strs+1818)
 /** Name string for the logfile option */
-#define LOGFILE_name      (ntpd_opt_strs+1823)
+#define LOGFILE_name      (ntpd_opt_strs+1826)
 /** Compiled in flag settings for the logfile option */
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -428,11 +428,11 @@ static int const aAuthnoreqCantList[] = {
  *  novirtualips option description:
  */
 /** Descriptive text for the novirtualips option */
-#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1831)
+#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1834)
 /** Upper-cased name for the novirtualips option */
-#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1867)
+#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1870)
 /** Name string for the novirtualips option */
-#define NOVIRTUALIPS_name      (ntpd_opt_strs+1880)
+#define NOVIRTUALIPS_name      (ntpd_opt_strs+1883)
 /** Compiled in flag settings for the novirtualips option */
 #define NOVIRTUALIPS_FLAGS     (OPTST_DISABLED)
 
@@ -441,11 +441,11 @@ static int const aAuthnoreqCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the modifymmtimer option */
-#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1893)
+#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1896)
 /** Upper-cased name for the modifymmtimer option */
-#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1932)
+#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1935)
 /** Name string for the modifymmtimer option */
-#define MODIFYMMTIMER_name      (ntpd_opt_strs+1946)
+#define MODIFYMMTIMER_name      (ntpd_opt_strs+1949)
 /** Compiled in flag settings for the modifymmtimer option */
 #define MODIFYMMTIMER_FLAGS     (OPTST_DISABLED)
 
@@ -461,11 +461,11 @@ static int const aAuthnoreqCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the nofork option */
-#define NOFORK_DESC      (ntpd_opt_strs+1960)
+#define NOFORK_DESC      (ntpd_opt_strs+1963)
 /** Upper-cased name for the nofork option */
-#define NOFORK_NAME      (ntpd_opt_strs+1972)
+#define NOFORK_NAME      (ntpd_opt_strs+1975)
 /** Name string for the nofork option */
-#define NOFORK_name      (ntpd_opt_strs+1979)
+#define NOFORK_name      (ntpd_opt_strs+1982)
 /** Other options that appear in conjunction with the nofork option */
 static int const aNoforkCantList[] = {
     INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT };
@@ -476,11 +476,11 @@ static int const aNoforkCantList[] = {
  *  nice option description:
  */
 /** Descriptive text for the nice option */
-#define NICE_DESC      (ntpd_opt_strs+1986)
+#define NICE_DESC      (ntpd_opt_strs+1989)
 /** Upper-cased name for the nice option */
-#define NICE_NAME      (ntpd_opt_strs+2007)
+#define NICE_NAME      (ntpd_opt_strs+2010)
 /** Name string for the nice option */
-#define NICE_name      (ntpd_opt_strs+2012)
+#define NICE_name      (ntpd_opt_strs+2015)
 /** Compiled in flag settings for the nice option */
 #define NICE_FLAGS     (OPTST_DISABLED)
 
@@ -488,11 +488,11 @@ static int const aNoforkCantList[] = {
  *  pidfile option description:
  */
 /** Descriptive text for the pidfile option */
-#define PIDFILE_DESC      (ntpd_opt_strs+2017)
+#define PIDFILE_DESC      (ntpd_opt_strs+2020)
 /** Upper-cased name for the pidfile option */
-#define PIDFILE_NAME      (ntpd_opt_strs+2038)
+#define PIDFILE_NAME      (ntpd_opt_strs+2041)
 /** Name string for the pidfile option */
-#define PIDFILE_name      (ntpd_opt_strs+2046)
+#define PIDFILE_name      (ntpd_opt_strs+2049)
 /** Compiled in flag settings for the pidfile option */
 #define PIDFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -501,11 +501,11 @@ static int const aNoforkCantList[] = {
  *  priority option description:
  */
 /** Descriptive text for the priority option */
-#define PRIORITY_DESC      (ntpd_opt_strs+2054)
+#define PRIORITY_DESC      (ntpd_opt_strs+2057)
 /** Upper-cased name for the priority option */
-#define PRIORITY_NAME      (ntpd_opt_strs+2071)
+#define PRIORITY_NAME      (ntpd_opt_strs+2074)
 /** Name string for the priority option */
-#define PRIORITY_name      (ntpd_opt_strs+2080)
+#define PRIORITY_name      (ntpd_opt_strs+2083)
 /** Compiled in flag settings for the priority option */
 #define PRIORITY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -515,11 +515,11 @@ static int const aNoforkCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the quit option */
-#define QUIT_DESC      (ntpd_opt_strs+2089)
+#define QUIT_DESC      (ntpd_opt_strs+2092)
 /** Upper-cased name for the quit option */
-#define QUIT_NAME      (ntpd_opt_strs+2111)
+#define QUIT_NAME      (ntpd_opt_strs+2114)
 /** Name string for the quit option */
-#define QUIT_name      (ntpd_opt_strs+2116)
+#define QUIT_name      (ntpd_opt_strs+2119)
 /** Other options that appear in conjunction with the quit option */
 static int const aQuitCantList[] = {
     INDEX_OPT_SAVECONFIGQUIT,
@@ -531,11 +531,11 @@ static int const aQuitCantList[] = {
  *  propagationdelay option description:
  */
 /** Descriptive text for the propagationdelay option */
-#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+2121)
+#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+2124)
 /** Upper-cased name for the propagationdelay option */
-#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2149)
+#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2152)
 /** Name string for the propagationdelay option */
-#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2166)
+#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2169)
 /** Compiled in flag settings for the propagationdelay option */
 #define PROPAGATIONDELAY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -546,11 +546,11 @@ static int const aQuitCantList[] = {
  */
 #ifdef SAVECONFIG
 /** Descriptive text for the saveconfigquit option */
-#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2183)
+#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2186)
 /** Upper-cased name for the saveconfigquit option */
-#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2218)
+#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2221)
 /** Name string for the saveconfigquit option */
-#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2233)
+#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2236)
 /** Other options that appear in conjunction with the saveconfigquit option */
 static int const aSaveconfigquitCantList[] = {
     INDEX_OPT_QUIT,
@@ -571,11 +571,11 @@ static int const aSaveconfigquitCantList[] = {
  *  statsdir option description:
  */
 /** Descriptive text for the statsdir option */
-#define STATSDIR_DESC      (ntpd_opt_strs+2248)
+#define STATSDIR_DESC      (ntpd_opt_strs+2251)
 /** Upper-cased name for the statsdir option */
-#define STATSDIR_NAME      (ntpd_opt_strs+2273)
+#define STATSDIR_NAME      (ntpd_opt_strs+2276)
 /** Name string for the statsdir option */
-#define STATSDIR_name      (ntpd_opt_strs+2282)
+#define STATSDIR_name      (ntpd_opt_strs+2285)
 /** Compiled in flag settings for the statsdir option */
 #define STATSDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -584,11 +584,11 @@ static int const aSaveconfigquitCantList[] = {
  *  trustedkey option description:
  */
 /** Descriptive text for the trustedkey option */
-#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2291)
+#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2294)
 /** Upper-cased name for the trustedkey option */
-#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2310)
+#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2313)
 /** Name string for the trustedkey option */
-#define TRUSTEDKEY_name      (ntpd_opt_strs+2321)
+#define TRUSTEDKEY_name      (ntpd_opt_strs+2324)
 /** Compiled in flag settings for the trustedkey option */
 #define TRUSTEDKEY_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -598,11 +598,11 @@ static int const aSaveconfigquitCantList[] = {
  */
 #ifdef HAVE_DROPROOT
 /** Descriptive text for the user option */
-#define USER_DESC      (ntpd_opt_strs+2332)
+#define USER_DESC      (ntpd_opt_strs+2335)
 /** Upper-cased name for the user option */
-#define USER_NAME      (ntpd_opt_strs+2366)
+#define USER_NAME      (ntpd_opt_strs+2369)
 /** Name string for the user option */
-#define USER_name      (ntpd_opt_strs+2371)
+#define USER_name      (ntpd_opt_strs+2374)
 /** Compiled in flag settings for the user option */
 #define USER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -611,19 +611,19 @@ static int const aSaveconfigquitCantList[] = {
 #define USER_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
 #define USER_NAME      NULL
 /** Descriptive text for the user option */
-#define USER_DESC      (ntpd_opt_strs+1617)
-#define USER_name      (ntpd_opt_strs+2371)
+#define USER_DESC      (ntpd_opt_strs+1620)
+#define USER_name      (ntpd_opt_strs+2374)
 #endif  /* HAVE_DROPROOT */
 
 /**
  *  updateinterval option description:
  */
 /** Descriptive text for the updateinterval option */
-#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2376)
+#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2379)
 /** Upper-cased name for the updateinterval option */
-#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2440)
+#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2443)
 /** Name string for the updateinterval option */
-#define UPDATEINTERVAL_name      (ntpd_opt_strs+2455)
+#define UPDATEINTERVAL_name      (ntpd_opt_strs+2458)
 /** Compiled in flag settings for the updateinterval option */
 #define UPDATEINTERVAL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -632,11 +632,11 @@ static int const aSaveconfigquitCantList[] = {
  *  var option description:
  */
 /** Descriptive text for the var option */
-#define VAR_DESC      (ntpd_opt_strs+2470)
+#define VAR_DESC      (ntpd_opt_strs+2473)
 /** Upper-cased name for the var option */
-#define VAR_NAME      (ntpd_opt_strs+2500)
+#define VAR_NAME      (ntpd_opt_strs+2503)
 /** Name string for the var option */
-#define VAR_name      (ntpd_opt_strs+2504)
+#define VAR_name      (ntpd_opt_strs+2507)
 /** Compiled in flag settings for the var option */
 #define VAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -645,11 +645,11 @@ static int const aSaveconfigquitCantList[] = {
  *  dvar option description:
  */
 /** Descriptive text for the dvar option */
-#define DVAR_DESC      (ntpd_opt_strs+2508)
+#define DVAR_DESC      (ntpd_opt_strs+2511)
 /** Upper-cased name for the dvar option */
-#define DVAR_NAME      (ntpd_opt_strs+2542)
+#define DVAR_NAME      (ntpd_opt_strs+2545)
 /** Name string for the dvar option */
-#define DVAR_name      (ntpd_opt_strs+2547)
+#define DVAR_name      (ntpd_opt_strs+2550)
 /** Compiled in flag settings for the dvar option */
 #define DVAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -660,11 +660,11 @@ static int const aSaveconfigquitCantList[] = {
  */
 #ifdef HAVE_WORKING_FORK
 /** Descriptive text for the wait-sync option */
-#define WAIT_SYNC_DESC      (ntpd_opt_strs+2552)
+#define WAIT_SYNC_DESC      (ntpd_opt_strs+2555)
 /** Upper-cased name for the wait-sync option */
-#define WAIT_SYNC_NAME      (ntpd_opt_strs+2589)
+#define WAIT_SYNC_NAME      (ntpd_opt_strs+2592)
 /** Name string for the wait-sync option */
-#define WAIT_SYNC_name      (ntpd_opt_strs+2599)
+#define WAIT_SYNC_name      (ntpd_opt_strs+2602)
 /** Other options that appear in conjunction with the wait-sync option */
 static int const aWait_SyncCantList[] = {
     INDEX_OPT_NOFORK,
@@ -686,11 +686,11 @@ static int const aWait_SyncCantList[] = {
  *  slew option description:
  */
 /** Descriptive text for the slew option */
-#define SLEW_DESC      (ntpd_opt_strs+2609)
+#define SLEW_DESC      (ntpd_opt_strs+2612)
 /** Upper-cased name for the slew option */
-#define SLEW_NAME      (ntpd_opt_strs+2632)
+#define SLEW_NAME      (ntpd_opt_strs+2635)
 /** Name string for the slew option */
-#define SLEW_name      (ntpd_opt_strs+2637)
+#define SLEW_name      (ntpd_opt_strs+2640)
 /** Compiled in flag settings for the slew option */
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
@@ -699,11 +699,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the usepcc option */
-#define USEPCC_DESC      (ntpd_opt_strs+2642)
+#define USEPCC_DESC      (ntpd_opt_strs+2645)
 /** Upper-cased name for the usepcc option */
-#define USEPCC_NAME      (ntpd_opt_strs+2679)
+#define USEPCC_NAME      (ntpd_opt_strs+2682)
 /** Name string for the usepcc option */
-#define USEPCC_name      (ntpd_opt_strs+2686)
+#define USEPCC_name      (ntpd_opt_strs+2689)
 /** Compiled in flag settings for the usepcc option */
 #define USEPCC_FLAGS     (OPTST_DISABLED)
 
@@ -719,11 +719,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef SYS_WINNT
 /** Descriptive text for the pccfreq option */
-#define PCCFREQ_DESC      (ntpd_opt_strs+2693)
+#define PCCFREQ_DESC      (ntpd_opt_strs+2696)
 /** Upper-cased name for the pccfreq option */
-#define PCCFREQ_NAME      (ntpd_opt_strs+2736)
+#define PCCFREQ_NAME      (ntpd_opt_strs+2739)
 /** Name string for the pccfreq option */
-#define PCCFREQ_name      (ntpd_opt_strs+2744)
+#define PCCFREQ_name      (ntpd_opt_strs+2747)
 /** Compiled in flag settings for the pccfreq option */
 #define PCCFREQ_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -740,11 +740,11 @@ static int const aWait_SyncCantList[] = {
  */
 #ifdef HAVE_DNSREGISTRATION
 /** Descriptive text for the mdns option */
-#define MDNS_DESC      (ntpd_opt_strs+2752)
+#define MDNS_DESC      (ntpd_opt_strs+2755)
 /** Upper-cased name for the mdns option */
-#define MDNS_NAME      (ntpd_opt_strs+2787)
+#define MDNS_NAME      (ntpd_opt_strs+2790)
 /** Name string for the mdns option */
-#define MDNS_name      (ntpd_opt_strs+2792)
+#define MDNS_name      (ntpd_opt_strs+2795)
 /** Compiled in flag settings for the mdns option */
 #define MDNS_FLAGS     (OPTST_DISABLED)
 
@@ -758,11 +758,11 @@ static int const aWait_SyncCantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpd_opt_strs+2797)
-#define HELP_name       (ntpd_opt_strs+2841)
+#define HELP_DESC       (ntpd_opt_strs+2800)
+#define HELP_name       (ntpd_opt_strs+2844)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpd_opt_strs+2846)
-#define MORE_HELP_name  (ntpd_opt_strs+2891)
+#define MORE_HELP_DESC  (ntpd_opt_strs+2849)
+#define MORE_HELP_name  (ntpd_opt_strs+2894)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -775,8 +775,8 @@ static int const aWait_SyncCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (ntpd_opt_strs+2901)
-#define VER_name        (ntpd_opt_strs+2937)
+#define VER_DESC        (ntpd_opt_strs+2904)
+#define VER_name        (ntpd_opt_strs+2940)
 /**
  *  Declare option callback procedures
  */
@@ -1258,21 +1258,21 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of ntpd. */
-#define zPROGNAME       (ntpd_opt_strs+2945)
+#define zPROGNAME       (ntpd_opt_strs+2948)
 /** Reference to the title line for ntpd usage. */
-#define zUsageTitle     (ntpd_opt_strs+2950)
+#define zUsageTitle     (ntpd_opt_strs+2953)
 /** There is no ntpd configuration file. */
 #define zRcName         NULL
 /** There are no directories to search for ntpd config files. */
 #define apzHomeList     NULL
 /** The ntpd program bug email address. */
-#define zBugsAddr       (ntpd_opt_strs+3081)
+#define zBugsAddr       (ntpd_opt_strs+3088)
 /** Clarification/explanation of what ntpd does. */
-#define zExplain        (ntpd_opt_strs+3115)
+#define zExplain        (ntpd_opt_strs+3122)
 /** Extra detail explaining what ntpd does. */
 #define zDetail         (NULL)
 /** The full version string for ntpd. */
-#define zFullVersion    (ntpd_opt_strs+3117)
+#define zFullVersion    (ntpd_opt_strs+3124)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -1529,7 +1529,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdOptions.pzCopyright */
-  puts(_("ntpd 4.2.8p1\n\
+  puts(_("ntpd 4.2.8p2-RC1\n\
 Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\
 This is free software. It is licensed for use, modification and\n\
 redistribution under the terms of the NTP License, copies of which\n\
@@ -1580,7 +1580,7 @@ implied warranty.\n"));
   puts(_("Allow the first adjustment to be Big"));
 
   /* referenced via ntpdOptions.pOptDesc->pzText */
-  puts(_("Always step the time once at startup"));
+  puts(_("Step any initial offset correction."));
 
   /* referenced via ntpdOptions.pOptDesc->pzText */
   puts(_("Jail directory"));
@@ -1670,7 +1670,7 @@ implied warranty.\n"));
   puts(_("output version information and exit"));
 
   /* referenced via ntpdOptions.pzUsageTitle */
-  puts(_("ntpd - NTP daemon program - Ver. 4.2.8p1\n\
+  puts(_("ntpd - NTP daemon program - Ver. 4.2.8p2-RC1\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n"));
 
@@ -1678,7 +1678,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via ntpdOptions.pzFullVersion */
-  puts(_("ntpd 4.2.8p1"));
+  puts(_("ntpd 4.2.8p2-RC1"));
 
   /* referenced via ntpdOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -1692,14 +1692,14 @@ Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 90 "../init.c"
+#line 86 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 88 "../init.c"
+#line 84 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
 #line 80 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 92 "../init.c"
+#line 88 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index a040cb3ee77297d7fa2580078d541deaf6ab54e3..474b41119edb1ae182b45fbcf02f73b6cdd106b5 100644 (file)
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *
- *  It has been AutoGen-ed  March 30, 2015 at 10:48:00 AM by AutoGen 5.18.4
+ *  It has been AutoGen-ed  April  2, 2015 at 07:30:34 AM by AutoGen 5.18.5pre6
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -106,9 +106,9 @@ typedef enum {
 /** count of all options for ntpd */
 #define OPTION_CT    38
 /** ntpd version */
-#define NTPD_VERSION       "4.2.8p1"
+#define NTPD_VERSION       "4.2.8p2-RC1"
 /** Full ntpd version text */
-#define NTPD_FULL_VERSION  "ntpd 4.2.8p1"
+#define NTPD_FULL_VERSION  "ntpd 4.2.8p2-RC1"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index 54394648d77ad613a763452550c8d8ba4dcc77a6..0e160d1816e30ab7868250de171fc6847ba637eb 100644 (file)
--- a/ntpd/ntpd.1ntpdman
+++ b/ntpd/ntpd.1ntpdman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd 1ntpdman "30 Mar 2015" "4.2.8p2-RC1" "User Commands"
+.TH ntpd 1ntpdman "02 Apr 2015" "4.2.8p2-RC1" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-NSaOre/ag-ZSaGqe)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 30, 2015 at 04:46:02 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed April 2, 2015 at 07:30:51 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -175,7 +175,7 @@ The name and path of the frequency file,
 by default.
 This is the same operation as the
 \fBdriftfile\fP \fIdriftfile\fP
-configuration specification in the 
+configuration specification in the
 \fI/etc/ntp.conf\fP
 file.
 .TP
@@ -196,6 +196,20 @@ See the
 \fBtinker\fP
 configuration file directive for other options.
 .TP
+.NOP \f\*[B-Font]\-G\f[], \f\*[B-Font]\-\-force\-step\-once\f[]
+Step any initial offset correction..
+.sp
+Normally,
+\fBntpd\fP
+steps the time if the time offset exceeds the step threshold,
+which is 128 ms by default, and otherwise slews the time.
+This option forces the initial offset correction to be stepped,
+so the highest time accuracy can be achieved quickly.
+However, this may also cause the time to be stepped back
+so this option must not be used if
+applications requiring monotonic time are running.
+See the \fBtinker\fP configuration file directive for other options.
+.TP
 .NOP \f\*[B-Font]\-i\f[] \f\*[I-Font]string\f[], \f\*[B-Font]\-\-jaildir\f[]=\f\*[I-Font]string\f[]
 Jail directory.
 .sp
@@ -220,7 +234,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-\fBinterface\fP command, which is more versatile. 
+\fBinterface\fP command, which is more versatile.
 .TP
 .NOP \f\*[B-Font]\-k\f[] \f\*[I-Font]string\f[], \f\*[B-Font]\-\-keyfile\f[]=\f\*[I-Font]string\f[]
 path to symmetric keys.

diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index 408a4bf7000535449d303309350d490a15cbd56f..3a4bf11e5dc09e0a1b0f48c0f1796396670bd408 100644 (file)
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd March 30 2015
+.Dd April 2 2015
 .Dt NTPD 1ntpdmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 30, 2015 at 04:46:19 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  April  2, 2015 at 07:30:47 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -144,7 +144,7 @@ The name and path of the frequency file,
 by default.
 This is the same operation as the
 \fBdriftfile\fP \fIdriftfile\fP
-configuration specification in the 
+configuration specification in the
 \fI/etc/ntp.conf\fP
 file.
 .It  Fl g , Fl \-panicgate 
@@ -163,6 +163,19 @@ options.
 See the
 \fBtinker\fP
 configuration file directive for other options.
+.It  Fl G , Fl \-force\-step\-once 
+Step any initial offset correction..
+.sp
+Normally,
+\fBntpd\fP
+steps the time if the time offset exceeds the step threshold,
+which is 128 ms by default, and otherwise slews the time.
+This option forces the initial offset correction to be stepped,
+so the highest time accuracy can be achieved quickly.
+However, this may also cause the time to be stepped back
+so this option must not be used if
+applications requiring monotonic time are running.
+See the \fBtinker\fP configuration file directive for other options.
 .It  Fl i Ar string , Fl \-jaildir Ns = Ns Ar string 
 Jail directory.
 .sp
@@ -186,7 +199,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-\fBinterface\fP command, which is more versatile. 
+\fBinterface\fP command, which is more versatile.
 .It  Fl k Ar string , Fl \-keyfile Ns = Ns Ar string 
 path to symmetric keys.
 .sp

diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index 49fe97b6656df8ec0ff35f431e4479bd253d3bbe..0af91438ba1e3e6326bee2e9d951d0a64b4fdb15 100644 (file)
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH ntpd @NTPD_MS@ "30 Mar 2015" "4.2.8p2-RC1" "User Commands"
+.TH ntpd @NTPD_MS@ "02 Apr 2015" "4.2.8p2-RC1" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-NSaOre/ag-ZSaGqe)
+.\" EDIT THIS FILE WITH CAUTION (in-mem file)
 .\"
-.\" It has been AutoGen-ed March 30, 2015 at 04:46:02 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed April 2, 2015 at 07:30:51 AM by AutoGen 5.18.5pre6
 .\" From the definitions ntpd-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -175,7 +175,7 @@ The name and path of the frequency file,
 by default.
 This is the same operation as the
 \fBdriftfile\fP \fIdriftfile\fP
-configuration specification in the 
+configuration specification in the
 \fI/etc/ntp.conf\fP
 file.
 .TP
@@ -196,6 +196,20 @@ See the
 \fBtinker\fP
 configuration file directive for other options.
 .TP
+.NOP \f\*[B-Font]\-G\f[], \f\*[B-Font]\-\-force\-step\-once\f[]
+Step any initial offset correction..
+.sp
+Normally,
+\fBntpd\fP
+steps the time if the time offset exceeds the step threshold,
+which is 128 ms by default, and otherwise slews the time.
+This option forces the initial offset correction to be stepped,
+so the highest time accuracy can be achieved quickly.
+However, this may also cause the time to be stepped back
+so this option must not be used if
+applications requiring monotonic time are running.
+See the \fBtinker\fP configuration file directive for other options.
+.TP
 .NOP \f\*[B-Font]\-i\f[] \f\*[I-Font]string\f[], \f\*[B-Font]\-\-jaildir\f[]=\f\*[I-Font]string\f[]
 Jail directory.
 .sp
@@ -220,7 +234,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-\fBinterface\fP command, which is more versatile. 
+\fBinterface\fP command, which is more versatile.
 .TP
 .NOP \f\*[B-Font]\-k\f[] \f\*[I-Font]string\f[], \f\*[B-Font]\-\-keyfile\f[]=\f\*[I-Font]string\f[]
 path to symmetric keys.

diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 315908457385005315541d2ca88f9e1b66333058..8572ce6911c69f78c6100fe3a94d220f4ec96926 100644 (file)
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd March 30 2015
+.Dd April 2 2015
 .Dt NTPD @NTPD_MS@ User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  March 30, 2015 at 04:46:19 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  April  2, 2015 at 07:30:47 AM by AutoGen 5.18.5pre6
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -144,7 +144,7 @@ The name and path of the frequency file,
 by default.
 This is the same operation as the
 \fBdriftfile\fP \fIdriftfile\fP
-configuration specification in the 
+configuration specification in the
 \fI/etc/ntp.conf\fP
 file.
 .It  Fl g , Fl \-panicgate 
@@ -163,6 +163,19 @@ options.
 See the
 \fBtinker\fP
 configuration file directive for other options.
+.It  Fl G , Fl \-force\-step\-once 
+Step any initial offset correction..
+.sp
+Normally,
+\fBntpd\fP
+steps the time if the time offset exceeds the step threshold,
+which is 128 ms by default, and otherwise slews the time.
+This option forces the initial offset correction to be stepped,
+so the highest time accuracy can be achieved quickly.
+However, this may also cause the time to be stepped back
+so this option must not be used if
+applications requiring monotonic time are running.
+See the \fBtinker\fP configuration file directive for other options.
 .It  Fl i Ar string , Fl \-jaildir Ns = Ns Ar string 
 Jail directory.
 .sp
@@ -186,7 +199,7 @@ Open the network address given, or all the addresses associated with the
 given interface name.  This option may appear multiple times.  This option
 also implies not opening other addresses, except wildcard and localhost.
 This option is deprecated. Please consider using the configuration file
-\fBinterface\fP command, which is more versatile. 
+\fBinterface\fP command, which is more versatile.
 .It  Fl k Ar string , Fl \-keyfile Ns = Ns Ar string 
 path to symmetric keys.
 .sp

diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index 140273cb55e66a8bd15194c8db37d9215c14d683..66b953528c7a297144b58b7c64e23fb2dcc2d132 100644 (file)
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -117,15 +117,18 @@ flag = {
 flag = {
     name      = force_step_once;
     value     = G;
-    descrip   = "Always step the time once at startup";
+    descrip   = "Step any initial offset correction.";
     doc = <<-  _EndOfDoc_
        Normally,
        @code{ntpd}
-       steps the time if the time offset exceeds the step threshold, which is 128 ms by default, and otherwise always slews the time. This option allows the time to be stepped always once at startup, so the highest time accuracy can be achieved quickly. However, this may also cause the time to be stepped back, so care must be taken if sensitive applications are used. Using this option also implies
-       @code{-g}.
-       See the
-       @code{tinker}
-       configuration file directive for other options.
+       steps the time if the time offset exceeds the step threshold,
+       which is 128 ms by default, and otherwise slews the time.
+       This option forces the initial offset correction to be stepped,
+       so the highest time accuracy can be achieved quickly.
+       However, this may also cause the time to be stepped back
+       so this option must not be used if
+       applications requiring monotonic time are running.
+       See the @code{tinker} configuration file directive for other options.
        _EndOfDoc_;
 };