From: Harlan Stenn Date: Sun, 25 Jan 2015 01:47:20 +0000 (-0500) Subject: NTP_4_2_8P1_RC1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5a1ec29ba4c9095ace111d4b6c49074159d3353;p=thirdparty%2Fntp.git NTP_4_2_8P1_RC1 bk: 54c44b28PKQ6EVxpjXv6b4tMk0Azuw --- diff --git a/ChangeLog b/ChangeLog index 880369261..55c2fcbe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.8p1-RC1) 2015/01/24 Released by Harlan Stenn * Start the RC for 4.2.8p1. * [Bug 2187] Update version number generation scripts. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index cd73a29bf..d02bd6096 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed January 7, 2015 at 03:03:26 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 24, 2015 at 08:44:50 PM by AutoGen 5.18.5pre4 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index f52b57668..4e17d1b28 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed January 7, 2015 at 03:03:29 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 24, 2015 at 08:44:53 PM by AutoGen 5.18.5pre4 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index 5baf797c4..069d25cd8 100644 --- 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 January 7, 2015 at 03:03:31 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 24, 2015 at 08:44:55 PM by AutoGen 5.18.5pre4 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -141,7 +141,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.8p1-beta5 +ntpd - NTP daemon program - Ver. 4.2.8p1-RC1 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 7283ae37a..cd967f4f5 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "07 Jan 2015" "4.2.8p1-beta5" "File Formats" +.TH ntp.conf 5man "24 Jan 2015" "4.2.8p1-RC1" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-ciaa2t/ag-Dia40t) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5DaOqv/ag-fEaGpv) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:14 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:37 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2989,9 +2989,9 @@ RFC5905 .PP .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The syntax checking is not picky; some combinations of diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 5db2acb1c..8a1e48fc5 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:33 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:58 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2798,9 +2798,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5905 .Re .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The syntax checking is not picky; some combinations of diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index ce9c07226..4f34c3eae 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.2.8p1-beta5 of ntp.conf. +

This document applies to version 4.2.8p1-RC1 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 07ed0b5af..158682ee5 100644 --- a/ntpd/ntp.conf.man.in +++ b/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "07 Jan 2015" "4.2.8p1-beta5" "File Formats" +.TH ntp.conf 5 "24 Jan 2015" "4.2.8p1-RC1" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-ciaa2t/ag-Dia40t) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5DaOqv/ag-fEaGpv) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:14 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:37 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2989,9 +2989,9 @@ RFC5905 .PP .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The syntax checking is not picky; some combinations of diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 9768d0179..6b79280d0 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:33 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:58 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2798,9 +2798,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5905 .Re .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The syntax checking is not picky; some combinations of diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index fc9ff8063..6611c006a 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "07 Jan 2015" "4.2.8p1-beta5" "File Formats" +.TH ntp.keys 5man "24 Jan 2015" "4.2.8p1-RC1" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:19 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:41 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -158,9 +158,9 @@ the default name of the configuration file \fCntpdc\fR(1ntpdcmdoc)\f[], \fCsntp\fR(1sntpmdoc)\f[] .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index 73877d388..3f1857a37 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:37 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:45:01 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -145,9 +145,9 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .Xr ntpdc 1ntpdcmdoc , .Xr sntp 1sntpmdoc .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index 833135abd..0f70273a2 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the symmetric key file for the NTP Project's ntpd program. -

This document applies to version 4.2.8p1-beta5 of ntp.keys. +

This document applies to version 4.2.8p1-RC1 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index aff331b8b..4ecdd3352 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "07 Jan 2015" "4.2.8p1-beta5" "File Formats" +.TH ntp.keys 5 "24 Jan 2015" "4.2.8p1-RC1" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:19 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:41 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -158,9 +158,9 @@ the default name of the configuration file \fCntpdc\fR(@NTPDC_MS@)\f[], \fCsntp\fR(@SNTP_MS@)\f[] .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 3fa3ffe19..fadc8e313 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:37 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:45:01 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME @@ -145,9 +145,9 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .Xr ntpdc @NTPDC_MS@ , .Xr sntp @SNTP_MS@ .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index f9c734f82..0e1cc36fd 100644 --- 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 January 7, 2015 at 03:00:53 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 24, 2015 at 08:42:07 PM by AutoGen 5.18.5pre4 * From the definitions ntpd-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntpd program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. + * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -31,7 +31,7 @@ * both the copyright notice and this permission notice appear in * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware makes no + * without specific, written prior permission. The University of Delaware and Network Time Foundation makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -50,7 +50,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (ntpd_opt_strs+0) -#define zLicenseDescrip (ntpd_opt_strs+318) +#define zLicenseDescrip (ntpd_opt_strs+344) /* * global included definitions @@ -74,150 +74,151 @@ extern FILE * option_usage_fp; /** * static const strings for ntpd options */ -static char const ntpd_opt_strs[3023] = -/* 0 */ "ntpd 4.2.8p1-beta5\n" - "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" +static char const ntpd_opt_strs[3073] = +/* 0 */ "ntpd 4.2.8p1-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" " \n" " \n\0" -/* 318 */ "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" "documentation, and that the name The University of Delaware not be used in\n" "advertising or publicity pertaining to distribution of the software without\n" - "specific, written prior permission. The University of Delaware makes no\n" - "representations about the suitability this software for any purpose. It is\n" - "provided \"as is\" without express or implied warranty.\n\0" -/* 958 */ "Force IPv4 DNS name resolution\0" -/* 989 */ "IPV4\0" -/* 994 */ "ipv4\0" -/* 999 */ "Force IPv6 DNS name resolution\0" -/* 1030 */ "IPV6\0" -/* 1035 */ "ipv6\0" -/* 1040 */ "Require crypto authentication\0" -/* 1070 */ "AUTHREQ\0" -/* 1078 */ "authreq\0" -/* 1086 */ "Do not require crypto authentication\0" -/* 1123 */ "AUTHNOREQ\0" -/* 1133 */ "authnoreq\0" -/* 1143 */ "Allow us to sync to broadcast servers\0" -/* 1181 */ "BCASTSYNC\0" -/* 1191 */ "bcastsync\0" -/* 1201 */ "configuration file name\0" -/* 1225 */ "CONFIGFILE\0" -/* 1236 */ "configfile\0" -/* 1247 */ "Increase debug verbosity level\0" -/* 1278 */ "DEBUG_LEVEL\0" -/* 1290 */ "debug-level\0" -/* 1302 */ "Set the debug verbosity level\0" -/* 1332 */ "SET_DEBUG_LEVEL\0" -/* 1348 */ "set-debug-level\0" -/* 1364 */ "frequency drift file name\0" -/* 1390 */ "DRIFTFILE\0" -/* 1400 */ "driftfile\0" -/* 1410 */ "Allow the first adjustment to be Big\0" -/* 1447 */ "PANICGATE\0" -/* 1457 */ "panicgate\0" -/* 1467 */ "Jail directory\0" -/* 1482 */ "JAILDIR\0" -/* 1490 */ "jaildir\0" -/* 1498 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0" -/* 1577 */ "Listen on an interface name or address\0" -/* 1616 */ "INTERFACE\0" -/* 1626 */ "interface\0" -/* 1636 */ "path to symmetric keys\0" -/* 1659 */ "KEYFILE\0" -/* 1667 */ "keyfile\0" -/* 1675 */ "path to the log file\0" -/* 1696 */ "LOGFILE\0" -/* 1704 */ "logfile\0" -/* 1712 */ "Do not listen to virtual interfaces\0" -/* 1748 */ "NOVIRTUALIPS\0" -/* 1761 */ "novirtualips\0" -/* 1774 */ "Modify Multimedia Timer (Windows only)\0" -/* 1813 */ "MODIFYMMTIMER\0" -/* 1827 */ "modifymmtimer\0" -/* 1841 */ "Do not fork\0" -/* 1853 */ "NOFORK\0" -/* 1860 */ "nofork\0" -/* 1867 */ "Run at high priority\0" -/* 1888 */ "NICE\0" -/* 1893 */ "nice\0" -/* 1898 */ "path to the PID file\0" -/* 1919 */ "PIDFILE\0" -/* 1927 */ "pidfile\0" -/* 1935 */ "Process priority\0" -/* 1952 */ "PRIORITY\0" -/* 1961 */ "priority\0" -/* 1970 */ "Set the time and quit\0" -/* 1992 */ "QUIT\0" -/* 1997 */ "quit\0" -/* 2002 */ "Broadcast/propagation delay\0" -/* 2030 */ "PROPAGATIONDELAY\0" -/* 2047 */ "propagationdelay\0" -/* 2064 */ "Save parsed configuration and quit\0" -/* 2099 */ "SAVECONFIGQUIT\0" -/* 2114 */ "saveconfigquit\0" -/* 2129 */ "Statistics file location\0" -/* 2154 */ "STATSDIR\0" -/* 2163 */ "statsdir\0" -/* 2172 */ "Trusted key number\0" -/* 2191 */ "TRUSTEDKEY\0" -/* 2202 */ "trustedkey\0" -/* 2213 */ "Run as userid (or userid:groupid)\0" -/* 2247 */ "USER\0" -/* 2252 */ "user\0" -/* 2257 */ "interval in seconds between scans for new or dropped interfaces\0" -/* 2321 */ "UPDATEINTERVAL\0" -/* 2336 */ "updateinterval\0" -/* 2351 */ "make ARG an ntp variable (RW)\0" -/* 2381 */ "VAR\0" -/* 2385 */ "var\0" -/* 2389 */ "make ARG an ntp variable (RW|DEF)\0" -/* 2423 */ "DVAR\0" -/* 2428 */ "dvar\0" -/* 2433 */ "Seconds to wait for first clock sync\0" -/* 2470 */ "WAIT_SYNC\0" -/* 2480 */ "wait-sync\0" -/* 2490 */ "Slew up to 600 seconds\0" -/* 2513 */ "SLEW\0" -/* 2518 */ "slew\0" -/* 2523 */ "Use CPU cycle counter (Windows only)\0" -/* 2560 */ "USEPCC\0" -/* 2567 */ "usepcc\0" -/* 2574 */ "Force CPU cycle counter use (Windows only)\0" -/* 2617 */ "PCCFREQ\0" -/* 2625 */ "pccfreq\0" -/* 2633 */ "Register with mDNS as a NTP server\0" -/* 2668 */ "MDNS\0" -/* 2673 */ "mdns\0" -/* 2678 */ "display extended usage information and exit\0" -/* 2722 */ "help\0" -/* 2727 */ "extended usage information passed thru pager\0" -/* 2772 */ "more-help\0" -/* 2782 */ "output version information and exit\0" -/* 2818 */ "version\0" -/* 2826 */ "NTPD\0" -/* 2831 */ "ntpd - NTP daemon program - Ver. 4.2.8p1-beta5\n" + "specific, written prior permission. The University of Delaware and Network\n" + "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" +/* 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 */ "Jail directory\0" +/* 1536 */ "JAILDIR\0" +/* 1544 */ "jaildir\0" +/* 1552 */ "built without --enable-clockctl or --enable-linuxcaps or --enable-solarisprivs\0" +/* 1631 */ "Listen on an interface name or address\0" +/* 1670 */ "INTERFACE\0" +/* 1680 */ "interface\0" +/* 1690 */ "path to symmetric keys\0" +/* 1713 */ "KEYFILE\0" +/* 1721 */ "keyfile\0" +/* 1729 */ "path to the log file\0" +/* 1750 */ "LOGFILE\0" +/* 1758 */ "logfile\0" +/* 1766 */ "Do not listen to virtual interfaces\0" +/* 1802 */ "NOVIRTUALIPS\0" +/* 1815 */ "novirtualips\0" +/* 1828 */ "Modify Multimedia Timer (Windows only)\0" +/* 1867 */ "MODIFYMMTIMER\0" +/* 1881 */ "modifymmtimer\0" +/* 1895 */ "Do not fork\0" +/* 1907 */ "NOFORK\0" +/* 1914 */ "nofork\0" +/* 1921 */ "Run at high priority\0" +/* 1942 */ "NICE\0" +/* 1947 */ "nice\0" +/* 1952 */ "path to the PID file\0" +/* 1973 */ "PIDFILE\0" +/* 1981 */ "pidfile\0" +/* 1989 */ "Process priority\0" +/* 2006 */ "PRIORITY\0" +/* 2015 */ "priority\0" +/* 2024 */ "Set the time and quit\0" +/* 2046 */ "QUIT\0" +/* 2051 */ "quit\0" +/* 2056 */ "Broadcast/propagation delay\0" +/* 2084 */ "PROPAGATIONDELAY\0" +/* 2101 */ "propagationdelay\0" +/* 2118 */ "Save parsed configuration and quit\0" +/* 2153 */ "SAVECONFIGQUIT\0" +/* 2168 */ "saveconfigquit\0" +/* 2183 */ "Statistics file location\0" +/* 2208 */ "STATSDIR\0" +/* 2217 */ "statsdir\0" +/* 2226 */ "Trusted key number\0" +/* 2245 */ "TRUSTEDKEY\0" +/* 2256 */ "trustedkey\0" +/* 2267 */ "Run as userid (or userid:groupid)\0" +/* 2301 */ "USER\0" +/* 2306 */ "user\0" +/* 2311 */ "interval in seconds between scans for new or dropped interfaces\0" +/* 2375 */ "UPDATEINTERVAL\0" +/* 2390 */ "updateinterval\0" +/* 2405 */ "make ARG an ntp variable (RW)\0" +/* 2435 */ "VAR\0" +/* 2439 */ "var\0" +/* 2443 */ "make ARG an ntp variable (RW|DEF)\0" +/* 2477 */ "DVAR\0" +/* 2482 */ "dvar\0" +/* 2487 */ "Seconds to wait for first clock sync\0" +/* 2524 */ "WAIT_SYNC\0" +/* 2534 */ "wait-sync\0" +/* 2544 */ "Slew up to 600 seconds\0" +/* 2567 */ "SLEW\0" +/* 2572 */ "slew\0" +/* 2577 */ "Use CPU cycle counter (Windows only)\0" +/* 2614 */ "USEPCC\0" +/* 2621 */ "usepcc\0" +/* 2628 */ "Force CPU cycle counter use (Windows only)\0" +/* 2671 */ "PCCFREQ\0" +/* 2679 */ "pccfreq\0" +/* 2687 */ "Register with mDNS as a NTP server\0" +/* 2722 */ "MDNS\0" +/* 2727 */ "mdns\0" +/* 2732 */ "display extended usage information and exit\0" +/* 2776 */ "help\0" +/* 2781 */ "extended usage information passed thru pager\0" +/* 2826 */ "more-help\0" +/* 2836 */ "output version information and exit\0" +/* 2872 */ "version\0" +/* 2880 */ "NTPD\0" +/* 2885 */ "ntpd - NTP daemon program - Ver. 4.2.8p1-RC1\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" -/* 2968 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 3002 */ "\n\0" -/* 3004 */ "ntpd 4.2.8p1-beta5"; +/* 3020 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 3054 */ "\n\0" +/* 3056 */ "ntpd 4.2.8p1-RC1"; /** * ipv4 option description with * "Must also have options" and "Incompatible options": */ /** Descriptive text for the ipv4 option */ -#define IPV4_DESC (ntpd_opt_strs+958) +#define IPV4_DESC (ntpd_opt_strs+1012) /** Upper-cased name for the ipv4 option */ -#define IPV4_NAME (ntpd_opt_strs+989) +#define IPV4_NAME (ntpd_opt_strs+1043) /** Name string for the ipv4 option */ -#define IPV4_name (ntpd_opt_strs+994) +#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 }; @@ -229,11 +230,11 @@ static int const aIpv4CantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the ipv6 option */ -#define IPV6_DESC (ntpd_opt_strs+999) +#define IPV6_DESC (ntpd_opt_strs+1053) /** Upper-cased name for the ipv6 option */ -#define IPV6_NAME (ntpd_opt_strs+1030) +#define IPV6_NAME (ntpd_opt_strs+1084) /** Name string for the ipv6 option */ -#define IPV6_name (ntpd_opt_strs+1035) +#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 }; @@ -245,11 +246,11 @@ static int const aIpv6CantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the authreq option */ -#define AUTHREQ_DESC (ntpd_opt_strs+1040) +#define AUTHREQ_DESC (ntpd_opt_strs+1094) /** Upper-cased name for the authreq option */ -#define AUTHREQ_NAME (ntpd_opt_strs+1070) +#define AUTHREQ_NAME (ntpd_opt_strs+1124) /** Name string for the authreq option */ -#define AUTHREQ_name (ntpd_opt_strs+1078) +#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 }; @@ -261,11 +262,11 @@ static int const aAuthreqCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the authnoreq option */ -#define AUTHNOREQ_DESC (ntpd_opt_strs+1086) +#define AUTHNOREQ_DESC (ntpd_opt_strs+1140) /** Upper-cased name for the authnoreq option */ -#define AUTHNOREQ_NAME (ntpd_opt_strs+1123) +#define AUTHNOREQ_NAME (ntpd_opt_strs+1177) /** Name string for the authnoreq option */ -#define AUTHNOREQ_name (ntpd_opt_strs+1133) +#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 }; @@ -276,11 +277,11 @@ static int const aAuthnoreqCantList[] = { * bcastsync option description: */ /** Descriptive text for the bcastsync option */ -#define BCASTSYNC_DESC (ntpd_opt_strs+1143) +#define BCASTSYNC_DESC (ntpd_opt_strs+1197) /** Upper-cased name for the bcastsync option */ -#define BCASTSYNC_NAME (ntpd_opt_strs+1181) +#define BCASTSYNC_NAME (ntpd_opt_strs+1235) /** Name string for the bcastsync option */ -#define BCASTSYNC_name (ntpd_opt_strs+1191) +#define BCASTSYNC_name (ntpd_opt_strs+1245) /** Compiled in flag settings for the bcastsync option */ #define BCASTSYNC_FLAGS (OPTST_DISABLED) @@ -288,11 +289,11 @@ static int const aAuthnoreqCantList[] = { * configfile option description: */ /** Descriptive text for the configfile option */ -#define CONFIGFILE_DESC (ntpd_opt_strs+1201) +#define CONFIGFILE_DESC (ntpd_opt_strs+1255) /** Upper-cased name for the configfile option */ -#define CONFIGFILE_NAME (ntpd_opt_strs+1225) +#define CONFIGFILE_NAME (ntpd_opt_strs+1279) /** Name string for the configfile option */ -#define CONFIGFILE_name (ntpd_opt_strs+1236) +#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)) @@ -301,11 +302,11 @@ static int const aAuthnoreqCantList[] = { * debug-level option description: */ /** Descriptive text for the debug-level option */ -#define DEBUG_LEVEL_DESC (ntpd_opt_strs+1247) +#define DEBUG_LEVEL_DESC (ntpd_opt_strs+1301) /** Upper-cased name for the debug-level option */ -#define DEBUG_LEVEL_NAME (ntpd_opt_strs+1278) +#define DEBUG_LEVEL_NAME (ntpd_opt_strs+1332) /** Name string for the debug-level option */ -#define DEBUG_LEVEL_name (ntpd_opt_strs+1290) +#define DEBUG_LEVEL_name (ntpd_opt_strs+1344) /** Compiled in flag settings for the debug-level option */ #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) @@ -313,11 +314,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+1302) +#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+1332) +#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+1348) +#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)) @@ -326,11 +327,11 @@ static int const aAuthnoreqCantList[] = { * driftfile option description: */ /** Descriptive text for the driftfile option */ -#define DRIFTFILE_DESC (ntpd_opt_strs+1364) +#define DRIFTFILE_DESC (ntpd_opt_strs+1418) /** Upper-cased name for the driftfile option */ -#define DRIFTFILE_NAME (ntpd_opt_strs+1390) +#define DRIFTFILE_NAME (ntpd_opt_strs+1444) /** Name string for the driftfile option */ -#define DRIFTFILE_name (ntpd_opt_strs+1400) +#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)) @@ -339,11 +340,11 @@ static int const aAuthnoreqCantList[] = { * panicgate option description: */ /** Descriptive text for the panicgate option */ -#define PANICGATE_DESC (ntpd_opt_strs+1410) +#define PANICGATE_DESC (ntpd_opt_strs+1464) /** Upper-cased name for the panicgate option */ -#define PANICGATE_NAME (ntpd_opt_strs+1447) +#define PANICGATE_NAME (ntpd_opt_strs+1501) /** Name string for the panicgate option */ -#define PANICGATE_name (ntpd_opt_strs+1457) +#define PANICGATE_name (ntpd_opt_strs+1511) /** Compiled in flag settings for the panicgate option */ #define PANICGATE_FLAGS (OPTST_DISABLED) @@ -352,11 +353,11 @@ static int const aAuthnoreqCantList[] = { */ #ifdef HAVE_DROPROOT /** Descriptive text for the jaildir option */ -#define JAILDIR_DESC (ntpd_opt_strs+1467) +#define JAILDIR_DESC (ntpd_opt_strs+1521) /** Upper-cased name for the jaildir option */ -#define JAILDIR_NAME (ntpd_opt_strs+1482) +#define JAILDIR_NAME (ntpd_opt_strs+1536) /** Name string for the jaildir option */ -#define JAILDIR_name (ntpd_opt_strs+1490) +#define JAILDIR_name (ntpd_opt_strs+1544) /** Compiled in flag settings for the jaildir option */ #define JAILDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -365,19 +366,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+1498) -#define JAILDIR_name (ntpd_opt_strs+1490) +#define JAILDIR_DESC (ntpd_opt_strs+1552) +#define JAILDIR_name (ntpd_opt_strs+1544) #endif /* HAVE_DROPROOT */ /** * interface option description: */ /** Descriptive text for the interface option */ -#define INTERFACE_DESC (ntpd_opt_strs+1577) +#define INTERFACE_DESC (ntpd_opt_strs+1631) /** Upper-cased name for the interface option */ -#define INTERFACE_NAME (ntpd_opt_strs+1616) +#define INTERFACE_NAME (ntpd_opt_strs+1670) /** Name string for the interface option */ -#define INTERFACE_name (ntpd_opt_strs+1626) +#define INTERFACE_name (ntpd_opt_strs+1680) /** Compiled in flag settings for the interface option */ #define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -386,11 +387,11 @@ static int const aAuthnoreqCantList[] = { * keyfile option description: */ /** Descriptive text for the keyfile option */ -#define KEYFILE_DESC (ntpd_opt_strs+1636) +#define KEYFILE_DESC (ntpd_opt_strs+1690) /** Upper-cased name for the keyfile option */ -#define KEYFILE_NAME (ntpd_opt_strs+1659) +#define KEYFILE_NAME (ntpd_opt_strs+1713) /** Name string for the keyfile option */ -#define KEYFILE_name (ntpd_opt_strs+1667) +#define KEYFILE_name (ntpd_opt_strs+1721) /** Compiled in flag settings for the keyfile option */ #define KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -399,11 +400,11 @@ static int const aAuthnoreqCantList[] = { * logfile option description: */ /** Descriptive text for the logfile option */ -#define LOGFILE_DESC (ntpd_opt_strs+1675) +#define LOGFILE_DESC (ntpd_opt_strs+1729) /** Upper-cased name for the logfile option */ -#define LOGFILE_NAME (ntpd_opt_strs+1696) +#define LOGFILE_NAME (ntpd_opt_strs+1750) /** Name string for the logfile option */ -#define LOGFILE_name (ntpd_opt_strs+1704) +#define LOGFILE_name (ntpd_opt_strs+1758) /** Compiled in flag settings for the logfile option */ #define LOGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -412,11 +413,11 @@ static int const aAuthnoreqCantList[] = { * novirtualips option description: */ /** Descriptive text for the novirtualips option */ -#define NOVIRTUALIPS_DESC (ntpd_opt_strs+1712) +#define NOVIRTUALIPS_DESC (ntpd_opt_strs+1766) /** Upper-cased name for the novirtualips option */ -#define NOVIRTUALIPS_NAME (ntpd_opt_strs+1748) +#define NOVIRTUALIPS_NAME (ntpd_opt_strs+1802) /** Name string for the novirtualips option */ -#define NOVIRTUALIPS_name (ntpd_opt_strs+1761) +#define NOVIRTUALIPS_name (ntpd_opt_strs+1815) /** Compiled in flag settings for the novirtualips option */ #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) @@ -425,11 +426,11 @@ static int const aAuthnoreqCantList[] = { */ #ifdef SYS_WINNT /** Descriptive text for the modifymmtimer option */ -#define MODIFYMMTIMER_DESC (ntpd_opt_strs+1774) +#define MODIFYMMTIMER_DESC (ntpd_opt_strs+1828) /** Upper-cased name for the modifymmtimer option */ -#define MODIFYMMTIMER_NAME (ntpd_opt_strs+1813) +#define MODIFYMMTIMER_NAME (ntpd_opt_strs+1867) /** Name string for the modifymmtimer option */ -#define MODIFYMMTIMER_name (ntpd_opt_strs+1827) +#define MODIFYMMTIMER_name (ntpd_opt_strs+1881) /** Compiled in flag settings for the modifymmtimer option */ #define MODIFYMMTIMER_FLAGS (OPTST_DISABLED) @@ -445,11 +446,11 @@ static int const aAuthnoreqCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the nofork option */ -#define NOFORK_DESC (ntpd_opt_strs+1841) +#define NOFORK_DESC (ntpd_opt_strs+1895) /** Upper-cased name for the nofork option */ -#define NOFORK_NAME (ntpd_opt_strs+1853) +#define NOFORK_NAME (ntpd_opt_strs+1907) /** Name string for the nofork option */ -#define NOFORK_name (ntpd_opt_strs+1860) +#define NOFORK_name (ntpd_opt_strs+1914) /** Other options that appear in conjunction with the nofork option */ static int const aNoforkCantList[] = { INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; @@ -460,11 +461,11 @@ static int const aNoforkCantList[] = { * nice option description: */ /** Descriptive text for the nice option */ -#define NICE_DESC (ntpd_opt_strs+1867) +#define NICE_DESC (ntpd_opt_strs+1921) /** Upper-cased name for the nice option */ -#define NICE_NAME (ntpd_opt_strs+1888) +#define NICE_NAME (ntpd_opt_strs+1942) /** Name string for the nice option */ -#define NICE_name (ntpd_opt_strs+1893) +#define NICE_name (ntpd_opt_strs+1947) /** Compiled in flag settings for the nice option */ #define NICE_FLAGS (OPTST_DISABLED) @@ -472,11 +473,11 @@ static int const aNoforkCantList[] = { * pidfile option description: */ /** Descriptive text for the pidfile option */ -#define PIDFILE_DESC (ntpd_opt_strs+1898) +#define PIDFILE_DESC (ntpd_opt_strs+1952) /** Upper-cased name for the pidfile option */ -#define PIDFILE_NAME (ntpd_opt_strs+1919) +#define PIDFILE_NAME (ntpd_opt_strs+1973) /** Name string for the pidfile option */ -#define PIDFILE_name (ntpd_opt_strs+1927) +#define PIDFILE_name (ntpd_opt_strs+1981) /** Compiled in flag settings for the pidfile option */ #define PIDFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -485,11 +486,11 @@ static int const aNoforkCantList[] = { * priority option description: */ /** Descriptive text for the priority option */ -#define PRIORITY_DESC (ntpd_opt_strs+1935) +#define PRIORITY_DESC (ntpd_opt_strs+1989) /** Upper-cased name for the priority option */ -#define PRIORITY_NAME (ntpd_opt_strs+1952) +#define PRIORITY_NAME (ntpd_opt_strs+2006) /** Name string for the priority option */ -#define PRIORITY_name (ntpd_opt_strs+1961) +#define PRIORITY_name (ntpd_opt_strs+2015) /** Compiled in flag settings for the priority option */ #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -499,11 +500,11 @@ static int const aNoforkCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the quit option */ -#define QUIT_DESC (ntpd_opt_strs+1970) +#define QUIT_DESC (ntpd_opt_strs+2024) /** Upper-cased name for the quit option */ -#define QUIT_NAME (ntpd_opt_strs+1992) +#define QUIT_NAME (ntpd_opt_strs+2046) /** Name string for the quit option */ -#define QUIT_name (ntpd_opt_strs+1997) +#define QUIT_name (ntpd_opt_strs+2051) /** Other options that appear in conjunction with the quit option */ static int const aQuitCantList[] = { INDEX_OPT_SAVECONFIGQUIT, @@ -515,11 +516,11 @@ static int const aQuitCantList[] = { * propagationdelay option description: */ /** Descriptive text for the propagationdelay option */ -#define PROPAGATIONDELAY_DESC (ntpd_opt_strs+2002) +#define PROPAGATIONDELAY_DESC (ntpd_opt_strs+2056) /** Upper-cased name for the propagationdelay option */ -#define PROPAGATIONDELAY_NAME (ntpd_opt_strs+2030) +#define PROPAGATIONDELAY_NAME (ntpd_opt_strs+2084) /** Name string for the propagationdelay option */ -#define PROPAGATIONDELAY_name (ntpd_opt_strs+2047) +#define PROPAGATIONDELAY_name (ntpd_opt_strs+2101) /** Compiled in flag settings for the propagationdelay option */ #define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -530,11 +531,11 @@ static int const aQuitCantList[] = { */ #ifdef SAVECONFIG /** Descriptive text for the saveconfigquit option */ -#define SAVECONFIGQUIT_DESC (ntpd_opt_strs+2064) +#define SAVECONFIGQUIT_DESC (ntpd_opt_strs+2118) /** Upper-cased name for the saveconfigquit option */ -#define SAVECONFIGQUIT_NAME (ntpd_opt_strs+2099) +#define SAVECONFIGQUIT_NAME (ntpd_opt_strs+2153) /** Name string for the saveconfigquit option */ -#define SAVECONFIGQUIT_name (ntpd_opt_strs+2114) +#define SAVECONFIGQUIT_name (ntpd_opt_strs+2168) /** Other options that appear in conjunction with the saveconfigquit option */ static int const aSaveconfigquitCantList[] = { INDEX_OPT_QUIT, @@ -555,11 +556,11 @@ static int const aSaveconfigquitCantList[] = { * statsdir option description: */ /** Descriptive text for the statsdir option */ -#define STATSDIR_DESC (ntpd_opt_strs+2129) +#define STATSDIR_DESC (ntpd_opt_strs+2183) /** Upper-cased name for the statsdir option */ -#define STATSDIR_NAME (ntpd_opt_strs+2154) +#define STATSDIR_NAME (ntpd_opt_strs+2208) /** Name string for the statsdir option */ -#define STATSDIR_name (ntpd_opt_strs+2163) +#define STATSDIR_name (ntpd_opt_strs+2217) /** Compiled in flag settings for the statsdir option */ #define STATSDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -568,11 +569,11 @@ static int const aSaveconfigquitCantList[] = { * trustedkey option description: */ /** Descriptive text for the trustedkey option */ -#define TRUSTEDKEY_DESC (ntpd_opt_strs+2172) +#define TRUSTEDKEY_DESC (ntpd_opt_strs+2226) /** Upper-cased name for the trustedkey option */ -#define TRUSTEDKEY_NAME (ntpd_opt_strs+2191) +#define TRUSTEDKEY_NAME (ntpd_opt_strs+2245) /** Name string for the trustedkey option */ -#define TRUSTEDKEY_name (ntpd_opt_strs+2202) +#define TRUSTEDKEY_name (ntpd_opt_strs+2256) /** Compiled in flag settings for the trustedkey option */ #define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -582,11 +583,11 @@ static int const aSaveconfigquitCantList[] = { */ #ifdef HAVE_DROPROOT /** Descriptive text for the user option */ -#define USER_DESC (ntpd_opt_strs+2213) +#define USER_DESC (ntpd_opt_strs+2267) /** Upper-cased name for the user option */ -#define USER_NAME (ntpd_opt_strs+2247) +#define USER_NAME (ntpd_opt_strs+2301) /** Name string for the user option */ -#define USER_name (ntpd_opt_strs+2252) +#define USER_name (ntpd_opt_strs+2306) /** Compiled in flag settings for the user option */ #define USER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -595,19 +596,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+1498) -#define USER_name (ntpd_opt_strs+2252) +#define USER_DESC (ntpd_opt_strs+1552) +#define USER_name (ntpd_opt_strs+2306) #endif /* HAVE_DROPROOT */ /** * updateinterval option description: */ /** Descriptive text for the updateinterval option */ -#define UPDATEINTERVAL_DESC (ntpd_opt_strs+2257) +#define UPDATEINTERVAL_DESC (ntpd_opt_strs+2311) /** Upper-cased name for the updateinterval option */ -#define UPDATEINTERVAL_NAME (ntpd_opt_strs+2321) +#define UPDATEINTERVAL_NAME (ntpd_opt_strs+2375) /** Name string for the updateinterval option */ -#define UPDATEINTERVAL_name (ntpd_opt_strs+2336) +#define UPDATEINTERVAL_name (ntpd_opt_strs+2390) /** Compiled in flag settings for the updateinterval option */ #define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -616,11 +617,11 @@ static int const aSaveconfigquitCantList[] = { * var option description: */ /** Descriptive text for the var option */ -#define VAR_DESC (ntpd_opt_strs+2351) +#define VAR_DESC (ntpd_opt_strs+2405) /** Upper-cased name for the var option */ -#define VAR_NAME (ntpd_opt_strs+2381) +#define VAR_NAME (ntpd_opt_strs+2435) /** Name string for the var option */ -#define VAR_name (ntpd_opt_strs+2385) +#define VAR_name (ntpd_opt_strs+2439) /** Compiled in flag settings for the var option */ #define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -629,11 +630,11 @@ static int const aSaveconfigquitCantList[] = { * dvar option description: */ /** Descriptive text for the dvar option */ -#define DVAR_DESC (ntpd_opt_strs+2389) +#define DVAR_DESC (ntpd_opt_strs+2443) /** Upper-cased name for the dvar option */ -#define DVAR_NAME (ntpd_opt_strs+2423) +#define DVAR_NAME (ntpd_opt_strs+2477) /** Name string for the dvar option */ -#define DVAR_name (ntpd_opt_strs+2428) +#define DVAR_name (ntpd_opt_strs+2482) /** Compiled in flag settings for the dvar option */ #define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -644,11 +645,11 @@ static int const aSaveconfigquitCantList[] = { */ #ifdef HAVE_WORKING_FORK /** Descriptive text for the wait-sync option */ -#define WAIT_SYNC_DESC (ntpd_opt_strs+2433) +#define WAIT_SYNC_DESC (ntpd_opt_strs+2487) /** Upper-cased name for the wait-sync option */ -#define WAIT_SYNC_NAME (ntpd_opt_strs+2470) +#define WAIT_SYNC_NAME (ntpd_opt_strs+2524) /** Name string for the wait-sync option */ -#define WAIT_SYNC_name (ntpd_opt_strs+2480) +#define WAIT_SYNC_name (ntpd_opt_strs+2534) /** Other options that appear in conjunction with the wait-sync option */ static int const aWait_SyncCantList[] = { INDEX_OPT_NOFORK, @@ -670,11 +671,11 @@ static int const aWait_SyncCantList[] = { * slew option description: */ /** Descriptive text for the slew option */ -#define SLEW_DESC (ntpd_opt_strs+2490) +#define SLEW_DESC (ntpd_opt_strs+2544) /** Upper-cased name for the slew option */ -#define SLEW_NAME (ntpd_opt_strs+2513) +#define SLEW_NAME (ntpd_opt_strs+2567) /** Name string for the slew option */ -#define SLEW_name (ntpd_opt_strs+2518) +#define SLEW_name (ntpd_opt_strs+2572) /** Compiled in flag settings for the slew option */ #define SLEW_FLAGS (OPTST_DISABLED) @@ -683,11 +684,11 @@ static int const aWait_SyncCantList[] = { */ #ifdef SYS_WINNT /** Descriptive text for the usepcc option */ -#define USEPCC_DESC (ntpd_opt_strs+2523) +#define USEPCC_DESC (ntpd_opt_strs+2577) /** Upper-cased name for the usepcc option */ -#define USEPCC_NAME (ntpd_opt_strs+2560) +#define USEPCC_NAME (ntpd_opt_strs+2614) /** Name string for the usepcc option */ -#define USEPCC_name (ntpd_opt_strs+2567) +#define USEPCC_name (ntpd_opt_strs+2621) /** Compiled in flag settings for the usepcc option */ #define USEPCC_FLAGS (OPTST_DISABLED) @@ -703,11 +704,11 @@ static int const aWait_SyncCantList[] = { */ #ifdef SYS_WINNT /** Descriptive text for the pccfreq option */ -#define PCCFREQ_DESC (ntpd_opt_strs+2574) +#define PCCFREQ_DESC (ntpd_opt_strs+2628) /** Upper-cased name for the pccfreq option */ -#define PCCFREQ_NAME (ntpd_opt_strs+2617) +#define PCCFREQ_NAME (ntpd_opt_strs+2671) /** Name string for the pccfreq option */ -#define PCCFREQ_name (ntpd_opt_strs+2625) +#define PCCFREQ_name (ntpd_opt_strs+2679) /** Compiled in flag settings for the pccfreq option */ #define PCCFREQ_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -724,11 +725,11 @@ static int const aWait_SyncCantList[] = { */ #ifdef HAVE_DNSREGISTRATION /** Descriptive text for the mdns option */ -#define MDNS_DESC (ntpd_opt_strs+2633) +#define MDNS_DESC (ntpd_opt_strs+2687) /** Upper-cased name for the mdns option */ -#define MDNS_NAME (ntpd_opt_strs+2668) +#define MDNS_NAME (ntpd_opt_strs+2722) /** Name string for the mdns option */ -#define MDNS_name (ntpd_opt_strs+2673) +#define MDNS_name (ntpd_opt_strs+2727) /** Compiled in flag settings for the mdns option */ #define MDNS_FLAGS (OPTST_DISABLED) @@ -742,11 +743,11 @@ static int const aWait_SyncCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ntpd_opt_strs+2678) -#define HELP_name (ntpd_opt_strs+2722) +#define HELP_DESC (ntpd_opt_strs+2732) +#define HELP_name (ntpd_opt_strs+2776) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ntpd_opt_strs+2727) -#define MORE_HELP_name (ntpd_opt_strs+2772) +#define MORE_HELP_DESC (ntpd_opt_strs+2781) +#define MORE_HELP_name (ntpd_opt_strs+2826) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -759,8 +760,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+2782) -#define VER_name (ntpd_opt_strs+2818) +#define VER_DESC (ntpd_opt_strs+2836) +#define VER_name (ntpd_opt_strs+2872) /** * Declare option callback procedures */ @@ -1230,21 +1231,21 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of ntpd. */ -#define zPROGNAME (ntpd_opt_strs+2826) +#define zPROGNAME (ntpd_opt_strs+2880) /** Reference to the title line for ntpd usage. */ -#define zUsageTitle (ntpd_opt_strs+2831) +#define zUsageTitle (ntpd_opt_strs+2885) /** 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+2968) +#define zBugsAddr (ntpd_opt_strs+3020) /** Clarification/explanation of what ntpd does. */ -#define zExplain (ntpd_opt_strs+3002) +#define zExplain (ntpd_opt_strs+3054) /** Extra detail explaining what ntpd does. */ #define zDetail (NULL) /** The full version string for ntpd. */ -#define zFullVersion (ntpd_opt_strs+3004) +#define zFullVersion (ntpd_opt_strs+3056) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1501,8 +1502,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.8p1-beta5\n\ -Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ + puts(_("ntpd 4.2.8p1-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")); @@ -1516,9 +1517,10 @@ 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\ documentation, and that the name The University of Delaware not be used in\n\ advertising or publicity pertaining to distribution of the software without\n\ -specific, written prior permission. The University of Delaware makes no\n\ -representations about the suitability this software for any purpose. It is\n\ -provided \"as is\" without express or implied warranty.\n")); +specific, written prior permission. The University of Delaware and Network\n\ +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")); /* referenced via ntpdOptions.pOptDesc->pzText */ puts(_("Force IPv4 DNS name resolution")); @@ -1638,7 +1640,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.8p1-beta5\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.8p1-RC1\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1646,7 +1648,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.8p1-beta5")); + puts(_("ntpd 4.2.8p1-RC1")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 356a41b76..ae5a31dbd 100644 --- 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 January 7, 2015 at 03:00:52 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 24, 2015 at 08:42:06 PM by AutoGen 5.18.5pre4 * From the definitions ntpd-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntpd program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. + * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -31,7 +31,7 @@ * both the copyright notice and this permission notice appear in * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware makes no + * without specific, written prior permission. The University of Delaware and Network Time Foundation makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -105,9 +105,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.2.8p1-beta5" +#define NTPD_VERSION "4.2.8p1-RC1" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.8p1-beta5" +#define NTPD_FULL_VERSION "ntpd 4.2.8p1-RC1" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index e1fe5ac2e..e8bbb82f6 100644 --- 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 "07 Jan 2015" "4.2.8p1-beta5" "User Commands" +.TH ntpd 1ntpdman "24 Jan 2015" "4.2.8p1-RC1" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-5kaOjv/ag-glaGiv) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-CGayKw/ag-PGaqJw) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:22 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:44:45 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -959,9 +959,9 @@ RFC5908 .PP .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 5fed2bcb4..33d12e862 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:03:38 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:45:03 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -867,9 +867,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5908 .Re .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 31eb530b6..86aa49af8 100644 --- a/ntpd/ntpd.html +++ b/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. -

This document applies to version 4.2.8p1-beta5 of ntpd. +

This document applies to version 4.2.8p1-RC1 of ntpd.

-


- - + +
@@ -79,10 +76,9 @@ the +4.567 +/- 0.089 secs indicates the time offset and error bound of the system clock relative to the server clock.
-


- - + +

Invoking ntpdc

@@ -116,20 +112,10 @@ ntpd's configuration file may also be specified at run time using

This section was generated by AutoGen, using the agtexi-cmd template and the option descriptions for the ntpdc program. -This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its -<PFX>documentation for any purpose with or without fee is hereby granted, -<PFX>provided that the above copyright notice appears in all copies and that -<PFX>both the copyright notice and this permission notice appear in -<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in -<PFX>advertising or publicity pertaining to distribution of the software -<PFX>without specific, written prior permission. <owner> makes no -<PFX>representations about the suitability this software for any purpose. It -<PFX>is provided "as is" without express or implied warranty. - -

the NTP license, <http://ntp.org/license>. +This software is released under the NTP license, <http://ntp.org/license>.

-


-Next: , +Next: , Up: ntpdc Invocation - +
-

ntpdc help/usage (--help)

+

ntpdc help/usage (--help)

This is the automatically generated usage text for ntpdc.

The text printed is the same whether selected with the help option -(--help) or the more-help option (--more-help). more-help will print +(--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. -

ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-beta5
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p1-RC1
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -213,12 +198,11 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
-


-Next: , +Next: , Previous: ntpdc usage, Up: ntpdc Invocation - +

ipv4 option (-4)

@@ -235,12 +219,11 @@ ipv6.

Force DNS resolution of following host names on the command line to the IPv4 namespace.

-


-Next: , +Next: , Previous: ntpdc ipv4, Up: ntpdc Invocation - +

ipv6 option (-6)

@@ -257,19 +240,18 @@ ipv4.

Force DNS resolution of following host names on the command line to the IPv6 namespace.

-


-Next: , +Next: , Previous: ntpdc ipv6, Up: ntpdc Invocation - +

command option (-c)

This is the “run a command and exit” option. -This option takes a string argument cmd. +This option takes a string argument cmd.

This option has some usage constraints. It:

    @@ -280,12 +262,11 @@ This option takes a string argument cmd. and is added to the list of commands to be executed on the specified host(s).
    -


    -Next: , +Next: , Previous: ntpdc command, Up: ntpdc Invocation - +

    interactive option (-i)

    @@ -302,12 +283,11 @@ command, listpeers, peers, showpeers.

    Force ntpq to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input.

    -


    -Next: , +Next: , Previous: ntpdc interactive, Up: ntpdc Invocation - +

    listpeers option (-l)

    @@ -324,12 +304,11 @@ command.

    Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'listpeers' interactive command.

    -


    -Next: , +Next: , Previous: ntpdc listpeers, Up: ntpdc Invocation - +

    numeric option (-n)

    @@ -339,12 +318,11 @@ This is the “numeric host addresses” option. Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names.
    -


    -Next: , +Next: , Previous: ntpdc numeric, Up: ntpdc Invocation - +

    peers option (-p)

    @@ -361,12 +339,11 @@ command.

    Print a list of the peers known to the server as well as a summary of their state. This is equivalent to the 'peers' interactive command.

    -


    -Next: , +Next: , Previous: ntpdc peers, Up: ntpdc Invocation - +

    showpeers option (-s)

    @@ -384,12 +361,11 @@ command. of their state. This is equivalent to the 'dmpeers' interactive command.
    -


    -Next: , +Next: , Previous: ntpdc showpeers, Up: ntpdc Invocation - +

    presetting/configuring ntpdc

    @@ -407,9 +383,9 @@ values are treated like option arguments.
  • $PWD
The environment variables HOME, and PWD -are expanded and replaced when ntpdc runs. +are expanded and replaced when ntpdc runs. For any of these that are plain files, they are simply processed. -For any that are directories, then a file named .ntprc is searched for +For any that are directories, then a file named .ntprc is searched for within that directory and processed.

Configuration files may be in a wide variety of formats. @@ -451,78 +427,72 @@ detail to provide. The default is to print just the version. The licensing inf Only the first letter of the argument is examined:

-
version
Only print the version. This is the default. -
copyright
Name the copyright usage licensing terms. -
verbose
Print the full copyright usage licensing terms. +
version
Only print the version. This is the default. +
copyright
Name the copyright usage licensing terms. +
verbose
Print the full copyright usage licensing terms.
-


-Next: , +Next: , Previous: ntpdc config, Up: ntpdc Invocation - +

ntpdc exit status

One of the following exit values will be returned:

-
0 (EXIT_SUCCESS)
Successful program execution. -
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. -
66 (EX_NOINPUT)
A specified configuration file could not be loaded. -
70 (EX_SOFTWARE)
libopts had an internal operational error. Please report +
0 (EXIT_SUCCESS)
Successful program execution. +
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. +
66 (EX_NOINPUT)
A specified configuration file could not be loaded. +
70 (EX_SOFTWARE)
libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you.
-


-Next: , +Next: , Previous: ntpdc exit status, Up: ntpdc Invocation - +

ntpdc Usage

-


-Next: , +Next: , Previous: ntpdc Usage, Up: ntpdc Invocation - +

ntpdc See Also

-


-Next: , +Next: , Previous: ntpdc See Also, Up: ntpdc Invocation - +

ntpdc Authors

-


-Previous: ntpdc Authors, +Previous: ntpdc Authors, Up: ntpdc Invocation - +

ntpdc Bugs

-


- - + +
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in index 41b5ac973..adb8954ab 100644 --- a/ntpdc/ntpdc.man.in +++ b/ntpdc/ntpdc.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpdc @NTPDC_MS@ "07 Jan 2015" "4.2.8p1-beta5" "User Commands" +.TH ntpdc @NTPDC_MS@ "24 Jan 2015" "4.2.8p1-RC1" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-T5aW.w/ag-55aO9w) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-2Tayzy/ag-cUaqyy) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:04:02 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:45:27 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -848,7 +848,7 @@ RFC1305 .SH AUTHORS The formatting directives in this document came from FreeBSD. .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in index 446fbf84e..84a1974c0 100644 --- a/ntpdc/ntpdc.mdoc.in +++ b/ntpdc/ntpdc.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTPDC @NTPDC_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:04:08 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:45:33 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -787,7 +787,7 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .Sh AUTHORS The formatting directives in this document came from FreeBSD. .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi index 675a32ec2..ce994e054 100644 --- a/ntpq/invoke-ntpq.texi +++ b/ntpq/invoke-ntpq.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpq.texi) # -# It has been AutoGen-ed January 7, 2015 at 03:04:41 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 24, 2015 at 08:46:07 PM by AutoGen 5.18.5pre4 # From the definitions ntpq-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -835,7 +835,7 @@ with a status code of 0. @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.8p1-beta5 +ntpq - standard NTP query program - Ver. 4.2.8p1-RC1 Usage: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 4c1c82500..f4b379ff3 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed January 7, 2015 at 03:04:11 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 24, 2015 at 08:45:37 PM by AutoGen 5.18.5pre4 * From the definitions ntpq-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntpq program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. + * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -31,7 +31,7 @@ * both the copyright notice and this permission notice appear in * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware makes no + * without specific, written prior permission. The University of Delaware and Network Time Foundation makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -50,7 +50,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (ntpq_opt_strs+0) -#define zLicenseDescrip (ntpq_opt_strs+318) +#define zLicenseDescrip (ntpq_opt_strs+344) /* * global included definitions @@ -68,84 +68,85 @@ extern FILE * option_usage_fp; /** * static const strings for ntpq options */ -static char const ntpq_opt_strs[1887] = -/* 0 */ "ntpq 4.2.8p1-beta5\n" - "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" +static char const ntpq_opt_strs[1937] = +/* 0 */ "ntpq 4.2.8p1-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" " \n" " \n\0" -/* 318 */ "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" "documentation, and that the name The University of Delaware not be used in\n" "advertising or publicity pertaining to distribution of the software without\n" - "specific, written prior permission. The University of Delaware makes no\n" - "representations about the suitability this software for any purpose. It is\n" - "provided \"as is\" without express or implied warranty.\n\0" -/* 958 */ "Force IPv4 DNS name resolution\0" -/* 989 */ "IPV4\0" -/* 994 */ "ipv4\0" -/* 999 */ "Force IPv6 DNS name resolution\0" -/* 1030 */ "IPV6\0" -/* 1035 */ "ipv6\0" -/* 1040 */ "run a command and exit\0" -/* 1063 */ "COMMAND\0" -/* 1071 */ "command\0" -/* 1079 */ "Increase debug verbosity level\0" -/* 1110 */ "DEBUG_LEVEL\0" -/* 1122 */ "debug-level\0" -/* 1134 */ "Set the debug verbosity level\0" -/* 1164 */ "SET_DEBUG_LEVEL\0" -/* 1180 */ "set-debug-level\0" -/* 1196 */ "Force ntpq to operate in interactive mode\0" -/* 1238 */ "INTERACTIVE\0" -/* 1250 */ "interactive\0" -/* 1262 */ "numeric host addresses\0" -/* 1285 */ "NUMERIC\0" -/* 1293 */ "numeric\0" -/* 1301 */ "Always output status line with readvar\0" -/* 1340 */ "OLD_RV\0" -/* 1347 */ "old-rv\0" -/* 1354 */ "Print a list of the peers\0" -/* 1380 */ "PEERS\0" -/* 1386 */ "peers\0" -/* 1392 */ "Display the full 'remote' value\0" -/* 1424 */ "WIDE\0" -/* 1429 */ "wide\0" -/* 1434 */ "display extended usage information and exit\0" -/* 1478 */ "help\0" -/* 1483 */ "extended usage information passed thru pager\0" -/* 1528 */ "more-help\0" -/* 1538 */ "output version information and exit\0" -/* 1574 */ "version\0" -/* 1582 */ "save the option state to a config file\0" -/* 1621 */ "save-opts\0" -/* 1631 */ "load options from a config file\0" -/* 1663 */ "LOAD_OPTS\0" -/* 1673 */ "no-load-opts\0" -/* 1686 */ "no\0" -/* 1689 */ "NTPQ\0" -/* 1694 */ "ntpq - standard NTP query program - Ver. 4.2.8p1-beta5\n" + "specific, written prior permission. The University of Delaware and Network\n" + "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" +/* 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 */ "run a command and exit\0" +/* 1117 */ "COMMAND\0" +/* 1125 */ "command\0" +/* 1133 */ "Increase debug verbosity level\0" +/* 1164 */ "DEBUG_LEVEL\0" +/* 1176 */ "debug-level\0" +/* 1188 */ "Set the debug verbosity level\0" +/* 1218 */ "SET_DEBUG_LEVEL\0" +/* 1234 */ "set-debug-level\0" +/* 1250 */ "Force ntpq to operate in interactive mode\0" +/* 1292 */ "INTERACTIVE\0" +/* 1304 */ "interactive\0" +/* 1316 */ "numeric host addresses\0" +/* 1339 */ "NUMERIC\0" +/* 1347 */ "numeric\0" +/* 1355 */ "Always output status line with readvar\0" +/* 1394 */ "OLD_RV\0" +/* 1401 */ "old-rv\0" +/* 1408 */ "Print a list of the peers\0" +/* 1434 */ "PEERS\0" +/* 1440 */ "peers\0" +/* 1446 */ "Display the full 'remote' value\0" +/* 1478 */ "WIDE\0" +/* 1483 */ "wide\0" +/* 1488 */ "display extended usage information and exit\0" +/* 1532 */ "help\0" +/* 1537 */ "extended usage information passed thru pager\0" +/* 1582 */ "more-help\0" +/* 1592 */ "output version information and exit\0" +/* 1628 */ "version\0" +/* 1636 */ "save the option state to a config file\0" +/* 1675 */ "save-opts\0" +/* 1685 */ "load options from a config file\0" +/* 1717 */ "LOAD_OPTS\0" +/* 1727 */ "no-load-opts\0" +/* 1740 */ "no\0" +/* 1743 */ "NTPQ\0" +/* 1748 */ "ntpq - standard NTP query program - Ver. 4.2.8p1-RC1\n" "Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n\0" -/* 1819 */ "$HOME\0" -/* 1825 */ ".\0" -/* 1827 */ ".ntprc\0" -/* 1834 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 1868 */ "ntpq 4.2.8p1-beta5"; +/* 1871 */ "$HOME\0" +/* 1877 */ ".\0" +/* 1879 */ ".ntprc\0" +/* 1886 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 1920 */ "ntpq 4.2.8p1-RC1"; /** * ipv4 option description with * "Must also have options" and "Incompatible options": */ /** Descriptive text for the ipv4 option */ -#define IPV4_DESC (ntpq_opt_strs+958) +#define IPV4_DESC (ntpq_opt_strs+1012) /** Upper-cased name for the ipv4 option */ -#define IPV4_NAME (ntpq_opt_strs+989) +#define IPV4_NAME (ntpq_opt_strs+1043) /** Name string for the ipv4 option */ -#define IPV4_name (ntpq_opt_strs+994) +#define IPV4_name (ntpq_opt_strs+1048) /** Other options that appear in conjunction with the ipv4 option */ static int const aIpv4CantList[] = { INDEX_OPT_IPV6, NO_EQUIVALENT }; @@ -157,11 +158,11 @@ static int const aIpv4CantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the ipv6 option */ -#define IPV6_DESC (ntpq_opt_strs+999) +#define IPV6_DESC (ntpq_opt_strs+1053) /** Upper-cased name for the ipv6 option */ -#define IPV6_NAME (ntpq_opt_strs+1030) +#define IPV6_NAME (ntpq_opt_strs+1084) /** Name string for the ipv6 option */ -#define IPV6_name (ntpq_opt_strs+1035) +#define IPV6_name (ntpq_opt_strs+1089) /** Other options that appear in conjunction with the ipv6 option */ static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; @@ -172,11 +173,11 @@ static int const aIpv6CantList[] = { * command option description: */ /** Descriptive text for the command option */ -#define COMMAND_DESC (ntpq_opt_strs+1040) +#define COMMAND_DESC (ntpq_opt_strs+1094) /** Upper-cased name for the command option */ -#define COMMAND_NAME (ntpq_opt_strs+1063) +#define COMMAND_NAME (ntpq_opt_strs+1117) /** Name string for the command option */ -#define COMMAND_name (ntpq_opt_strs+1071) +#define COMMAND_name (ntpq_opt_strs+1125) /** Compiled in flag settings for the command option */ #define COMMAND_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -185,11 +186,11 @@ static int const aIpv6CantList[] = { * debug-level option description: */ /** Descriptive text for the debug-level option */ -#define DEBUG_LEVEL_DESC (ntpq_opt_strs+1079) +#define DEBUG_LEVEL_DESC (ntpq_opt_strs+1133) /** Upper-cased name for the debug-level option */ -#define DEBUG_LEVEL_NAME (ntpq_opt_strs+1110) +#define DEBUG_LEVEL_NAME (ntpq_opt_strs+1164) /** Name string for the debug-level option */ -#define DEBUG_LEVEL_name (ntpq_opt_strs+1122) +#define DEBUG_LEVEL_name (ntpq_opt_strs+1176) /** Compiled in flag settings for the debug-level option */ #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) @@ -197,11 +198,11 @@ static int const aIpv6CantList[] = { * set-debug-level option description: */ /** Descriptive text for the set-debug-level option */ -#define SET_DEBUG_LEVEL_DESC (ntpq_opt_strs+1134) +#define SET_DEBUG_LEVEL_DESC (ntpq_opt_strs+1188) /** Upper-cased name for the set-debug-level option */ -#define SET_DEBUG_LEVEL_NAME (ntpq_opt_strs+1164) +#define SET_DEBUG_LEVEL_NAME (ntpq_opt_strs+1218) /** Name string for the set-debug-level option */ -#define SET_DEBUG_LEVEL_name (ntpq_opt_strs+1180) +#define SET_DEBUG_LEVEL_name (ntpq_opt_strs+1234) /** Compiled in flag settings for the set-debug-level option */ #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -211,11 +212,11 @@ static int const aIpv6CantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the interactive option */ -#define INTERACTIVE_DESC (ntpq_opt_strs+1196) +#define INTERACTIVE_DESC (ntpq_opt_strs+1250) /** Upper-cased name for the interactive option */ -#define INTERACTIVE_NAME (ntpq_opt_strs+1238) +#define INTERACTIVE_NAME (ntpq_opt_strs+1292) /** Name string for the interactive option */ -#define INTERACTIVE_name (ntpq_opt_strs+1250) +#define INTERACTIVE_name (ntpq_opt_strs+1304) /** Other options that appear in conjunction with the interactive option */ static int const aInteractiveCantList[] = { INDEX_OPT_COMMAND, @@ -227,11 +228,11 @@ static int const aInteractiveCantList[] = { * numeric option description: */ /** Descriptive text for the numeric option */ -#define NUMERIC_DESC (ntpq_opt_strs+1262) +#define NUMERIC_DESC (ntpq_opt_strs+1316) /** Upper-cased name for the numeric option */ -#define NUMERIC_NAME (ntpq_opt_strs+1285) +#define NUMERIC_NAME (ntpq_opt_strs+1339) /** Name string for the numeric option */ -#define NUMERIC_name (ntpq_opt_strs+1293) +#define NUMERIC_name (ntpq_opt_strs+1347) /** Compiled in flag settings for the numeric option */ #define NUMERIC_FLAGS (OPTST_DISABLED) @@ -239,11 +240,11 @@ static int const aInteractiveCantList[] = { * old-rv option description: */ /** Descriptive text for the old-rv option */ -#define OLD_RV_DESC (ntpq_opt_strs+1301) +#define OLD_RV_DESC (ntpq_opt_strs+1355) /** Upper-cased name for the old-rv option */ -#define OLD_RV_NAME (ntpq_opt_strs+1340) +#define OLD_RV_NAME (ntpq_opt_strs+1394) /** Name string for the old-rv option */ -#define OLD_RV_name (ntpq_opt_strs+1347) +#define OLD_RV_name (ntpq_opt_strs+1401) /** Compiled in flag settings for the old-rv option */ #define OLD_RV_FLAGS (OPTST_DISABLED) @@ -252,11 +253,11 @@ static int const aInteractiveCantList[] = { * "Must also have options" and "Incompatible options": */ /** Descriptive text for the peers option */ -#define PEERS_DESC (ntpq_opt_strs+1354) +#define PEERS_DESC (ntpq_opt_strs+1408) /** Upper-cased name for the peers option */ -#define PEERS_NAME (ntpq_opt_strs+1380) +#define PEERS_NAME (ntpq_opt_strs+1434) /** Name string for the peers option */ -#define PEERS_name (ntpq_opt_strs+1386) +#define PEERS_name (ntpq_opt_strs+1440) /** Other options that appear in conjunction with the peers option */ static int const aPeersCantList[] = { INDEX_OPT_INTERACTIVE, NO_EQUIVALENT }; @@ -267,22 +268,22 @@ static int const aPeersCantList[] = { * wide option description: */ /** Descriptive text for the wide option */ -#define WIDE_DESC (ntpq_opt_strs+1392) +#define WIDE_DESC (ntpq_opt_strs+1446) /** Upper-cased name for the wide option */ -#define WIDE_NAME (ntpq_opt_strs+1424) +#define WIDE_NAME (ntpq_opt_strs+1478) /** Name string for the wide option */ -#define WIDE_name (ntpq_opt_strs+1429) +#define WIDE_name (ntpq_opt_strs+1483) /** Compiled in flag settings for the wide option */ #define WIDE_FLAGS (OPTST_DISABLED) /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ntpq_opt_strs+1434) -#define HELP_name (ntpq_opt_strs+1478) +#define HELP_DESC (ntpq_opt_strs+1488) +#define HELP_name (ntpq_opt_strs+1532) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ntpq_opt_strs+1483) -#define MORE_HELP_name (ntpq_opt_strs+1528) +#define MORE_HELP_DESC (ntpq_opt_strs+1537) +#define MORE_HELP_name (ntpq_opt_strs+1582) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -295,14 +296,14 @@ static int const aPeersCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (ntpq_opt_strs+1538) -#define VER_name (ntpq_opt_strs+1574) -#define SAVE_OPTS_DESC (ntpq_opt_strs+1582) -#define SAVE_OPTS_name (ntpq_opt_strs+1621) -#define LOAD_OPTS_DESC (ntpq_opt_strs+1631) -#define LOAD_OPTS_NAME (ntpq_opt_strs+1663) -#define NO_LOAD_OPTS_name (ntpq_opt_strs+1673) -#define LOAD_OPTS_pfx (ntpq_opt_strs+1686) +#define VER_DESC (ntpq_opt_strs+1592) +#define VER_name (ntpq_opt_strs+1628) +#define SAVE_OPTS_DESC (ntpq_opt_strs+1636) +#define SAVE_OPTS_name (ntpq_opt_strs+1675) +#define LOAD_OPTS_DESC (ntpq_opt_strs+1685) +#define LOAD_OPTS_NAME (ntpq_opt_strs+1717) +#define NO_LOAD_OPTS_name (ntpq_opt_strs+1727) +#define LOAD_OPTS_pfx (ntpq_opt_strs+1740) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /** * Declare option callback procedures @@ -511,24 +512,24 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of ntpq. */ -#define zPROGNAME (ntpq_opt_strs+1689) +#define zPROGNAME (ntpq_opt_strs+1743) /** Reference to the title line for ntpq usage. */ -#define zUsageTitle (ntpq_opt_strs+1694) +#define zUsageTitle (ntpq_opt_strs+1748) /** ntpq configuration file name. */ -#define zRcName (ntpq_opt_strs+1827) +#define zRcName (ntpq_opt_strs+1879) /** Directories to search for ntpq config files. */ static char const * const apzHomeList[3] = { - ntpq_opt_strs+1819, - ntpq_opt_strs+1825, + ntpq_opt_strs+1871, + ntpq_opt_strs+1877, NULL }; /** The ntpq program bug email address. */ -#define zBugsAddr (ntpq_opt_strs+1834) +#define zBugsAddr (ntpq_opt_strs+1886) /** Clarification/explanation of what ntpq does. */ #define zExplain (NULL) /** Extra detail explaining what ntpq does. */ #define zDetail (NULL) /** The full version string for ntpq. */ -#define zFullVersion (ntpq_opt_strs+1868) +#define zFullVersion (ntpq_opt_strs+1920) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -785,8 +786,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpqOptions.pzCopyright */ - puts(_("ntpq 4.2.8p1-beta5\n\ -Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ + puts(_("ntpq 4.2.8p1-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")); @@ -800,9 +801,10 @@ 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\ documentation, and that the name The University of Delaware not be used in\n\ advertising or publicity pertaining to distribution of the software without\n\ -specific, written prior permission. The University of Delaware makes no\n\ -representations about the suitability this software for any purpose. It is\n\ -provided \"as is\" without express or implied warranty.\n")); +specific, written prior permission. The University of Delaware and Network\n\ +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")); /* referenced via ntpqOptions.pOptDesc->pzText */ puts(_("Force IPv4 DNS name resolution")); @@ -850,11 +852,11 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntpqOptions.pzUsageTitle */ - puts(_("ntpq - standard NTP query program - Ver. 4.2.8p1-beta5\n\ + puts(_("ntpq - standard NTP query program - Ver. 4.2.8p1-RC1\n\ Usage: %s [ - [] | --[{=| }] ]... [ host ...]\n")); /* referenced via ntpqOptions.pzFullVersion */ - puts(_("ntpq 4.2.8p1-beta5")); + puts(_("ntpq 4.2.8p1-RC1")); /* referenced via ntpqOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 0b15a286e..91dddbfe6 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed January 7, 2015 at 03:04:11 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 24, 2015 at 08:45:36 PM by AutoGen 5.18.5pre4 * From the definitions ntpq-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntpq program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. + * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -31,7 +31,7 @@ * both the copyright notice and this permission notice appear in * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware makes no + * without specific, written prior permission. The University of Delaware and Network Time Foundation makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -83,9 +83,9 @@ typedef enum { /** count of all options for ntpq */ #define OPTION_CT 15 /** ntpq version */ -#define NTPQ_VERSION "4.2.8p1-beta5" +#define NTPQ_VERSION "4.2.8p1-RC1" /** Full ntpq version text */ -#define NTPQ_FULL_VERSION "ntpq 4.2.8p1-beta5" +#define NTPQ_FULL_VERSION "ntpq 4.2.8p1-RC1" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman index fc7de0999..334301b90 100644 --- a/ntpq/ntpq.1ntpqman +++ b/ntpq/ntpq.1ntpqman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpq 1ntpqman "07 Jan 2015" "4.2.8p1-beta5" "User Commands" +.TH ntpq 1ntpqman "24 Jan 2015" "4.2.8p1-RC1" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eCaqjy/ag-rCaiiy) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-qNaaKz/ag-CNa4Iz) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:04:37 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:46:03 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpq-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -1397,9 +1397,9 @@ libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .PP .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc index fc2722ca3..1cbb3dd36 100644 --- a/ntpq/ntpq.1ntpqmdoc +++ b/ntpq/ntpq.1ntpqmdoc @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTPQ 1ntpqmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpq-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:04:43 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:46:09 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpq-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -943,9 +943,9 @@ libopts had an internal operational error. Please report it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html index 565c86a84..404ef11c7 100644 --- a/ntpq/ntpq.html +++ b/ntpq/ntpq.html @@ -44,7 +44,7 @@ monitor the operational status and determine the performance of ntpd, the NTP daemon. -

This document applies to version 4.2.8p1-beta5 of ntpq. +

This document applies to version 4.2.8p1-RC1 of ntpq.

-


-Previous: ntptrace Description, +Previous: ntptrace Description, Up: Top - +

Invoking ntptrace

@@ -83,7 +80,7 @@ defined in RFC-1305. using the agtexi-cmd template and the option descriptions for the ntptrace program. -

ntptrace help/usage (--help)

+

ntptrace help/usage (--help)

This is the automatically generated usage text for ntptrace.

The text printed is the same whether selected with the help option -(--help) or the more-help option (--more-help). more-help will print +(--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. -

ntptrace - Trace peers of an NTP server - Ver. 4.2.8p1-beta5
+
ntptrace - Trace peers of an NTP server - Ver. 4.2.8p1-RC1
 USAGE: ntptrace [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host]
 
     -n, --numeric                Print IP addresses instead of hostnames
@@ -124,12 +120,11 @@ Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
-


-Next: , +Next: , Previous: ntptrace usage, Up: ntptrace Invocation - +

numeric option (-n)

@@ -139,13 +134,11 @@ This is the “print ip addresses instead of hostnames” option. Output hosts as dotted-quad numeric format rather than converting to the canonical host names.
- -


-Next: , +Next: , Previous: ntptrace numeric, Up: ntptrace Invocation - +

max-hosts option (-m)

@@ -153,14 +146,13 @@ Up: ntptrace Invocati

This is the “maximum number of peers to trace” option. This option takes a number argument. -This option has no ‘doc’ documentation. +This option has no doc documentation.

host option (-r)

@@ -168,21 +160,20 @@ Up: ntptrace Invocati

This is the “single remote host” option. This option takes a string argument. -This option has no ‘doc’ documentation. +This option has no doc documentation.

-


-Previous: ntptrace host, +Previous: ntptrace host, Up: ntptrace Invocation - +

ntptrace exit status

One of the following exit values will be returned:

-
0 (EXIT_SUCCESS)
Successful program execution. -
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid. +
0 (EXIT_SUCCESS)
Successful program execution. +
1 (EXIT_FAILURE)
The operation failed or the command syntax was not valid.
diff --git a/scripts/ntptrace/ntptrace.man.in b/scripts/ntptrace/ntptrace.man.in index 8d41b83bf..67fcaaf19 100644 --- a/scripts/ntptrace/ntptrace.man.in +++ b/scripts/ntptrace/ntptrace.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntptrace @NTPTRACE_MS@ "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands" +.TH ntptrace @NTPTRACE_MS@ "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-7laqop/ag-imaynp) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-B7aiPq/ag-O7aqOq) .\" -.\" It has been AutoGen-ed January 7, 2015 at 02:59:20 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:40:33 PM by AutoGen 5.18.5pre4 .\" From the definitions ntptrace-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/ntptrace/ntptrace.mdoc.in b/scripts/ntptrace/ntptrace.mdoc.in index 9a954101c..bdfc22fc4 100644 --- a/scripts/ntptrace/ntptrace.mdoc.in +++ b/scripts/ntptrace/ntptrace.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTPTRACE @NTPTRACE_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntptrace-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 02:59:26 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:40:38 PM by AutoGen 5.18.5pre4 .\" From the definitions ntptrace-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/plot_summary-opts b/scripts/plot_summary-opts index 609c07d96..0598c9123 100644 --- a/scripts/plot_summary-opts +++ b/scripts/plot_summary-opts @@ -1,6 +1,6 @@ # EDIT THIS FILE WITH CAUTION (plot_summary-opts) # -# It has been AutoGen-ed January 7, 2015 at 02:59:27 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 24, 2015 at 08:40:40 PM by AutoGen 5.18.5pre4 # From the definitions plot_summary-opts.def # and the template file perlopt @@ -46,7 +46,7 @@ sub processOptions { 'help|?', 'more-help')); $usage = <<'USAGE'; -plot_summary - plot statistics generated by summary script - Ver. 4.2.8p1-beta5 +plot_summary - plot statistics generated by summary script - Ver. 4.2.8p1-RC1 USAGE: plot_summary [ - [] | --[{=| }] ]... --directory=str Where the summary files are diff --git a/scripts/plot_summary.1plot_summaryman b/scripts/plot_summary.1plot_summaryman index 0c946af3c..cdd377c56 100644 --- a/scripts/plot_summary.1plot_summaryman +++ b/scripts/plot_summary.1plot_summaryman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH plot_summary 1plot_summaryman "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands" +.TH plot_summary 1plot_summaryman "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wuaOqr/ag-KuaWpr) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-kdaGRs/ag-xdaOQs) .\" -.\" It has been AutoGen-ed January 7, 2015 at 02:59:33 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:40:45 PM by AutoGen 5.18.5pre4 .\" From the definitions plot_summary-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/scripts/plot_summary.1plot_summarymdoc b/scripts/plot_summary.1plot_summarymdoc index 5b034e7da..2a8094a2c 100644 --- a/scripts/plot_summary.1plot_summarymdoc +++ b/scripts/plot_summary.1plot_summarymdoc @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (plot_summary-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 02:59:35 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:40:47 PM by AutoGen 5.18.5pre4 .\" From the definitions plot_summary-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/scripts/plot_summary.html b/scripts/plot_summary.html index ee5b0dbce..0a353919a 100644 --- a/scripts/plot_summary.html +++ b/scripts/plot_summary.html @@ -31,7 +31,7 @@ Up: (dir)

Plot_summary User Manual

This document describes the use of the NTP Project's plot_summary program. -This document applies to version 4.2.8p1-beta5 of plot_summary. +This document applies to version 4.2.8p1-RC1 of plot_summary.

Short Contents

@@ -89,7 +89,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
plot_summary - plot statistics generated by summary script - Ver. 4.2.8p1-beta5
+
plot_summary - plot statistics generated by summary script - Ver. 4.2.8p1-RC1
 USAGE: plot_summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Where the summary files are
diff --git a/scripts/plot_summary.man.in b/scripts/plot_summary.man.in
index 0c946af3c..cdd377c56 100644
--- a/scripts/plot_summary.man.in
+++ b/scripts/plot_summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH plot_summary 1plot_summaryman "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands"
+.TH plot_summary 1plot_summaryman "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-wuaOqr/ag-KuaWpr)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-kdaGRs/ag-xdaOQs)
 .\"
-.\" It has been AutoGen-ed January 7, 2015 at 02:59:33 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 24, 2015 at 08:40:45 PM by AutoGen 5.18.5pre4
 .\" From the definitions plot_summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/plot_summary.mdoc.in b/scripts/plot_summary.mdoc.in
index 5b034e7da..2a8094a2c 100644
--- a/scripts/plot_summary.mdoc.in
+++ b/scripts/plot_summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2015
+.Dd January 24 2015
 .Dt PLOT_SUMMARY 1plot_summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (plot_summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January  7, 2015 at 02:59:35 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 24, 2015 at 08:40:47 PM by AutoGen 5.18.5pre4
 .\"  From the definitions    plot_summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/summary-opts b/scripts/summary-opts
index 30cc7ff3e..5d5e38890 100644
--- a/scripts/summary-opts
+++ b/scripts/summary-opts
@@ -1,6 +1,6 @@
 # EDIT THIS FILE WITH CAUTION  (summary-opts)
 #
-# It has been AutoGen-ed  January  7, 2015 at 02:59:29 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 24, 2015 at 08:40:42 PM by AutoGen 5.18.5pre4
 # From the definitions    summary-opts.def
 # and the template file   perlopt
 
@@ -44,7 +44,7 @@ sub processOptions {
         'help|?', 'more-help'));
 
     $usage = <<'USAGE';
-summary - compute various stastics from NTP stat files - Ver. 4.2.8p1-beta5
+summary - compute various stastics from NTP stat files - Ver. 4.2.8p1-RC1
 USAGE: summary [ - [] | --[{=| }] ]... 
 
         --directory=str          Directory containing stat files
diff --git a/scripts/summary.1summaryman b/scripts/summary.1summaryman
index 5725f5dbd..698da9f46 100644
--- a/scripts/summary.1summaryman
+++ b/scripts/summary.1summaryman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands"
+.TH summary 1summaryman "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-WOaqEr/ag-8OayDr)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_Aai5s/ag-mBaq4s)
 .\"
-.\" It has been AutoGen-ed January 7, 2015 at 02:59:39 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 24, 2015 at 08:40:51 PM by AutoGen 5.18.5pre4
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/summary.1summarymdoc b/scripts/summary.1summarymdoc
index 895217dc7..e3898cad6 100644
--- a/scripts/summary.1summarymdoc
+++ b/scripts/summary.1summarymdoc
@@ -1,9 +1,9 @@
-.Dd January 7 2015
+.Dd January 24 2015
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January  7, 2015 at 02:59:40 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 24, 2015 at 08:40:53 PM by AutoGen 5.18.5pre4
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/summary.html b/scripts/summary.html
index 7f60eb3ad..7ca0e29f0 100644
--- a/scripts/summary.html
+++ b/scripts/summary.html
@@ -31,7 +31,7 @@ Up: (dir)
 

Summary User Manual

This document describes the use of the NTP Project's summary program. -This document applies to version 4.2.8p1-beta5 of summary. +This document applies to version 4.2.8p1-RC1 of summary.

Short Contents

@@ -88,7 +88,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
summary - compute various stastics from NTP stat files - Ver. 4.2.8p1-beta5
+
summary - compute various stastics from NTP stat files - Ver. 4.2.8p1-RC1
 USAGE: summary [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
 
         --directory=str          Directory containing stat files
diff --git a/scripts/summary.man.in b/scripts/summary.man.in
index 5725f5dbd..698da9f46 100644
--- a/scripts/summary.man.in
+++ b/scripts/summary.man.in
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH summary 1summaryman "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands"
+.TH summary 1summaryman "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-WOaqEr/ag-8OayDr)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_Aai5s/ag-mBaq4s)
 .\"
-.\" It has been AutoGen-ed January 7, 2015 at 02:59:39 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 24, 2015 at 08:40:51 PM by AutoGen 5.18.5pre4
 .\" From the definitions summary-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
diff --git a/scripts/summary.mdoc.in b/scripts/summary.mdoc.in
index 895217dc7..e3898cad6 100644
--- a/scripts/summary.mdoc.in
+++ b/scripts/summary.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 7 2015
+.Dd January 24 2015
 .Dt SUMMARY 1summarymdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (summary-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January  7, 2015 at 02:59:40 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 24, 2015 at 08:40:53 PM by AutoGen 5.18.5pre4
 .\"  From the definitions    summary-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index 5cf610b45..61861c0c1 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 #
-# It has been AutoGen-ed  January  7, 2015 at 02:56:06 AM by AutoGen 5.18.5pre4
+# It has been AutoGen-ed  January 24, 2015 at 08:37:17 PM by AutoGen 5.18.5pre4
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -100,7 +100,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta5
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-RC1
 Usage:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -282,7 +282,9 @@ This is the ``adjustments less than @var{steplimit} msec will be slewed'' option
 This option takes a number argument.
 If the time adjustment is less than @file{steplimit} milliseconds,
 slew the amount using @command{adjtime(2)}.  Otherwise, step the
-correction using @command{settimeofday(2)}. 
+correction using @command{settimeofday(2)}.  The default value is 0,
+which means all adjustments will be stepped.  This is a feature, as
+different situations demand different values.
 @node sntp ntpversion
 @subsection ntpversion option (-o)
 @cindex sntp-ntpversion
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index ad20cfd18..a71882b04 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *
- *  It has been AutoGen-ed  January  7, 2015 at 02:55:30 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 24, 2015 at 08:36:38 PM by AutoGen 5.18.5pre4
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -18,7 +18,7 @@
  * The sntp program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
@@ -31,7 +31,7 @@
  *  both the copyright notice and this permission notice appear in
  *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
+ *  without specific, written prior permission. The University of Delaware and Network Time Foundation makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -51,7 +51,7 @@ extern "C" {
 #endif
 extern FILE * option_usage_fp;
 #define zCopyright      (sntp_opt_strs+0)
-#define zLicenseDescrip (sntp_opt_strs+318)
+#define zLicenseDescrip (sntp_opt_strs+344)
 
 /*
  *  global included definitions
@@ -69,111 +69,112 @@ extern FILE * option_usage_fp;
 /**
  *  static const strings for sntp options
  */
-static char const sntp_opt_strs[2511] =
-/*     0 */ "sntp 4.2.8p1-beta5\n"
-            "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n"
+static char const sntp_opt_strs[2561] =
+/*     0 */ "sntp 4.2.8p1-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"
             "  \n"
             "  \n\0"
-/*   318 */ "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"
             "documentation, and that the name The University of Delaware not be used in\n"
             "advertising or publicity pertaining to distribution of the software without\n"
-            "specific, written prior permission.  The University of Delaware makes no\n"
-            "representations about the suitability this software for any purpose.  It is\n"
-            "provided \"as is\" without express or implied warranty.\n\0"
-/*   958 */ "Force IPv4 DNS name resolution\0"
-/*   989 */ "IPV4\0"
-/*   994 */ "ipv4\0"
-/*   999 */ "Force IPv6 DNS name resolution\0"
-/*  1030 */ "IPV6\0"
-/*  1035 */ "ipv6\0"
-/*  1040 */ "Enable authentication with the key auth-keynumber\0"
-/*  1090 */ "AUTHENTICATION\0"
-/*  1105 */ "authentication\0"
-/*  1120 */ "Listen to the address specified for broadcast time sync\0"
-/*  1176 */ "BROADCAST\0"
-/*  1186 */ "broadcast\0"
-/*  1196 */ "Concurrently query all IPs returned for host-name\0"
-/*  1246 */ "CONCURRENT\0"
-/*  1257 */ "concurrent\0"
-/*  1268 */ "Increase debug verbosity level\0"
-/*  1299 */ "DEBUG_LEVEL\0"
-/*  1311 */ "debug-level\0"
-/*  1323 */ "Set the debug verbosity level\0"
-/*  1353 */ "SET_DEBUG_LEVEL\0"
-/*  1369 */ "set-debug-level\0"
-/*  1385 */ "The gap (in milliseconds) between time requests\0"
-/*  1433 */ "GAP\0"
-/*  1437 */ "gap\0"
-/*  1441 */ "KoD history filename\0"
-/*  1462 */ "KOD\0"
-/*  1466 */ "kod\0"
-/*  1470 */ "/var/db/ntp-kod\0"
-/*  1486 */ "Look in this file for the key specified with -a\0"
-/*  1534 */ "KEYFILE\0"
-/*  1542 */ "keyfile\0"
-/*  1550 */ "Log to specified logfile\0"
-/*  1575 */ "LOGFILE\0"
-/*  1583 */ "logfile\0"
-/*  1591 */ "Adjustments less than steplimit msec will be slewed\0"
-/*  1643 */ "STEPLIMIT\0"
-/*  1653 */ "steplimit\0"
-/*  1663 */ "Send int as our NTP protocol version\0"
-/*  1700 */ "NTPVERSION\0"
-/*  1711 */ "ntpversion\0"
-/*  1722 */ "Use the NTP Reserved Port (port 123)\0"
-/*  1759 */ "USERESERVEDPORT\0"
-/*  1775 */ "usereservedport\0"
-/*  1791 */ "OK to 'step' the time with settimeofday(2)\0"
-/*  1834 */ "STEP\0"
-/*  1839 */ "step\0"
-/*  1844 */ "OK to 'slew' the time with adjtime(2)\0"
-/*  1882 */ "SLEW\0"
-/*  1887 */ "slew\0"
-/*  1892 */ "The number of seconds to wait for responses\0"
-/*  1936 */ "TIMEOUT\0"
-/*  1944 */ "timeout\0"
-/*  1952 */ "Wait for pending replies (if not setting the time)\0"
-/*  2003 */ "WAIT\0"
-/*  2008 */ "no-wait\0"
-/*  2016 */ "no\0"
-/*  2019 */ "display extended usage information and exit\0"
-/*  2063 */ "help\0"
-/*  2068 */ "extended usage information passed thru pager\0"
-/*  2113 */ "more-help\0"
-/*  2123 */ "output version information and exit\0"
-/*  2159 */ "version\0"
-/*  2167 */ "save the option state to a config file\0"
-/*  2206 */ "save-opts\0"
-/*  2216 */ "load options from a config file\0"
-/*  2248 */ "LOAD_OPTS\0"
-/*  2258 */ "no-load-opts\0"
-/*  2271 */ "SNTP\0"
-/*  2276 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta5\n"
+            "specific, written prior permission.  The University of Delaware and Network\n"
+            "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"
+/*  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 */ "Enable authentication with the key auth-keynumber\0"
+/*  1144 */ "AUTHENTICATION\0"
+/*  1159 */ "authentication\0"
+/*  1174 */ "Listen to the address specified for broadcast time sync\0"
+/*  1230 */ "BROADCAST\0"
+/*  1240 */ "broadcast\0"
+/*  1250 */ "Concurrently query all IPs returned for host-name\0"
+/*  1300 */ "CONCURRENT\0"
+/*  1311 */ "concurrent\0"
+/*  1322 */ "Increase debug verbosity level\0"
+/*  1353 */ "DEBUG_LEVEL\0"
+/*  1365 */ "debug-level\0"
+/*  1377 */ "Set the debug verbosity level\0"
+/*  1407 */ "SET_DEBUG_LEVEL\0"
+/*  1423 */ "set-debug-level\0"
+/*  1439 */ "The gap (in milliseconds) between time requests\0"
+/*  1487 */ "GAP\0"
+/*  1491 */ "gap\0"
+/*  1495 */ "KoD history filename\0"
+/*  1516 */ "KOD\0"
+/*  1520 */ "kod\0"
+/*  1524 */ "/var/db/ntp-kod\0"
+/*  1540 */ "Look in this file for the key specified with -a\0"
+/*  1588 */ "KEYFILE\0"
+/*  1596 */ "keyfile\0"
+/*  1604 */ "Log to specified logfile\0"
+/*  1629 */ "LOGFILE\0"
+/*  1637 */ "logfile\0"
+/*  1645 */ "Adjustments less than steplimit msec will be slewed\0"
+/*  1697 */ "STEPLIMIT\0"
+/*  1707 */ "steplimit\0"
+/*  1717 */ "Send int as our NTP protocol version\0"
+/*  1754 */ "NTPVERSION\0"
+/*  1765 */ "ntpversion\0"
+/*  1776 */ "Use the NTP Reserved Port (port 123)\0"
+/*  1813 */ "USERESERVEDPORT\0"
+/*  1829 */ "usereservedport\0"
+/*  1845 */ "OK to 'step' the time with settimeofday(2)\0"
+/*  1888 */ "STEP\0"
+/*  1893 */ "step\0"
+/*  1898 */ "OK to 'slew' the time with adjtime(2)\0"
+/*  1936 */ "SLEW\0"
+/*  1941 */ "slew\0"
+/*  1946 */ "The number of seconds to wait for responses\0"
+/*  1990 */ "TIMEOUT\0"
+/*  1998 */ "timeout\0"
+/*  2006 */ "Wait for pending replies (if not setting the time)\0"
+/*  2057 */ "WAIT\0"
+/*  2062 */ "no-wait\0"
+/*  2070 */ "no\0"
+/*  2073 */ "display extended usage information and exit\0"
+/*  2117 */ "help\0"
+/*  2122 */ "extended usage information passed thru pager\0"
+/*  2167 */ "more-help\0"
+/*  2177 */ "output version information and exit\0"
+/*  2213 */ "version\0"
+/*  2221 */ "save the option state to a config file\0"
+/*  2260 */ "save-opts\0"
+/*  2270 */ "load options from a config file\0"
+/*  2302 */ "LOAD_OPTS\0"
+/*  2312 */ "no-load-opts\0"
+/*  2325 */ "SNTP\0"
+/*  2330 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-RC1\n"
             "Usage:  %s [ - [] | --[{=| }] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
-/*  2441 */ "$HOME\0"
-/*  2447 */ ".\0"
-/*  2449 */ ".ntprc\0"
-/*  2456 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  2490 */ "\n\0"
-/*  2492 */ "sntp 4.2.8p1-beta5";
+/*  2493 */ "$HOME\0"
+/*  2499 */ ".\0"
+/*  2501 */ ".ntprc\0"
+/*  2508 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2542 */ "\n\0"
+/*  2544 */ "sntp 4.2.8p1-RC1";
 
 /**
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv4 option */
-#define IPV4_DESC      (sntp_opt_strs+958)
+#define IPV4_DESC      (sntp_opt_strs+1012)
 /** Upper-cased name for the ipv4 option */
-#define IPV4_NAME      (sntp_opt_strs+989)
+#define IPV4_NAME      (sntp_opt_strs+1043)
 /** Name string for the ipv4 option */
-#define IPV4_name      (sntp_opt_strs+994)
+#define IPV4_name      (sntp_opt_strs+1048)
 /** Other options that appear in conjunction with the ipv4 option */
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
@@ -185,11 +186,11 @@ static int const aIpv4CantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 /** Descriptive text for the ipv6 option */
-#define IPV6_DESC      (sntp_opt_strs+999)
+#define IPV6_DESC      (sntp_opt_strs+1053)
 /** Upper-cased name for the ipv6 option */
-#define IPV6_NAME      (sntp_opt_strs+1030)
+#define IPV6_NAME      (sntp_opt_strs+1084)
 /** Name string for the ipv6 option */
-#define IPV6_name      (sntp_opt_strs+1035)
+#define IPV6_name      (sntp_opt_strs+1089)
 /** Other options that appear in conjunction with the ipv6 option */
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
@@ -200,11 +201,11 @@ static int const aIpv6CantList[] = {
  *  authentication option description:
  */
 /** Descriptive text for the authentication option */
-#define AUTHENTICATION_DESC      (sntp_opt_strs+1040)
+#define AUTHENTICATION_DESC      (sntp_opt_strs+1094)
 /** Upper-cased name for the authentication option */
-#define AUTHENTICATION_NAME      (sntp_opt_strs+1090)
+#define AUTHENTICATION_NAME      (sntp_opt_strs+1144)
 /** Name string for the authentication option */
-#define AUTHENTICATION_name      (sntp_opt_strs+1105)
+#define AUTHENTICATION_name      (sntp_opt_strs+1159)
 /** Compiled in flag settings for the authentication option */
 #define AUTHENTICATION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -213,11 +214,11 @@ static int const aIpv6CantList[] = {
  *  broadcast option description:
  */
 /** Descriptive text for the broadcast option */
-#define BROADCAST_DESC      (sntp_opt_strs+1120)
+#define BROADCAST_DESC      (sntp_opt_strs+1174)
 /** Upper-cased name for the broadcast option */
-#define BROADCAST_NAME      (sntp_opt_strs+1176)
+#define BROADCAST_NAME      (sntp_opt_strs+1230)
 /** Name string for the broadcast option */
-#define BROADCAST_name      (sntp_opt_strs+1186)
+#define BROADCAST_name      (sntp_opt_strs+1240)
 /** Compiled in flag settings for the broadcast option */
 #define BROADCAST_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -226,11 +227,11 @@ static int const aIpv6CantList[] = {
  *  concurrent option description:
  */
 /** Descriptive text for the concurrent option */
-#define CONCURRENT_DESC      (sntp_opt_strs+1196)
+#define CONCURRENT_DESC      (sntp_opt_strs+1250)
 /** Upper-cased name for the concurrent option */
-#define CONCURRENT_NAME      (sntp_opt_strs+1246)
+#define CONCURRENT_NAME      (sntp_opt_strs+1300)
 /** Name string for the concurrent option */
-#define CONCURRENT_name      (sntp_opt_strs+1257)
+#define CONCURRENT_name      (sntp_opt_strs+1311)
 /** Compiled in flag settings for the concurrent option */
 #define CONCURRENT_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
@@ -239,11 +240,11 @@ static int const aIpv6CantList[] = {
  *  debug-level option description:
  */
 /** Descriptive text for the debug-level option */
-#define DEBUG_LEVEL_DESC      (sntp_opt_strs+1268)
+#define DEBUG_LEVEL_DESC      (sntp_opt_strs+1322)
 /** Upper-cased name for the debug-level option */
-#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1299)
+#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1353)
 /** Name string for the debug-level option */
-#define DEBUG_LEVEL_name      (sntp_opt_strs+1311)
+#define DEBUG_LEVEL_name      (sntp_opt_strs+1365)
 /** Compiled in flag settings for the debug-level option */
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
@@ -251,11 +252,11 @@ static int const aIpv6CantList[] = {
  *  set-debug-level option description:
  */
 /** Descriptive text for the set-debug-level option */
-#define SET_DEBUG_LEVEL_DESC      (sntp_opt_strs+1323)
+#define SET_DEBUG_LEVEL_DESC      (sntp_opt_strs+1377)
 /** Upper-cased name for the set-debug-level option */
-#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1353)
+#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1407)
 /** Name string for the set-debug-level option */
-#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1369)
+#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1423)
 /** Compiled in flag settings for the set-debug-level option */
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -264,11 +265,11 @@ static int const aIpv6CantList[] = {
  *  gap option description:
  */
 /** Descriptive text for the gap option */
-#define GAP_DESC      (sntp_opt_strs+1385)
+#define GAP_DESC      (sntp_opt_strs+1439)
 /** Upper-cased name for the gap option */
-#define GAP_NAME      (sntp_opt_strs+1433)
+#define GAP_NAME      (sntp_opt_strs+1487)
 /** Name string for the gap option */
-#define GAP_name      (sntp_opt_strs+1437)
+#define GAP_name      (sntp_opt_strs+1491)
 /** The compiled in default value for the gap option argument */
 #define GAP_DFT_ARG   ((char const*)50)
 /** Compiled in flag settings for the gap option */
@@ -279,13 +280,13 @@ static int const aIpv6CantList[] = {
  *  kod option description:
  */
 /** Descriptive text for the kod option */
-#define KOD_DESC      (sntp_opt_strs+1441)
+#define KOD_DESC      (sntp_opt_strs+1495)
 /** Upper-cased name for the kod option */
-#define KOD_NAME      (sntp_opt_strs+1462)
+#define KOD_NAME      (sntp_opt_strs+1516)
 /** Name string for the kod option */
-#define KOD_name      (sntp_opt_strs+1466)
+#define KOD_name      (sntp_opt_strs+1520)
 /** The compiled in default value for the kod option argument */
-#define KOD_DFT_ARG   (sntp_opt_strs+1470)
+#define KOD_DFT_ARG   (sntp_opt_strs+1524)
 /** Compiled in flag settings for the kod option */
 #define KOD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -294,11 +295,11 @@ static int const aIpv6CantList[] = {
  *  keyfile option description:
  */
 /** Descriptive text for the keyfile option */
-#define KEYFILE_DESC      (sntp_opt_strs+1486)
+#define KEYFILE_DESC      (sntp_opt_strs+1540)
 /** Upper-cased name for the keyfile option */
-#define KEYFILE_NAME      (sntp_opt_strs+1534)
+#define KEYFILE_NAME      (sntp_opt_strs+1588)
 /** Name string for the keyfile option */
-#define KEYFILE_name      (sntp_opt_strs+1542)
+#define KEYFILE_name      (sntp_opt_strs+1596)
 /** Compiled in flag settings for the keyfile option */
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -307,11 +308,11 @@ static int const aIpv6CantList[] = {
  *  logfile option description:
  */
 /** Descriptive text for the logfile option */
-#define LOGFILE_DESC      (sntp_opt_strs+1550)
+#define LOGFILE_DESC      (sntp_opt_strs+1604)
 /** Upper-cased name for the logfile option */
-#define LOGFILE_NAME      (sntp_opt_strs+1575)
+#define LOGFILE_NAME      (sntp_opt_strs+1629)
 /** Name string for the logfile option */
-#define LOGFILE_name      (sntp_opt_strs+1583)
+#define LOGFILE_name      (sntp_opt_strs+1637)
 /** Compiled in flag settings for the logfile option */
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -320,11 +321,11 @@ static int const aIpv6CantList[] = {
  *  steplimit option description:
  */
 /** Descriptive text for the steplimit option */
-#define STEPLIMIT_DESC      (sntp_opt_strs+1591)
+#define STEPLIMIT_DESC      (sntp_opt_strs+1645)
 /** Upper-cased name for the steplimit option */
-#define STEPLIMIT_NAME      (sntp_opt_strs+1643)
+#define STEPLIMIT_NAME      (sntp_opt_strs+1697)
 /** Name string for the steplimit option */
-#define STEPLIMIT_name      (sntp_opt_strs+1653)
+#define STEPLIMIT_name      (sntp_opt_strs+1707)
 /** Compiled in flag settings for the steplimit option */
 #define STEPLIMIT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -333,11 +334,11 @@ static int const aIpv6CantList[] = {
  *  ntpversion option description:
  */
 /** Descriptive text for the ntpversion option */
-#define NTPVERSION_DESC      (sntp_opt_strs+1663)
+#define NTPVERSION_DESC      (sntp_opt_strs+1717)
 /** Upper-cased name for the ntpversion option */
-#define NTPVERSION_NAME      (sntp_opt_strs+1700)
+#define NTPVERSION_NAME      (sntp_opt_strs+1754)
 /** Name string for the ntpversion option */
-#define NTPVERSION_name      (sntp_opt_strs+1711)
+#define NTPVERSION_name      (sntp_opt_strs+1765)
 /** The compiled in default value for the ntpversion option argument */
 #define NTPVERSION_DFT_ARG   ((char const*)4)
 /** Compiled in flag settings for the ntpversion option */
@@ -348,11 +349,11 @@ static int const aIpv6CantList[] = {
  *  usereservedport option description:
  */
 /** Descriptive text for the usereservedport option */
-#define USERESERVEDPORT_DESC      (sntp_opt_strs+1722)
+#define USERESERVEDPORT_DESC      (sntp_opt_strs+1776)
 /** Upper-cased name for the usereservedport option */
-#define USERESERVEDPORT_NAME      (sntp_opt_strs+1759)
+#define USERESERVEDPORT_NAME      (sntp_opt_strs+1813)
 /** Name string for the usereservedport option */
-#define USERESERVEDPORT_name      (sntp_opt_strs+1775)
+#define USERESERVEDPORT_name      (sntp_opt_strs+1829)
 /** Compiled in flag settings for the usereservedport option */
 #define USERESERVEDPORT_FLAGS     (OPTST_DISABLED)
 
@@ -360,11 +361,11 @@ static int const aIpv6CantList[] = {
  *  step option description:
  */
 /** Descriptive text for the step option */
-#define STEP_DESC      (sntp_opt_strs+1791)
+#define STEP_DESC      (sntp_opt_strs+1845)
 /** Upper-cased name for the step option */
-#define STEP_NAME      (sntp_opt_strs+1834)
+#define STEP_NAME      (sntp_opt_strs+1888)
 /** Name string for the step option */
-#define STEP_name      (sntp_opt_strs+1839)
+#define STEP_name      (sntp_opt_strs+1893)
 /** Compiled in flag settings for the step option */
 #define STEP_FLAGS     (OPTST_DISABLED)
 
@@ -372,11 +373,11 @@ static int const aIpv6CantList[] = {
  *  slew option description:
  */
 /** Descriptive text for the slew option */
-#define SLEW_DESC      (sntp_opt_strs+1844)
+#define SLEW_DESC      (sntp_opt_strs+1898)
 /** Upper-cased name for the slew option */
-#define SLEW_NAME      (sntp_opt_strs+1882)
+#define SLEW_NAME      (sntp_opt_strs+1936)
 /** Name string for the slew option */
-#define SLEW_name      (sntp_opt_strs+1887)
+#define SLEW_name      (sntp_opt_strs+1941)
 /** Compiled in flag settings for the slew option */
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
@@ -384,11 +385,11 @@ static int const aIpv6CantList[] = {
  *  timeout option description:
  */
 /** Descriptive text for the timeout option */
-#define TIMEOUT_DESC      (sntp_opt_strs+1892)
+#define TIMEOUT_DESC      (sntp_opt_strs+1946)
 /** Upper-cased name for the timeout option */
-#define TIMEOUT_NAME      (sntp_opt_strs+1936)
+#define TIMEOUT_NAME      (sntp_opt_strs+1990)
 /** Name string for the timeout option */
-#define TIMEOUT_name      (sntp_opt_strs+1944)
+#define TIMEOUT_name      (sntp_opt_strs+1998)
 /** The compiled in default value for the timeout option argument */
 #define TIMEOUT_DFT_ARG   ((char const*)5)
 /** Compiled in flag settings for the timeout option */
@@ -399,13 +400,13 @@ static int const aIpv6CantList[] = {
  *  wait option description:
  */
 /** Descriptive text for the wait option */
-#define WAIT_DESC      (sntp_opt_strs+1952)
+#define WAIT_DESC      (sntp_opt_strs+2006)
 /** Upper-cased name for the wait option */
-#define WAIT_NAME      (sntp_opt_strs+2003)
+#define WAIT_NAME      (sntp_opt_strs+2057)
 /** disablement name for the wait option */
-#define NOT_WAIT_name  (sntp_opt_strs+2008)
+#define NOT_WAIT_name  (sntp_opt_strs+2062)
 /** disablement prefix for the wait option */
-#define NOT_WAIT_PFX   (sntp_opt_strs+2016)
+#define NOT_WAIT_PFX   (sntp_opt_strs+2070)
 /** Name string for the wait option */
 #define WAIT_name      (NOT_WAIT_name + 3)
 /** Compiled in flag settings for the wait option */
@@ -414,11 +415,11 @@ static int const aIpv6CantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (sntp_opt_strs+2019)
-#define HELP_name       (sntp_opt_strs+2063)
+#define HELP_DESC       (sntp_opt_strs+2073)
+#define HELP_name       (sntp_opt_strs+2117)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (sntp_opt_strs+2068)
-#define MORE_HELP_name  (sntp_opt_strs+2113)
+#define MORE_HELP_DESC  (sntp_opt_strs+2122)
+#define MORE_HELP_name  (sntp_opt_strs+2167)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  HELP_DESC
@@ -431,14 +432,14 @@ static int const aIpv6CantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (sntp_opt_strs+2123)
-#define VER_name        (sntp_opt_strs+2159)
-#define SAVE_OPTS_DESC  (sntp_opt_strs+2167)
-#define SAVE_OPTS_name  (sntp_opt_strs+2206)
-#define LOAD_OPTS_DESC     (sntp_opt_strs+2216)
-#define LOAD_OPTS_NAME     (sntp_opt_strs+2248)
-#define NO_LOAD_OPTS_name  (sntp_opt_strs+2258)
-#define LOAD_OPTS_pfx      (sntp_opt_strs+2016)
+#define VER_DESC        (sntp_opt_strs+2177)
+#define VER_name        (sntp_opt_strs+2213)
+#define SAVE_OPTS_DESC  (sntp_opt_strs+2221)
+#define SAVE_OPTS_name  (sntp_opt_strs+2260)
+#define LOAD_OPTS_DESC     (sntp_opt_strs+2270)
+#define LOAD_OPTS_NAME     (sntp_opt_strs+2302)
+#define NO_LOAD_OPTS_name  (sntp_opt_strs+2312)
+#define LOAD_OPTS_pfx      (sntp_opt_strs+2070)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /**
  *  Declare option callback procedures
@@ -744,24 +745,24 @@ static tOptDesc optDesc[OPTION_CT] = {
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** Reference to the upper cased version of sntp. */
-#define zPROGNAME       (sntp_opt_strs+2271)
+#define zPROGNAME       (sntp_opt_strs+2325)
 /** Reference to the title line for sntp usage. */
-#define zUsageTitle     (sntp_opt_strs+2276)
+#define zUsageTitle     (sntp_opt_strs+2330)
 /** sntp configuration file name. */
-#define zRcName         (sntp_opt_strs+2449)
+#define zRcName         (sntp_opt_strs+2501)
 /** Directories to search for sntp config files. */
 static char const * const apzHomeList[3] = {
-    sntp_opt_strs+2441,
-    sntp_opt_strs+2447,
+    sntp_opt_strs+2493,
+    sntp_opt_strs+2499,
     NULL };
 /** The sntp program bug email address. */
-#define zBugsAddr       (sntp_opt_strs+2456)
+#define zBugsAddr       (sntp_opt_strs+2508)
 /** Clarification/explanation of what sntp does. */
-#define zExplain        (sntp_opt_strs+2490)
+#define zExplain        (sntp_opt_strs+2542)
 /** Extra detail explaining what sntp does. */
 #define zDetail         (NULL)
 /** The full version string for sntp. */
-#define zFullVersion    (sntp_opt_strs+2492)
+#define zFullVersion    (sntp_opt_strs+2544)
 /* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
@@ -904,7 +905,9 @@ doOptLogfile(tOptions* pOptions, tOptDesc* pOptDesc)
  * Code to handle the steplimit option.
  * If the time adjustment is less than @file{steplimit} milliseconds,
  * slew the amount using @command{adjtime(2)}.  Otherwise, step the
- * correction using @command{settimeofday(2)}.
+ * correction using @command{settimeofday(2)}.  The default value is 0,
+ * which means all adjustments will be stepped.  This is a feature, as
+ * different situations demand different values.
  * @param[in] pOptions the sntp options data structure
  * @param[in,out] pOptDesc the option descriptor for this option.
  */
@@ -1170,8 +1173,8 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.2.8p1-beta5\n\
-Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\
+  puts(_("sntp 4.2.8p1-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"));
@@ -1185,9 +1188,10 @@ 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\
 documentation, and that the name The University of Delaware not be used in\n\
 advertising or publicity pertaining to distribution of the software without\n\
-specific, written prior permission.  The University of Delaware makes no\n\
-representations about the suitability this software for any purpose.  It is\n\
-provided \"as is\" without express or implied warranty.\n"));
+specific, written prior permission.  The University of Delaware and Network\n\
+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"));
 
   /* referenced via sntpOptions.pOptDesc->pzText */
   puts(_("Force IPv4 DNS name resolution"));
@@ -1259,7 +1263,7 @@ provided \"as is\" without express or implied warranty.\n"));
   puts(_("load options from a config file"));
 
   /* referenced via sntpOptions.pzUsageTitle */
-  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta5\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-RC1\n\
 Usage:  %s [ - [] | --[{=| }] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1267,7 +1271,7 @@ Usage:  %s [ - [] | --[{=| }] ]... \\\n\
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.2.8p1-beta5"));
+  puts(_("sntp 4.2.8p1-RC1"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<>>"));
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 496a6de19..c6f659f88 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *
- *  It has been AutoGen-ed  January  7, 2015 at 02:55:29 AM by AutoGen 5.18.5pre4
+ *  It has been AutoGen-ed  January 24, 2015 at 08:36:38 PM by AutoGen 5.18.5pre4
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -18,7 +18,7 @@
  * The sntp program is copyrighted and licensed
  * under the following terms:
  *
- *  Copyright (C) 1970-2014 The University of Delaware, all rights reserved.
+ *  Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
@@ -31,7 +31,7 @@
  *  both the copyright notice and this permission notice appear in
  *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware makes no
+ *  without specific, written prior permission. The University of Delaware and Network Time Foundation makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -91,9 +91,9 @@ typedef enum {
 /** count of all options for sntp */
 #define OPTION_CT    23
 /** sntp version */
-#define SNTP_VERSION       "4.2.8p1-beta5"
+#define SNTP_VERSION       "4.2.8p1-RC1"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.2.8p1-beta5"
+#define SNTP_FULL_VERSION  "sntp 4.2.8p1-RC1"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index d8992264f..5674c2e42 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -10,11 +10,11 @@
 .ds B-Font B
 .ds I-Font I
 .ds R-Font R
-.TH sntp 1sntpman "07 Jan 2015" "4.2.8p1-beta5" "User Commands"
+.TH sntp 1sntpman "24 Jan 2015" "4.2.8p1-RC1" "User Commands"
 .\"
-.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-3YaGzZ/ag-dZayyZ)
+.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fhaG00/ag-shayZ0)
 .\"
-.\" It has been AutoGen-ed January 7, 2015 at 02:56:02 AM by AutoGen 5.18.5pre4
+.\" It has been AutoGen-ed January 24, 2015 at 08:37:13 PM by AutoGen 5.18.5pre4
 .\" From the definitions sntp-opts.def
 .\" and the template file agman-cmd.tpl
 .SH NAME
@@ -188,7 +188,9 @@ greater than or equal to 0
 .sp
 If the time adjustment is less than \fIsteplimit\fP milliseconds,
 slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
-correction using \fBsettimeofday(2)\fP. 
+correction using \fBsettimeofday(2)\fP.  The default value is 0,
+which means all adjustments will be stepped.  This is a feature, as
+different situations demand different values.
 .TP
 .NOP \f\*[B-Font]\-o\f[] \f\*[I-Font]number\f[], \f\*[B-Font]\-\-ntpversion\f[]=\f\*[I-Font]number\f[]
 Send \fBint\fP as our NTP protocol version.
@@ -289,14 +291,28 @@ is the simplest use of this program
 and can be run as an unprivileged command
 to check the current time and error in the local clock.
 .TP 7
-.NOP \f[C]sntp \-a ntpserver.somewhere\f[]
+.NOP \f[C]sntp \-Ss \-M 128 ntpserver.somewhere\f[]
 With suitable privilege,
 run as a command
 or from a
 \fCcron\fR(8)\f[]
 job,
-\f\*[B-Font]sntp \-a\f[]
-will reset the local clock from a synchronized specified server,
+\f\*[B-Font]sntp \-Ss \-M 128 ntpserver.somewhere\f[]
+will request the time from the server,
+and if that server reports that it is synchronized
+then if the offset adjustment is less than 128 milliseconds
+the correction will be slewed,
+and if the correction is more than 128 milliseconds
+the correction  will be stepped.
+.TP 7
+.NOP \f[C]sntp \-S ntpserver.somewhere\f[]
+With suitable privilege,
+run as a command
+or from a
+\fCcron\fR(8)\f[]
+job,
+\f\*[B-Font]sntp \-S ntpserver.somewhere\f[]
+will set (step) the local clock from a synchronized specified server,
 like the (deprecated)
 \fCntpdate\fR(1ntpdatemdoc)\f[],
 or
@@ -331,7 +347,7 @@ it to autogen-users@lists.sourceforge.net.  Thank you.
 .NOP  "Dave Hart" 
 .br
 .SH "COPYRIGHT"
-Copyright (C) 1970-2014 The University of Delaware all rights reserved.
+Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 2395c02ea..417e220a2 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd January 7 2015
+.Dd January 24 2015
 .Dt SNTP 1sntpmdoc User Commands
 .Os
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  January  7, 2015 at 02:56:09 AM by AutoGen 5.18.5pre4
+.\"  It has been AutoGen-ed  January 24, 2015 at 08:37:20 PM by AutoGen 5.18.5pre4
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -162,7 +162,9 @@ greater than or equal to 0
 .sp
 If the time adjustment is less than \fIsteplimit\fP milliseconds,
 slew the amount using \fBadjtime(2)\fP.  Otherwise, step the
-correction using \fBsettimeofday(2)\fP. 
+correction using \fBsettimeofday(2)\fP.  The default value is 0,
+which means all adjustments will be stepped.  This is a feature, as
+different situations demand different values.
 .It  Fl o Ar number , Fl \-ntpversion Ns = Ns Ar number 
 Send \fBint\fP as our NTP protocol version.
 This option takes an integer number as its argument.
@@ -251,14 +253,27 @@ is searched for within those directories.
 is the simplest use of this program
 and can be run as an unprivileged command
 to check the current time and error in the local clock.
-.It Li "sntp \-a ntpserver.somewhere"
+.It Li "sntp \-Ss \-M 128 ntpserver.somewhere"
 With suitable privilege,
 run as a command
 or from a
 .Xr cron 8
 job,
-.Ic "sntp \-a"
-will reset the local clock from a synchronized specified server,
+.Ic "sntp \-Ss \-M 128 ntpserver.somewhere"
+will request the time from the server,
+and if that server reports that it is synchronized
+then if the offset adjustment is less than 128 milliseconds
+the correction will be slewed,
+and if the correction is more than 128 milliseconds
+the correction  will be stepped.
+.It Li "sntp \-S ntpserver.somewhere"
+With suitable privilege,
+run as a command
+or from a
+.Xr cron 8
+job,
+.Ic "sntp \-S ntpserver.somewhere"
+will set (step) the local clock from a synchronized specified server,
 like the (deprecated)
 .Xr ntpdate 1ntpdatemdoc ,
 or
@@ -287,7 +302,7 @@ it to autogen\-users@lists.sourceforge.net.  Thank you.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
+Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 7487ec450..b5b64cb4d 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -3,7 +3,7 @@
 Sntp User's Manual
 
 
-
+
 
 
 
@@ -14,20 +14,18 @@
   pre.smallformat  { font-family:inherit; font-size:smaller }
   pre.smallexample { font-size:smaller }
   pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
+  span.sc { font-variant:small-caps }
+  span.roman { font-family: serif; font-weight: normal; } 
 -->
 
 
 

Sntp User's Manual

-


-Next: , +Next: , Previous: (dir), Up: (dir) - +

Simple Network Time Protocol User Manual

@@ -38,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.8p1-beta5 of sntp. +

This document applies to version 4.2.8p1-RC1 of sntp.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -57,10 +55,9 @@ IETF specification.

-


- - + +
@@ -79,10 +76,9 @@ the +4.567 +/- 0.089 secs indicates the time offset and error bound of the system clock relative to the server clock.
-


- - + +

Invoking sntp

@@ -135,20 +131,10 @@ of the host is reported.

This section was generated by AutoGen, using the agtexi-cmd template and the option descriptions for the sntp program. -This software is released under <PFX>Permission to use, copy, modify, and distribute this software and its -<PFX>documentation for any purpose with or without fee is hereby granted, -<PFX>provided that the above copyright notice appears in all copies and that -<PFX>both the copyright notice and this permission notice appear in -<PFX>supporting documentation, and that the name The Universidy of Delaware not be used in -<PFX>advertising or publicity pertaining to distribution of the software -<PFX>without specific, written prior permission. <owner> makes no -<PFX>representations about the suitability this software for any purpose. It -<PFX>is provided "as is" without express or implied warranty. - -

the NTP license, <http://ntp.org/license>. +This software is released under the NTP license, <http://ntp.org/license>.

-


-Next: , +Next: , Up: sntp Invocation - +
-

sntp help/usage (--help)

+

sntp help/usage (--help)

This is the automatically generated usage text for sntp.

The text printed is the same whether selected with the help option -(--help) or the more-help option (--more-help). more-help will print +(--help) or the more-help option (--more-help). more-help will print the usage text by passing it through a pager program. more-help is disabled on platforms without a working fork(2) function. The PAGER environment variable is -used to select the program, defaulting to more. Both will exit +used to select the program, defaulting to more. Both will exit with a status code of 0. -

sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-beta5
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p1-RC1
 Usage:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -244,12 +229,11 @@ The following option preset mechanisms are supported:
 Please send bug reports to:  <http://bugs.ntp.org, bugs@ntp.org>
 
-


-Next: , +Next: , Previous: sntp usage, Up: sntp Invocation - +

ipv4 option (-4)

@@ -266,12 +250,11 @@ ipv6.

Force DNS resolution of the following host names on the command line to the IPv4 namespace.

-


-Next: , +Next: , Previous: sntp ipv4, Up: sntp Invocation - +

ipv6 option (-6)

@@ -288,37 +271,35 @@ ipv4.

Force DNS resolution of the following host names on the command line to the IPv6 namespace.

-


-Next: , +Next: , Previous: sntp ipv6, Up: sntp Invocation - +

authentication option (-a)

This is the “enable authentication with the key auth-keynumber” option. -This option takes a number argument auth-keynumber. +This option takes a number argument auth-keynumber. Enable authentication using the key specified in this option's -argument. The argument of this option is the keyid, a -number specified in the keyfile as this key's identifier. -See the keyfile option (-k) for more details. +argument. The argument of this option is the keyid, a +number specified in the keyfile as this key's identifier. +See the keyfile option (-k) for more details.

-


-Next: , +Next: , Previous: sntp authentication, Up: sntp Invocation - +

broadcast option (-b)

This is the “listen to the address specified for broadcast time sync” option. -This option takes a string argument broadcast-address. +This option takes a string argument broadcast-address.

This option has some usage constraints. It:

    @@ -327,21 +308,20 @@ This option takes a string argument broadcast-addressIf specified sntp will listen to the specified address for NTP broadcasts. The default maximum wait time -can (and probably should) be modified with -t. +can (and probably should) be modified with -t.
    -


    -Next: , +Next: , Previous: sntp broadcast, Up: sntp Invocation - +

    concurrent option (-c)

    This is the “concurrently query all ips returned for host-name” option. -This option takes a string argument host-name. +This option takes a string argument host-name.

    This option has some usage constraints. It:

      @@ -354,85 +334,80 @@ as part of a DNS lookup are assumed to be for a single instance of ntpd, and therefore sntp will send queries to these IPs one after another, with a 2-second gap in between each query. -

      The -c or --concurrent flag says that any IPs +

      The -c or --concurrent flag says that any IPs returned for the DNS lookup of the supplied host-name are on different machines, so we can send concurrent queries.

      -


      -Next: , +Next: , Previous: sntp concurrent, Up: sntp Invocation - +

      gap option (-g)

      This is the “the gap (in milliseconds) between time requests” option. -This option takes a number argument milliseconds. +This option takes a number argument milliseconds. Since we're only going to use the first valid response we get and there is benefit to specifying a good number of servers to query, separate the queries we send out by the specified number of milliseconds.

      -


      -Next: , +Next: , Previous: sntp gap, Up: sntp Invocation - +

      kod option (-K)

      This is the “kod history filename” option. -This option takes a file argument file-name. +This option takes a file argument file-name. Specifies the filename to be used for the persistent history of KoD responses received from servers. If the file does not exist, a warning message will be displayed. The file will not be created.

      -


      -Next: , +Next: , Previous: sntp kod, Up: sntp Invocation - +

      keyfile option (-k)

      -This is the “look in this file for the key specified with -a” option. -This option takes a file argument file-name. +This is the “look in this file for the key specified with -a” option. +This option takes a file argument file-name. This option specifies the keyfile. -sntp will search for the key specified with -a -keyno in this file. See ntp.keys(5) for more +sntp will search for the key specified with -a +keyno in this file. See ntp.keys(5) for more information.

      -


      -Next: , +Next: , Previous: sntp keyfile, Up: sntp Invocation - +

      logfile option (-l)

      This is the “log to specified logfile” option. -This option takes a file argument file-name. +This option takes a file argument file-name. This option causes the client to write log messages to the specified -logfile. +logfile.

      -


      -Next: , +Next: , Previous: sntp logfile, Up: sntp Invocation - +

      steplimit option (-M)

      @@ -440,16 +415,17 @@ Up: sntp Invocation

      This is the “adjustments less than steplimit msec will be slewed” option. This option takes a number argument. -If the time adjustment is less than steplimit milliseconds, -slew the amount using adjtime(2). Otherwise, step the -correction using settimeofday(2). +If the time adjustment is less than steplimit milliseconds, +slew the amount using adjtime(2). Otherwise, step the +correction using settimeofday(2). The default value is 0, +which means all adjustments will be stepped. This is a feature, as +different situations demand different values.

      -


      -Next: , +Next: , Previous: sntp steplimit, Up: sntp Invocation - +

      ntpversion option (-o)

      @@ -458,14 +434,13 @@ Up: sntp Invocation This is the “send int as our ntp protocol version” option. This option takes a number argument. When sending requests to a remote server, tell them we are running -NTP protocol version ntpversion . +NTP protocol version ntpversion .
      -


      -Next: , +Next: , Previous: sntp ntpversion, Up: sntp Invocation - +

      usereservedport option (-r)

      @@ -475,31 +450,29 @@ This is the “use the ntp reserved port (port 123)” option. Use port 123, which is reserved for NTP, for our network communications.
      -


      -Next: , +Next: , Previous: sntp usereservedport, Up: sntp Invocation - +

      timeout option (-t)

      This is the “the number of seconds to wait for responses” option. -This option takes a number argument seconds. +This option takes a number argument seconds. When waiting for a reply, sntp will wait the number of seconds specified before giving up. The default should be more than enough for a unicast response. If sntp is only waiting for a broadcast response a longer timeout is likely needed.

      -


      -Next: , +Next: , Previous: sntp timeout, Up: sntp Invocation - +

      wait option

      @@ -516,12 +489,11 @@ This is the “wait for pending replies (if not setting the time)” opt

      If we are not setting the time, wait for all pending responses.

      -


      -Next: , +Next: , Previous: sntp wait, Up: sntp Invocation - +

      presetting/configuring sntp

      @@ -539,9 +511,9 @@ values are treated like option arguments.
    • $PWD
    The environment variables HOME, and PWD -are expanded and replaced when sntp runs. +are expanded and replaced when sntp runs. For any of these that are plain files, they are simply processed. -For any that are directories, then a file named .ntprc is searched for +For any that are directories, then a file named .ntprc is searched for within that directory and processed.

    Configuration files may be in a wide variety of formats. @@ -583,56 +555,52 @@ detail to provide. The default is to print just the version. The licensing inf Only the first letter of the argument is examined:

    -
    version
    Only print the version. This is the default. -
    copyright
    Name the copyright usage licensing terms. -
    verbose
    Print the full copyright usage licensing terms. +
    version
    Only print the version. This is the default. +
    copyright
    Name the copyright usage licensing terms. +
    verbose
    Print the full copyright usage licensing terms.
    -


    -Next: , +Next: , Previous: sntp config, Up: sntp Invocation - +

    sntp exit status

    One of the following exit values will be returned:

    -
    0 (EXIT_SUCCESS)
    Successful program execution. -
    1 (EXIT_FAILURE)
    The operation failed or the command syntax was not valid. -
    66 (EX_NOINPUT)
    A specified configuration file could not be loaded. -
    70 (EX_SOFTWARE)
    libopts had an internal operational error. Please report +
    0 (EXIT_SUCCESS)
    Successful program execution. +
    1 (EXIT_FAILURE)
    The operation failed or the command syntax was not valid. +
    66 (EX_NOINPUT)
    A specified configuration file could not be loaded. +
    70 (EX_SOFTWARE)
    libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you.
    -


    -Next: , +Next: , Previous: sntp exit status, Up: sntp Invocation - +

    sntp Usage

    -


    -Previous: sntp Usage, +Previous: sntp Usage, Up: sntp Invocation - +

    sntp Authors

    -


    - - + +
    diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in index 12fd88370..42af60620 100644 --- a/sntp/sntp.man.in +++ b/sntp/sntp.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH sntp @SNTP_MS@ "07 Jan 2015" "4.2.8p1-beta5" "User Commands" +.TH sntp @SNTP_MS@ "24 Jan 2015" "4.2.8p1-RC1" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-3YaGzZ/ag-dZayyZ) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fhaG00/ag-shayZ0) .\" -.\" It has been AutoGen-ed January 7, 2015 at 02:56:02 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:37:13 PM by AutoGen 5.18.5pre4 .\" From the definitions sntp-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -188,7 +188,9 @@ greater than or equal to 0 .sp If the time adjustment is less than \fIsteplimit\fP milliseconds, slew the amount using \fBadjtime(2)\fP. Otherwise, step the -correction using \fBsettimeofday(2)\fP. +correction using \fBsettimeofday(2)\fP. The default value is 0, +which means all adjustments will be stepped. This is a feature, as +different situations demand different values. .TP .NOP \f\*[B-Font]\-o\f[] \f\*[I-Font]number\f[], \f\*[B-Font]\-\-ntpversion\f[]=\f\*[I-Font]number\f[] Send \fBint\fP as our NTP protocol version. @@ -289,14 +291,28 @@ is the simplest use of this program and can be run as an unprivileged command to check the current time and error in the local clock. .TP 7 -.NOP \f[C]sntp \-a ntpserver.somewhere\f[] +.NOP \f[C]sntp \-Ss \-M 128 ntpserver.somewhere\f[] With suitable privilege, run as a command or from a \fCcron\fR(8)\f[] job, -\f\*[B-Font]sntp \-a\f[] -will reset the local clock from a synchronized specified server, +\f\*[B-Font]sntp \-Ss \-M 128 ntpserver.somewhere\f[] +will request the time from the server, +and if that server reports that it is synchronized +then if the offset adjustment is less than 128 milliseconds +the correction will be slewed, +and if the correction is more than 128 milliseconds +the correction will be stepped. +.TP 7 +.NOP \f[C]sntp \-S ntpserver.somewhere\f[] +With suitable privilege, +run as a command +or from a +\fCcron\fR(8)\f[] +job, +\f\*[B-Font]sntp \-S ntpserver.somewhere\f[] +will set (step) the local clock from a synchronized specified server, like the (deprecated) \fCntpdate\fR(@NTPDATE_MS@)\f[], or @@ -331,7 +347,7 @@ it to autogen-users@lists.sourceforge.net. Thank you. .NOP "Dave Hart" .br .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in index fe53632b6..d50feef11 100644 --- a/sntp/sntp.mdoc.in +++ b/sntp/sntp.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt SNTP @SNTP_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (sntp-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 02:56:09 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:37:20 PM by AutoGen 5.18.5pre4 .\" From the definitions sntp-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -162,7 +162,9 @@ greater than or equal to 0 .sp If the time adjustment is less than \fIsteplimit\fP milliseconds, slew the amount using \fBadjtime(2)\fP. Otherwise, step the -correction using \fBsettimeofday(2)\fP. +correction using \fBsettimeofday(2)\fP. The default value is 0, +which means all adjustments will be stepped. This is a feature, as +different situations demand different values. .It Fl o Ar number , Fl \-ntpversion Ns = Ns Ar number Send \fBint\fP as our NTP protocol version. This option takes an integer number as its argument. @@ -251,14 +253,27 @@ is searched for within those directories. is the simplest use of this program and can be run as an unprivileged command to check the current time and error in the local clock. -.It Li "sntp \-a ntpserver.somewhere" +.It Li "sntp \-Ss \-M 128 ntpserver.somewhere" With suitable privilege, run as a command or from a .Xr cron 8 job, -.Ic "sntp \-a" -will reset the local clock from a synchronized specified server, +.Ic "sntp \-Ss \-M 128 ntpserver.somewhere" +will request the time from the server, +and if that server reports that it is synchronized +then if the offset adjustment is less than 128 milliseconds +the correction will be slewed, +and if the correction is more than 128 milliseconds +the correction will be stepped. +.It Li "sntp \-S ntpserver.somewhere" +With suitable privilege, +run as a command +or from a +.Xr cron 8 +job, +.Ic "sntp \-S ntpserver.somewhere" +will set (step) the local clock from a synchronized specified server, like the (deprecated) .Xr ntpdate @NTPDATE_MS@ , or @@ -287,7 +302,7 @@ it to autogen\-users@lists.sourceforge.net. Thank you. .An "Harlan Stenn" .An "Dave Hart" .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi index 067bb1a29..cd5c43622 100644 --- a/util/invoke-ntp-keygen.texi +++ b/util/invoke-ntp-keygen.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp-keygen.texi) # -# It has been AutoGen-ed January 7, 2015 at 03:05:21 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 24, 2015 at 08:46:50 PM by AutoGen 5.18.5pre4 # From the definitions ntp-keygen-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -886,7 +886,7 @@ with a status code of 0. @exampleindent 0 @example -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta5 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-RC1 Usage: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -b Num imbits identity modulus bits diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index de399ff24..3a0de9a40 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed January 7, 2015 at 03:05:05 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 24, 2015 at 08:46:33 PM by AutoGen 5.18.5pre4 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntp-keygen program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. + * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -31,7 +31,7 @@ * both the copyright notice and this permission notice appear in * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware makes no + * without specific, written prior permission. The University of Delaware and Network Time Foundation makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -51,7 +51,7 @@ extern "C" { #endif extern FILE * option_usage_fp; #define zCopyright (ntp_keygen_opt_strs+0) -#define zLicenseDescrip (ntp_keygen_opt_strs+330) +#define zLicenseDescrip (ntp_keygen_opt_strs+356) /* * global included definitions @@ -71,117 +71,118 @@ extern FILE * option_usage_fp; /** * static const strings for ntp-keygen options */ -static char const ntp_keygen_opt_strs[2381] = -/* 0 */ "ntp-keygen (ntp) 4.2.8p1-beta5\n" - "Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n" +static char const ntp_keygen_opt_strs[2431] = +/* 0 */ "ntp-keygen (ntp) 4.2.8p1-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" " \n" " \n\0" -/* 330 */ "Permission to use, copy, modify, and distribute this software and its\n" +/* 356 */ "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" "documentation, and that the name The University of Delaware not be used in\n" "advertising or publicity pertaining to distribution of the software without\n" - "specific, written prior permission. The University of Delaware makes no\n" - "representations about the suitability this software for any purpose. It is\n" - "provided \"as is\" without express or implied warranty.\n\0" -/* 970 */ "identity modulus bits\0" -/* 992 */ "IMBITS\0" -/* 999 */ "imbits\0" -/* 1006 */ "certificate scheme\0" -/* 1025 */ "CERTIFICATE\0" -/* 1037 */ "certificate\0" -/* 1049 */ "privatekey cipher\0" -/* 1067 */ "CIPHER\0" -/* 1074 */ "cipher\0" -/* 1081 */ "Increase debug verbosity level\0" -/* 1112 */ "DEBUG_LEVEL\0" -/* 1124 */ "debug-level\0" -/* 1136 */ "Set the debug verbosity level\0" -/* 1166 */ "SET_DEBUG_LEVEL\0" -/* 1182 */ "set-debug-level\0" -/* 1198 */ "Write IFF or GQ identity keys\0" -/* 1228 */ "ID_KEY\0" -/* 1235 */ "id-key\0" -/* 1242 */ "Generate GQ parameters and keys\0" -/* 1274 */ "GQ_PARAMS\0" -/* 1284 */ "gq-params\0" -/* 1294 */ "generate RSA host key\0" -/* 1316 */ "HOST_KEY\0" -/* 1325 */ "host-key\0" -/* 1334 */ "generate IFF parameters\0" -/* 1358 */ "IFFKEY\0" -/* 1365 */ "iffkey\0" -/* 1372 */ "set Autokey group name\0" -/* 1395 */ "IDENT\0" -/* 1401 */ "ident\0" -/* 1407 */ "set certificate lifetime\0" -/* 1432 */ "LIFETIME\0" -/* 1441 */ "lifetime\0" -/* 1450 */ "generate MD5 keys\0" -/* 1468 */ "MD5KEY\0" -/* 1475 */ "md5key\0" -/* 1482 */ "modulus\0" -/* 1490 */ "MODULUS\0" -/* 1498 */ "generate PC private certificate\0" -/* 1530 */ "PVT_CERT\0" -/* 1539 */ "pvt-cert\0" -/* 1548 */ "local private password\0" -/* 1571 */ "PASSWORD\0" -/* 1580 */ "password\0" -/* 1589 */ "export IFF or GQ group keys with password\0" -/* 1631 */ "EXPORT_PASSWD\0" -/* 1645 */ "export-passwd\0" -/* 1659 */ "generate sign key (RSA or DSA)\0" -/* 1690 */ "SIGN_KEY\0" -/* 1699 */ "sign-key\0" -/* 1708 */ "set host and optionally group name\0" -/* 1743 */ "SUBJECT_NAME\0" -/* 1756 */ "subject-name\0" -/* 1769 */ "trusted certificate (TC scheme)\0" -/* 1801 */ "TRUSTED_CERT\0" -/* 1814 */ "trusted-cert\0" -/* 1827 */ "generate MV parameters\0" -/* 1856 */ "MV_PARAMS\0" -/* 1866 */ "mv-params\0" -/* 1876 */ "update MV keys\0" -/* 1897 */ "MV_KEYS\0" -/* 1905 */ "mv-keys\0" -/* 1913 */ "display extended usage information and exit\0" -/* 1957 */ "help\0" -/* 1962 */ "extended usage information passed thru pager\0" -/* 2007 */ "more-help\0" -/* 2017 */ "output version information and exit\0" -/* 2053 */ "version\0" -/* 2061 */ "save the option state to a config file\0" -/* 2100 */ "save-opts\0" -/* 2110 */ "load options from a config file\0" -/* 2142 */ "LOAD_OPTS\0" -/* 2152 */ "no-load-opts\0" -/* 2165 */ "no\0" -/* 2168 */ "NTP_KEYGEN\0" -/* 2179 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta5\n" + "specific, written prior permission. The University of Delaware and Network\n" + "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" +/* 1024 */ "identity modulus bits\0" +/* 1046 */ "IMBITS\0" +/* 1053 */ "imbits\0" +/* 1060 */ "certificate scheme\0" +/* 1079 */ "CERTIFICATE\0" +/* 1091 */ "certificate\0" +/* 1103 */ "privatekey cipher\0" +/* 1121 */ "CIPHER\0" +/* 1128 */ "cipher\0" +/* 1135 */ "Increase debug verbosity level\0" +/* 1166 */ "DEBUG_LEVEL\0" +/* 1178 */ "debug-level\0" +/* 1190 */ "Set the debug verbosity level\0" +/* 1220 */ "SET_DEBUG_LEVEL\0" +/* 1236 */ "set-debug-level\0" +/* 1252 */ "Write IFF or GQ identity keys\0" +/* 1282 */ "ID_KEY\0" +/* 1289 */ "id-key\0" +/* 1296 */ "Generate GQ parameters and keys\0" +/* 1328 */ "GQ_PARAMS\0" +/* 1338 */ "gq-params\0" +/* 1348 */ "generate RSA host key\0" +/* 1370 */ "HOST_KEY\0" +/* 1379 */ "host-key\0" +/* 1388 */ "generate IFF parameters\0" +/* 1412 */ "IFFKEY\0" +/* 1419 */ "iffkey\0" +/* 1426 */ "set Autokey group name\0" +/* 1449 */ "IDENT\0" +/* 1455 */ "ident\0" +/* 1461 */ "set certificate lifetime\0" +/* 1486 */ "LIFETIME\0" +/* 1495 */ "lifetime\0" +/* 1504 */ "generate MD5 keys\0" +/* 1522 */ "MD5KEY\0" +/* 1529 */ "md5key\0" +/* 1536 */ "modulus\0" +/* 1544 */ "MODULUS\0" +/* 1552 */ "generate PC private certificate\0" +/* 1584 */ "PVT_CERT\0" +/* 1593 */ "pvt-cert\0" +/* 1602 */ "local private password\0" +/* 1625 */ "PASSWORD\0" +/* 1634 */ "password\0" +/* 1643 */ "export IFF or GQ group keys with password\0" +/* 1685 */ "EXPORT_PASSWD\0" +/* 1699 */ "export-passwd\0" +/* 1713 */ "generate sign key (RSA or DSA)\0" +/* 1744 */ "SIGN_KEY\0" +/* 1753 */ "sign-key\0" +/* 1762 */ "set host and optionally group name\0" +/* 1797 */ "SUBJECT_NAME\0" +/* 1810 */ "subject-name\0" +/* 1823 */ "trusted certificate (TC scheme)\0" +/* 1855 */ "TRUSTED_CERT\0" +/* 1868 */ "trusted-cert\0" +/* 1881 */ "generate MV parameters\0" +/* 1910 */ "MV_PARAMS\0" +/* 1920 */ "mv-params\0" +/* 1930 */ "update MV keys\0" +/* 1951 */ "MV_KEYS\0" +/* 1959 */ "mv-keys\0" +/* 1967 */ "display extended usage information and exit\0" +/* 2011 */ "help\0" +/* 2016 */ "extended usage information passed thru pager\0" +/* 2061 */ "more-help\0" +/* 2071 */ "output version information and exit\0" +/* 2107 */ "version\0" +/* 2115 */ "save the option state to a config file\0" +/* 2154 */ "save-opts\0" +/* 2164 */ "load options from a config file\0" +/* 2196 */ "LOAD_OPTS\0" +/* 2206 */ "no-load-opts\0" +/* 2219 */ "no\0" +/* 2222 */ "NTP_KEYGEN\0" +/* 2233 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-RC1\n" "Usage: %s [ - [] | --[{=| }] ]...\n\0" -/* 2299 */ "$HOME\0" -/* 2305 */ ".\0" -/* 2307 */ ".ntprc\0" -/* 2314 */ "http://bugs.ntp.org, bugs@ntp.org\0" -/* 2348 */ "\n\0" -/* 2350 */ "ntp-keygen (ntp) 4.2.8p1-beta5"; +/* 2351 */ "$HOME\0" +/* 2357 */ ".\0" +/* 2359 */ ".ntprc\0" +/* 2366 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 2400 */ "\n\0" +/* 2402 */ "ntp-keygen (ntp) 4.2.8p1-RC1"; /** * imbits option description: */ #ifdef AUTOKEY /** Descriptive text for the imbits option */ -#define IMBITS_DESC (ntp_keygen_opt_strs+970) +#define IMBITS_DESC (ntp_keygen_opt_strs+1024) /** Upper-cased name for the imbits option */ -#define IMBITS_NAME (ntp_keygen_opt_strs+992) +#define IMBITS_NAME (ntp_keygen_opt_strs+1046) /** Name string for the imbits option */ -#define IMBITS_name (ntp_keygen_opt_strs+999) +#define IMBITS_name (ntp_keygen_opt_strs+1053) /** Compiled in flag settings for the imbits option */ #define IMBITS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -198,11 +199,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the certificate option */ -#define CERTIFICATE_DESC (ntp_keygen_opt_strs+1006) +#define CERTIFICATE_DESC (ntp_keygen_opt_strs+1060) /** Upper-cased name for the certificate option */ -#define CERTIFICATE_NAME (ntp_keygen_opt_strs+1025) +#define CERTIFICATE_NAME (ntp_keygen_opt_strs+1079) /** Name string for the certificate option */ -#define CERTIFICATE_name (ntp_keygen_opt_strs+1037) +#define CERTIFICATE_name (ntp_keygen_opt_strs+1091) /** Compiled in flag settings for the certificate option */ #define CERTIFICATE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -219,11 +220,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the cipher option */ -#define CIPHER_DESC (ntp_keygen_opt_strs+1049) +#define CIPHER_DESC (ntp_keygen_opt_strs+1103) /** Upper-cased name for the cipher option */ -#define CIPHER_NAME (ntp_keygen_opt_strs+1067) +#define CIPHER_NAME (ntp_keygen_opt_strs+1121) /** Name string for the cipher option */ -#define CIPHER_name (ntp_keygen_opt_strs+1074) +#define CIPHER_name (ntp_keygen_opt_strs+1128) /** Compiled in flag settings for the cipher option */ #define CIPHER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -239,11 +240,11 @@ static char const ntp_keygen_opt_strs[2381] = * debug-level option description: */ /** Descriptive text for the debug-level option */ -#define DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1081) +#define DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1135) /** Upper-cased name for the debug-level option */ -#define DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1112) +#define DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1166) /** Name string for the debug-level option */ -#define DEBUG_LEVEL_name (ntp_keygen_opt_strs+1124) +#define DEBUG_LEVEL_name (ntp_keygen_opt_strs+1178) /** Compiled in flag settings for the debug-level option */ #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) @@ -251,11 +252,11 @@ static char const ntp_keygen_opt_strs[2381] = * set-debug-level option description: */ /** Descriptive text for the set-debug-level option */ -#define SET_DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1136) +#define SET_DEBUG_LEVEL_DESC (ntp_keygen_opt_strs+1190) /** Upper-cased name for the set-debug-level option */ -#define SET_DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1166) +#define SET_DEBUG_LEVEL_NAME (ntp_keygen_opt_strs+1220) /** Name string for the set-debug-level option */ -#define SET_DEBUG_LEVEL_name (ntp_keygen_opt_strs+1182) +#define SET_DEBUG_LEVEL_name (ntp_keygen_opt_strs+1236) /** Compiled in flag settings for the set-debug-level option */ #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -265,11 +266,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the id-key option */ -#define ID_KEY_DESC (ntp_keygen_opt_strs+1198) +#define ID_KEY_DESC (ntp_keygen_opt_strs+1252) /** Upper-cased name for the id-key option */ -#define ID_KEY_NAME (ntp_keygen_opt_strs+1228) +#define ID_KEY_NAME (ntp_keygen_opt_strs+1282) /** Name string for the id-key option */ -#define ID_KEY_name (ntp_keygen_opt_strs+1235) +#define ID_KEY_name (ntp_keygen_opt_strs+1289) /** Compiled in flag settings for the id-key option */ #define ID_KEY_FLAGS (OPTST_DISABLED) @@ -285,11 +286,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the gq-params option */ -#define GQ_PARAMS_DESC (ntp_keygen_opt_strs+1242) +#define GQ_PARAMS_DESC (ntp_keygen_opt_strs+1296) /** Upper-cased name for the gq-params option */ -#define GQ_PARAMS_NAME (ntp_keygen_opt_strs+1274) +#define GQ_PARAMS_NAME (ntp_keygen_opt_strs+1328) /** Name string for the gq-params option */ -#define GQ_PARAMS_name (ntp_keygen_opt_strs+1284) +#define GQ_PARAMS_name (ntp_keygen_opt_strs+1338) /** Compiled in flag settings for the gq-params option */ #define GQ_PARAMS_FLAGS (OPTST_DISABLED) @@ -305,11 +306,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the host-key option */ -#define HOST_KEY_DESC (ntp_keygen_opt_strs+1294) +#define HOST_KEY_DESC (ntp_keygen_opt_strs+1348) /** Upper-cased name for the host-key option */ -#define HOST_KEY_NAME (ntp_keygen_opt_strs+1316) +#define HOST_KEY_NAME (ntp_keygen_opt_strs+1370) /** Name string for the host-key option */ -#define HOST_KEY_name (ntp_keygen_opt_strs+1325) +#define HOST_KEY_name (ntp_keygen_opt_strs+1379) /** Compiled in flag settings for the host-key option */ #define HOST_KEY_FLAGS (OPTST_DISABLED) @@ -325,11 +326,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the iffkey option */ -#define IFFKEY_DESC (ntp_keygen_opt_strs+1334) +#define IFFKEY_DESC (ntp_keygen_opt_strs+1388) /** Upper-cased name for the iffkey option */ -#define IFFKEY_NAME (ntp_keygen_opt_strs+1358) +#define IFFKEY_NAME (ntp_keygen_opt_strs+1412) /** Name string for the iffkey option */ -#define IFFKEY_name (ntp_keygen_opt_strs+1365) +#define IFFKEY_name (ntp_keygen_opt_strs+1419) /** Compiled in flag settings for the iffkey option */ #define IFFKEY_FLAGS (OPTST_DISABLED) @@ -345,11 +346,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the ident option */ -#define IDENT_DESC (ntp_keygen_opt_strs+1372) +#define IDENT_DESC (ntp_keygen_opt_strs+1426) /** Upper-cased name for the ident option */ -#define IDENT_NAME (ntp_keygen_opt_strs+1395) +#define IDENT_NAME (ntp_keygen_opt_strs+1449) /** Name string for the ident option */ -#define IDENT_name (ntp_keygen_opt_strs+1401) +#define IDENT_name (ntp_keygen_opt_strs+1455) /** Compiled in flag settings for the ident option */ #define IDENT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -366,11 +367,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the lifetime option */ -#define LIFETIME_DESC (ntp_keygen_opt_strs+1407) +#define LIFETIME_DESC (ntp_keygen_opt_strs+1461) /** Upper-cased name for the lifetime option */ -#define LIFETIME_NAME (ntp_keygen_opt_strs+1432) +#define LIFETIME_NAME (ntp_keygen_opt_strs+1486) /** Name string for the lifetime option */ -#define LIFETIME_name (ntp_keygen_opt_strs+1441) +#define LIFETIME_name (ntp_keygen_opt_strs+1495) /** Compiled in flag settings for the lifetime option */ #define LIFETIME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -386,11 +387,11 @@ static char const ntp_keygen_opt_strs[2381] = * md5key option description: */ /** Descriptive text for the md5key option */ -#define MD5KEY_DESC (ntp_keygen_opt_strs+1450) +#define MD5KEY_DESC (ntp_keygen_opt_strs+1504) /** Upper-cased name for the md5key option */ -#define MD5KEY_NAME (ntp_keygen_opt_strs+1468) +#define MD5KEY_NAME (ntp_keygen_opt_strs+1522) /** Name string for the md5key option */ -#define MD5KEY_name (ntp_keygen_opt_strs+1475) +#define MD5KEY_name (ntp_keygen_opt_strs+1529) /** Compiled in flag settings for the md5key option */ #define MD5KEY_FLAGS (OPTST_DISABLED) @@ -399,11 +400,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the modulus option */ -#define MODULUS_DESC (ntp_keygen_opt_strs+1482) +#define MODULUS_DESC (ntp_keygen_opt_strs+1536) /** Upper-cased name for the modulus option */ -#define MODULUS_NAME (ntp_keygen_opt_strs+1490) +#define MODULUS_NAME (ntp_keygen_opt_strs+1544) /** Name string for the modulus option */ -#define MODULUS_name (ntp_keygen_opt_strs+1482) +#define MODULUS_name (ntp_keygen_opt_strs+1536) /** Compiled in flag settings for the modulus option */ #define MODULUS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -420,11 +421,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the pvt-cert option */ -#define PVT_CERT_DESC (ntp_keygen_opt_strs+1498) +#define PVT_CERT_DESC (ntp_keygen_opt_strs+1552) /** Upper-cased name for the pvt-cert option */ -#define PVT_CERT_NAME (ntp_keygen_opt_strs+1530) +#define PVT_CERT_NAME (ntp_keygen_opt_strs+1584) /** Name string for the pvt-cert option */ -#define PVT_CERT_name (ntp_keygen_opt_strs+1539) +#define PVT_CERT_name (ntp_keygen_opt_strs+1593) /** Compiled in flag settings for the pvt-cert option */ #define PVT_CERT_FLAGS (OPTST_DISABLED) @@ -440,11 +441,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the password option */ -#define PASSWORD_DESC (ntp_keygen_opt_strs+1548) +#define PASSWORD_DESC (ntp_keygen_opt_strs+1602) /** Upper-cased name for the password option */ -#define PASSWORD_NAME (ntp_keygen_opt_strs+1571) +#define PASSWORD_NAME (ntp_keygen_opt_strs+1625) /** Name string for the password option */ -#define PASSWORD_name (ntp_keygen_opt_strs+1580) +#define PASSWORD_name (ntp_keygen_opt_strs+1634) /** Compiled in flag settings for the password option */ #define PASSWORD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -461,11 +462,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the export-passwd option */ -#define EXPORT_PASSWD_DESC (ntp_keygen_opt_strs+1589) +#define EXPORT_PASSWD_DESC (ntp_keygen_opt_strs+1643) /** Upper-cased name for the export-passwd option */ -#define EXPORT_PASSWD_NAME (ntp_keygen_opt_strs+1631) +#define EXPORT_PASSWD_NAME (ntp_keygen_opt_strs+1685) /** Name string for the export-passwd option */ -#define EXPORT_PASSWD_name (ntp_keygen_opt_strs+1645) +#define EXPORT_PASSWD_name (ntp_keygen_opt_strs+1699) /** Compiled in flag settings for the export-passwd option */ #define EXPORT_PASSWD_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -482,11 +483,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the sign-key option */ -#define SIGN_KEY_DESC (ntp_keygen_opt_strs+1659) +#define SIGN_KEY_DESC (ntp_keygen_opt_strs+1713) /** Upper-cased name for the sign-key option */ -#define SIGN_KEY_NAME (ntp_keygen_opt_strs+1690) +#define SIGN_KEY_NAME (ntp_keygen_opt_strs+1744) /** Name string for the sign-key option */ -#define SIGN_KEY_name (ntp_keygen_opt_strs+1699) +#define SIGN_KEY_name (ntp_keygen_opt_strs+1753) /** Compiled in flag settings for the sign-key option */ #define SIGN_KEY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -503,11 +504,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the subject-name option */ -#define SUBJECT_NAME_DESC (ntp_keygen_opt_strs+1708) +#define SUBJECT_NAME_DESC (ntp_keygen_opt_strs+1762) /** Upper-cased name for the subject-name option */ -#define SUBJECT_NAME_NAME (ntp_keygen_opt_strs+1743) +#define SUBJECT_NAME_NAME (ntp_keygen_opt_strs+1797) /** Name string for the subject-name option */ -#define SUBJECT_NAME_name (ntp_keygen_opt_strs+1756) +#define SUBJECT_NAME_name (ntp_keygen_opt_strs+1810) /** Compiled in flag settings for the subject-name option */ #define SUBJECT_NAME_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -524,11 +525,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the trusted-cert option */ -#define TRUSTED_CERT_DESC (ntp_keygen_opt_strs+1769) +#define TRUSTED_CERT_DESC (ntp_keygen_opt_strs+1823) /** Upper-cased name for the trusted-cert option */ -#define TRUSTED_CERT_NAME (ntp_keygen_opt_strs+1801) +#define TRUSTED_CERT_NAME (ntp_keygen_opt_strs+1855) /** Name string for the trusted-cert option */ -#define TRUSTED_CERT_name (ntp_keygen_opt_strs+1814) +#define TRUSTED_CERT_name (ntp_keygen_opt_strs+1868) /** Compiled in flag settings for the trusted-cert option */ #define TRUSTED_CERT_FLAGS (OPTST_DISABLED) @@ -544,11 +545,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the mv-params option */ -#define MV_PARAMS_DESC (ntp_keygen_opt_strs+1827) +#define MV_PARAMS_DESC (ntp_keygen_opt_strs+1881) /** Upper-cased name for the mv-params option */ -#define MV_PARAMS_NAME (ntp_keygen_opt_strs+1856) +#define MV_PARAMS_NAME (ntp_keygen_opt_strs+1910) /** Name string for the mv-params option */ -#define MV_PARAMS_name (ntp_keygen_opt_strs+1866) +#define MV_PARAMS_name (ntp_keygen_opt_strs+1920) /** Compiled in flag settings for the mv-params option */ #define MV_PARAMS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -565,11 +566,11 @@ static char const ntp_keygen_opt_strs[2381] = */ #ifdef AUTOKEY /** Descriptive text for the mv-keys option */ -#define MV_KEYS_DESC (ntp_keygen_opt_strs+1876) +#define MV_KEYS_DESC (ntp_keygen_opt_strs+1930) /** Upper-cased name for the mv-keys option */ -#define MV_KEYS_NAME (ntp_keygen_opt_strs+1897) +#define MV_KEYS_NAME (ntp_keygen_opt_strs+1951) /** Name string for the mv-keys option */ -#define MV_KEYS_name (ntp_keygen_opt_strs+1905) +#define MV_KEYS_name (ntp_keygen_opt_strs+1959) /** Compiled in flag settings for the mv-keys option */ #define MV_KEYS_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -584,11 +585,11 @@ static char const ntp_keygen_opt_strs[2381] = /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ntp_keygen_opt_strs+1913) -#define HELP_name (ntp_keygen_opt_strs+1957) +#define HELP_DESC (ntp_keygen_opt_strs+1967) +#define HELP_name (ntp_keygen_opt_strs+2011) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ntp_keygen_opt_strs+1962) -#define MORE_HELP_name (ntp_keygen_opt_strs+2007) +#define MORE_HELP_DESC (ntp_keygen_opt_strs+2016) +#define MORE_HELP_name (ntp_keygen_opt_strs+2061) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC HELP_DESC @@ -601,14 +602,14 @@ static char const ntp_keygen_opt_strs[2381] = # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (ntp_keygen_opt_strs+2017) -#define VER_name (ntp_keygen_opt_strs+2053) -#define SAVE_OPTS_DESC (ntp_keygen_opt_strs+2061) -#define SAVE_OPTS_name (ntp_keygen_opt_strs+2100) -#define LOAD_OPTS_DESC (ntp_keygen_opt_strs+2110) -#define LOAD_OPTS_NAME (ntp_keygen_opt_strs+2142) -#define NO_LOAD_OPTS_name (ntp_keygen_opt_strs+2152) -#define LOAD_OPTS_pfx (ntp_keygen_opt_strs+2165) +#define VER_DESC (ntp_keygen_opt_strs+2071) +#define VER_name (ntp_keygen_opt_strs+2107) +#define SAVE_OPTS_DESC (ntp_keygen_opt_strs+2115) +#define SAVE_OPTS_name (ntp_keygen_opt_strs+2154) +#define LOAD_OPTS_DESC (ntp_keygen_opt_strs+2164) +#define LOAD_OPTS_NAME (ntp_keygen_opt_strs+2196) +#define NO_LOAD_OPTS_name (ntp_keygen_opt_strs+2206) +#define LOAD_OPTS_pfx (ntp_keygen_opt_strs+2219) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /** * Declare option callback procedures @@ -959,24 +960,24 @@ static tOptDesc optDesc[OPTION_CT] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /** Reference to the upper cased version of ntp-keygen. */ -#define zPROGNAME (ntp_keygen_opt_strs+2168) +#define zPROGNAME (ntp_keygen_opt_strs+2222) /** Reference to the title line for ntp-keygen usage. */ -#define zUsageTitle (ntp_keygen_opt_strs+2179) +#define zUsageTitle (ntp_keygen_opt_strs+2233) /** ntp-keygen configuration file name. */ -#define zRcName (ntp_keygen_opt_strs+2307) +#define zRcName (ntp_keygen_opt_strs+2359) /** Directories to search for ntp-keygen config files. */ static char const * const apzHomeList[3] = { - ntp_keygen_opt_strs+2299, - ntp_keygen_opt_strs+2305, + ntp_keygen_opt_strs+2351, + ntp_keygen_opt_strs+2357, NULL }; /** The ntp-keygen program bug email address. */ -#define zBugsAddr (ntp_keygen_opt_strs+2314) +#define zBugsAddr (ntp_keygen_opt_strs+2366) /** Clarification/explanation of what ntp-keygen does. */ -#define zExplain (ntp_keygen_opt_strs+2348) +#define zExplain (ntp_keygen_opt_strs+2400) /** Extra detail explaining what ntp-keygen does. */ #define zDetail (NULL) /** The full version string for ntp-keygen. */ -#define zFullVersion (ntp_keygen_opt_strs+2350) +#define zFullVersion (ntp_keygen_opt_strs+2402) /* extracted from optcode.tlib near line 364 */ #if defined(ENABLE_NLS) @@ -1308,8 +1309,8 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntp_keygenOptions.pzCopyright */ - puts(_("ntp-keygen (ntp) 4.2.8p1-beta5\n\ -Copyright (C) 1970-2014 The University of Delaware, all rights reserved.\n\ + puts(_("ntp-keygen (ntp) 4.2.8p1-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")); @@ -1323,9 +1324,10 @@ 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\ documentation, and that the name The University of Delaware not be used in\n\ advertising or publicity pertaining to distribution of the software without\n\ -specific, written prior permission. The University of Delaware makes no\n\ -representations about the suitability this software for any purpose. It is\n\ -provided \"as is\" without express or implied warranty.\n")); +specific, written prior permission. The University of Delaware and Network\n\ +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")); /* referenced via ntp_keygenOptions.pOptDesc->pzText */ puts(_("identity modulus bits")); @@ -1406,14 +1408,14 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("load options from a config file")); /* referenced via ntp_keygenOptions.pzUsageTitle */ - puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta5\n\ + puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-RC1\n\ Usage: %s [ - [] | --[{=| }] ]...\n")); /* referenced via ntp_keygenOptions.pzExplain */ puts(_("\n")); /* referenced via ntp_keygenOptions.pzFullVersion */ - puts(_("ntp-keygen (ntp) 4.2.8p1-beta5")); + puts(_("ntp-keygen (ntp) 4.2.8p1-RC1")); /* referenced via ntp_keygenOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 758275921..99dedcae4 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed January 7, 2015 at 03:05:04 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 24, 2015 at 08:46:32 PM by AutoGen 5.18.5pre4 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -18,7 +18,7 @@ * The ntp-keygen program is copyrighted and licensed * under the following terms: * - * Copyright (C) 1970-2014 The University of Delaware, all rights reserved. + * Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: @@ -31,7 +31,7 @@ * both the copyright notice and this permission notice appear in * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware makes no + * without specific, written prior permission. The University of Delaware and Network Time Foundation makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -94,9 +94,9 @@ typedef enum { /** count of all options for ntp-keygen */ #define OPTION_CT 26 /** ntp-keygen version */ -#define NTP_KEYGEN_VERSION "4.2.8p1-beta5" +#define NTP_KEYGEN_VERSION "4.2.8p1-RC1" /** Full ntp-keygen version text */ -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.8p1-beta5" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.8p1-RC1" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman index 1a5ef93c3..1f0a736d3 100644 --- a/util/ntp-keygen.1ntp-keygenman +++ b/util/ntp-keygen.1ntp-keygenman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp-keygen 1ntp-keygenman "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands" +.TH ntp-keygen 1ntp-keygenman "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_naWRA/ag-moaOQA) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-n8aOgC/ag-z8aGfC) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:05:17 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:46:45 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -1195,9 +1195,9 @@ libopts had an internal operational error. Please report it to autogen-users@lists.sourceforge.net. Thank you. .PP .SH "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1970-2014 The University of Delaware all rights reserved. +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS It can take quite a while to generate some cryptographic values, diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc index 7848e8b37..2bcf3abd4 100644 --- a/util/ntp-keygen.1ntp-keygenmdoc +++ b/util/ntp-keygen.1ntp-keygenmdoc @@ -1,9 +1,9 @@ -.Dd January 7 2015 +.Dd January 24 2015 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.mdoc) .\" -.\" It has been AutoGen-ed January 7, 2015 at 03:05:24 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 24, 2015 at 08:46:52 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp-keygen-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -1051,9 +1051,9 @@ libopts had an internal operational error. Please report it to autogen\-users@lists.sourceforge.net. Thank you. .El .Sh "AUTHORS" -The University of Delaware +The University of Delaware and Network Time Foundation .Sh "COPYRIGHT" -Copyright (C) 1970\-2014 The University of Delaware all rights reserved. +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS It can take quite a while to generate some cryptographic values, diff --git a/util/ntp-keygen.html b/util/ntp-keygen.html index e18437624..9f4aa919d 100644 --- a/util/ntp-keygen.html +++ b/util/ntp-keygen.html @@ -70,7 +70,7 @@ All other files are in PEM-encoded printable ASCII format so they can be embedded as MIME attachments in mail to other sites. -

    This document applies to version 4.2.8p1-beta5 of ntp-keygen. +

    This document applies to version 4.2.8p1-RC1 of ntp-keygen.


    @@ -1085,7 +1085,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to more. Both will exit with a status code of 0. -
    ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta4
    +
    ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p1-beta5
     Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
       Flg Arg Option-Name    Description
        -b Num imbits         identity modulus bits
    diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
    index 3cfe67a11..b1d5d6b8c 100644
    --- a/util/ntp-keygen.man.in
    +++ b/util/ntp-keygen.man.in
    @@ -10,11 +10,11 @@
     .ds B-Font B
     .ds I-Font I
     .ds R-Font R
    -.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Jan 2015" "ntp (4.2.8p1-beta5)" "User Commands"
    +.TH ntp-keygen @NTP_KEYGEN_MS@ "24 Jan 2015" "ntp (4.2.8p1-RC1)" "User Commands"
     .\"
    -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-_naWRA/ag-moaOQA)
    +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-n8aOgC/ag-z8aGfC)
     .\"
    -.\" It has been AutoGen-ed January 7, 2015 at 03:05:17 AM by AutoGen 5.18.5pre4
    +.\" It has been AutoGen-ed January 24, 2015 at 08:46:45 PM by AutoGen 5.18.5pre4
     .\" From the definitions ntp-keygen-opts.def
     .\" and the template file agman-cmd.tpl
     .SH NAME
    @@ -1195,9 +1195,9 @@ libopts had an internal operational error.  Please report
     it to autogen-users@lists.sourceforge.net.  Thank you.
     .PP
     .SH "AUTHORS"
    -The University of Delaware
    +The University of Delaware and Network Time Foundation
     .SH "COPYRIGHT"
    -Copyright (C) 1970-2014 The University of Delaware all rights reserved.
    +Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved.
     This program is released under the terms of the NTP license, .
     .SH BUGS
     It can take quite a while to generate some cryptographic values,
    diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
    index 72f50b85a..48af40929 100644
    --- a/util/ntp-keygen.mdoc.in
    +++ b/util/ntp-keygen.mdoc.in
    @@ -1,9 +1,9 @@
    -.Dd January 7 2015
    +.Dd January 24 2015
     .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
     .Os
     .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
     .\"
    -.\"  It has been AutoGen-ed  January  7, 2015 at 03:05:24 AM by AutoGen 5.18.5pre4
    +.\"  It has been AutoGen-ed  January 24, 2015 at 08:46:52 PM by AutoGen 5.18.5pre4
     .\"  From the definitions    ntp-keygen-opts.def
     .\"  and the template file   agmdoc-cmd.tpl
     .Sh NAME
    @@ -1051,9 +1051,9 @@ libopts had an internal operational error.  Please report
     it to autogen\-users@lists.sourceforge.net.  Thank you.
     .El
     .Sh "AUTHORS"
    -The University of Delaware
    +The University of Delaware and Network Time Foundation
     .Sh "COPYRIGHT"
    -Copyright (C) 1970\-2014 The University of Delaware all rights reserved.
    +Copyright (C) 1992\-2015 The University of Delaware and Network Time Foundation all rights reserved.
     This program is released under the terms of the NTP license, .
     .Sh BUGS
     It can take quite a while to generate some cryptographic values,