From: Harlan Stenn Date: Sat, 4 Dec 2010 20:54:56 +0000 (+0000) Subject: NTP_4_2_7P89 X-Git-Tag: NTP_4_2_7P89^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ebab958070628da5c324b04bbae721157ea8e50;p=thirdparty%2Fntp.git NTP_4_2_7P89 bk: 4cfaaaa0lQShq5mKuHfDop-yYB9GwQ --- diff --git a/ChangeLog b/ChangeLog index 5ca2a9b26..0764ab0e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p89) 2010/12/04 Released by Harlan Stenn * [Bug 1736] tos int, bool options broken in 4.2.7p66. * from 4.2.6p3-RC12: Clean up the SNTP documentation. (4.2.7p88) 2010/12/02 Released by Harlan Stenn diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c index 0bbf9b549..624b4a956 100644 --- a/clockstuff/clktest-opts.c +++ b/clockstuff/clktest-opts.c @@ -1,25 +1,23 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.c) * - * It has been AutoGen-ed November 17, 2009 at 06:37:09 AM by AutoGen 5.10 + * It has been AutoGen-ed December 4, 2010 at 10:59:28 AM by AutoGen 5.11.3 * From the definitions clktest-opts.def * and the template file options * - * Generated from AutoOpts 33:0:8 templates. - */ - -/* - * This file was produced by an AutoOpts template. AutoOpts is a - * copyrighted work. This source file is not encumbered by AutoOpts - * licensing, but is provided under the licensing terms chosen by the - * clktest author or copyright holder. AutoOpts is licensed under - * the terms of the LGPL. The redistributable library (``libopts'') is - * licensed under the terms of either the LGPL or, at the users discretion, - * the BSD license. See the AutoOpts and/or libopts sources for details. + * Generated from AutoOpts 33:3:8 templates. + * + * AutoOpts is a copyrighted work. This source file is not encumbered + * by AutoOpts licensing, but is provided under the licensing terms chosen + * by the clktest author or copyright holder. AutoOpts is + * licensed under the terms of the LGPL. The redistributable library + * (``libopts'') is licensed under the terms of either the LGPL or, at the + * users discretion, the BSD license. See the AutoOpts and/or libopts sources + * for details. * * This source file is copyrighted and licensed under the following terms: * - * clktest copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved + * clktest copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -40,8 +38,8 @@ extern "C" { /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ tSCC zCopyright[] = - "clktest copyright (c) 1970-2009 David L. Mills and/or others, all rights reserved" -/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */ + "clktest copyright (c) 1970-2010 David L. Mills and/or others, all rights reserved" +/* extracted from ../include/copyright.def near line 8 */ ; tSCC zCopyrightNotice[24] = "see html/copyright.html"; @@ -67,39 +65,39 @@ extern int ttflags; /* * Speed option description: */ -tSCC zSpeedText[] = +static char const zSpeedText[] = "Set the rate according to the speed"; -tSCC zSpeed_NAME[] = "SPEED"; -tSCC zSpeed_Name[] = "speed"; +static char const zSpeed_NAME[] = "SPEED"; +static char const zSpeed_Name[] = "speed"; #define SPEED_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Debug option description: */ -tSCC zDebugText[] = +static char const zDebugText[] = "Turn on debugging output"; -tSCC zDebug_NAME[] = "DEBUG"; -tSCC zDebug_Name[] = "debug"; +static char const zDebug_NAME[] = "DEBUG"; +static char const zDebug_Name[] = "debug"; #define DEBUG_FLAGS (OPTST_DISABLED) /* * Crmod option description: */ -tSCC zCrmodText[] = +static char const zCrmodText[] = "Turn on CRMOD flag"; -tSCC zCrmod_NAME[] = "CRMOD"; -tSCC zCrmod_Name[] = "crmod"; +static char const zCrmod_NAME[] = "CRMOD"; +static char const zCrmod_Name[] = "crmod"; #define CRMOD_FLAGS (OPTST_DISABLED) /* * Command option description with * "Must also have options" and "Incompatible options": */ -tSCC zCommandText[] = +static char const zCommandText[] = ""; -tSCC zCommand_NAME[] = "COMMAND"; -tSCC zCommand_Name[] = "command"; +static char const zCommand_NAME[] = "COMMAND"; +static char const zCommand_Name[] = "command"; static const int aCommandMustList[] = { INDEX_OPT_TIMEOUT, NO_EQUIVALENT }; @@ -109,22 +107,22 @@ static const int /* * Timeout option description: */ -tSCC zTimeoutText[] = +static char const zTimeoutText[] = "Limit wait for command completion"; -tSCC zTimeout_NAME[] = "TIMEOUT"; -tSCC zTimeout_Name[] = "timeout"; +static char const zTimeout_NAME[] = "TIMEOUT"; +static char const zTimeout_Name[] = "timeout"; #define TIMEOUT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display extended usage information and exit"; -tSCC zHelp_Name[] = "help"; +static char const zHelpText[] = "Display extended usage information and exit"; +static char const zHelp_Name[] = "help"; #ifdef HAVE_WORKING_FORK #define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) -tSCC zMore_Help_Name[] = "more-help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +static char const zMore_Help_Name[] = "more-help"; +static char const zMore_HelpText[] = "Extended usage information passed thru pager"; #else #define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #define zMore_Help_Name NULL @@ -137,14 +135,14 @@ tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT #endif -tSCC zVersionText[] = "Output version information and exit"; -tSCC zVersion_Name[] = "version"; -tSCC zSave_OptsText[] = "Save the option state to a config file"; -tSCC zSave_Opts_Name[] = "save-opts"; -tSCC zLoad_OptsText[] = "Load options from a config file"; -tSCC zLoad_Opts_NAME[] = "LOAD_OPTS"; -tSCC zNotLoad_Opts_Name[] = "no-load-opts"; -tSCC zNotLoad_Opts_Pfx[] = "no"; +static char const zVersionText[] = "Output version information and exit"; +static char const zVersion_Name[] = "version"; +static char const zSave_OptsText[] = "Save the option state to a config file"; +static char const zSave_Opts_Name[] = "save-opts"; +static char const zLoad_OptsText[] = "Load options from a config file"; +static char const zLoad_Opts_NAME[] = "LOAD_OPTS"; +static char const zNotLoad_Opts_Name[] = "no-load-opts"; +static char const zNotLoad_Opts_Pfx[] = "no"; #define zLoad_Opts_Name (zNotLoad_Opts_Name + 3) /* * Declare option callback procedures @@ -154,8 +152,6 @@ tSCC zNotLoad_Opts_Pfx[] = "no"; * Under test, omit argument processing, or call optionStackArg, * if multiple copies are allowed. */ -extern tOptProc - optionPagedUsage, optionVersionStderr; static tOptProc doOptTimeout, doUsageOpt; @@ -171,7 +167,10 @@ static tOptProc * When not under test, there are different procs to use */ extern tOptProc - optionPagedUsage, optionPrintVersion; + optionBooleanVal, optionNestedVal, optionNumericVal, + optionPagedUsage, optionPrintVersion, optionResetOpt, + optionStackArg, optionTimeVal, optionUnstackArg, + optionVersionStderr; static tOptProc doOptCrmod, doOptSpeed, doOptTimeout, doUsageOpt; @@ -326,7 +325,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "CLKTEST"; tSCC zUsageTitle[] = -"clktest - test the clock line discipline - Ver. 4.2.5p245-RC\n\ +"clktest - test the clock line discipline - Ver. 4.2.7p89\n\ USAGE: %s [ - [] | --[{=| }] ]... \n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -341,7 +340,7 @@ Clktest can be used to test the clock line discipline (CLKLDISC,\n\ it must be available), and to take a look at radio clocks attached\n\ to a serial port.\n"; tSCC zFullVersion[] = CLKTEST_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -363,7 +362,8 @@ tOptions clktestOptions = { + OPTPROC_LONGOPT + OPTPROC_NO_REQ_OPT + OPTPROC_ENVIRON - + OPTPROC_ARGS_REQ ), + + OPTPROC_ARGS_REQ + + OPTPROC_MISUSE ), 0, NULL, /* current option index, current option */ NULL, NULL, zPROGNAME, zRcName, zCopyright, zCopyrightNotice, @@ -395,7 +395,7 @@ doUsageOpt( tOptDesc* pOptDesc ) { (void)pOptions; - USAGE( EXIT_SUCCESS ); + USAGE(EXIT_SUCCESS); } #if ! defined(TEST_CLKTEST_OPTS) @@ -407,7 +407,7 @@ doUsageOpt( static void doOptSpeed(tOptions* pOptions, tOptDesc* pOptDesc) { - /* extracted from clktest-opts.def, line 130 */ + /* extracted from clktest-opts.def, line 98 */ /* * speed table */ @@ -456,7 +456,7 @@ doOptSpeed(tOptions* pOptions, tOptDesc* pOptDesc) static void doOptCrmod(tOptions* pOptions, tOptDesc* pOptDesc) { - /* extracted from clktest-opts.def, line 184 */ + /* extracted from clktest-opts.def, line 152 */ ttflags |= CRMOD; } #endif /* defined(TEST_CLKTEST_OPTS) */ @@ -510,22 +510,25 @@ doOptTimeout(tOptions* pOptions, tOptDesc* pOptDesc) } pOptDesc->optArg.argInt = val; } -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */ +/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_CLKTEST_OPTS) /* TEST MAIN PROCEDURE: */ -extern void optionPutShell( tOptions* ); +extern void optionPutShell(tOptions*); int main(int argc, char** argv) { int res = EXIT_SUCCESS; - (void)optionProcess( &clktestOptions, argc, argv ); - optionPutShell( &clktestOptions ); + (void)optionProcess(&clktestOptions, argc, argv); + optionPutShell(&clktestOptions); + res = ferror(stdout); + if (res != 0) + fputs("output error writing to stdout\n", stderr); return res; } #endif /* defined TEST_CLKTEST_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */ #if ENABLE_NLS #include @@ -534,11 +537,11 @@ main(int argc, char** argv) #include #include -static char* AO_gettext( char const* pz ); +static char* AO_gettext(char const* pz); static void coerce_it(void** s); static char* -AO_gettext( char const* pz ) +AO_gettext(char const* pz) { char* pzRes; if (pz == NULL) @@ -546,10 +549,10 @@ AO_gettext( char const* pz ) pzRes = _(pz); if (pzRes == pz) return pzRes; - pzRes = strdup( pzRes ); + pzRes = strdup(pzRes); if (pzRes == NULL) { - fputs( _("No memory for duping translated strings\n"), stderr ); - exit( EXIT_FAILURE ); + fputs(_("No memory for duping translated strings\n"), stderr); + exit(EXIT_FAILURE); } return pzRes; } @@ -562,7 +565,7 @@ static void coerce_it(void** s) { *s = AO_gettext(*s); } * This invokes the translation code (e.g. gettext(3)). */ static void -translate_option_strings( void ) +translate_option_strings(void) { /* * Guard against re-translation. It won't work. The strings will have diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h index a2ae555c3..e0346638c 100644 --- a/clockstuff/clktest-opts.h +++ b/clockstuff/clktest-opts.h @@ -1,25 +1,23 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.h) * - * It has been AutoGen-ed November 17, 2009 at 06:37:09 AM by AutoGen 5.10 + * It has been AutoGen-ed December 4, 2010 at 10:59:28 AM by AutoGen 5.11.3 * From the definitions clktest-opts.def * and the template file options * - * Generated from AutoOpts 33:0:8 templates. - */ - -/* - * This file was produced by an AutoOpts template. AutoOpts is a - * copyrighted work. This header file is not encumbered by AutoOpts - * licensing, but is provided under the licensing terms chosen by the - * clktest author or copyright holder. AutoOpts is licensed under - * the terms of the LGPL. The redistributable library (``libopts'') is - * licensed under the terms of either the LGPL or, at the users discretion, - * the BSD license. See the AutoOpts and/or libopts sources for details. + * Generated from AutoOpts 33:3:8 templates. + * + * AutoOpts is a copyrighted work. This header file is not encumbered + * by AutoOpts licensing, but is provided under the licensing terms chosen + * by the clktest author or copyright holder. AutoOpts is + * licensed under the terms of the LGPL. The redistributable library + * (``libopts'') is licensed under the terms of either the LGPL or, at the + * users discretion, the BSD license. See the AutoOpts and/or libopts sources + * for details. * * This source file is copyrighted and licensed under the following terms: * - * clktest copyright (c) 1970-2009 David L. Mills and/or others - all rights reserved + * clktest copyright (c) 1970-2010 David L. Mills and/or others - all rights reserved * * see html/copyright.html */ @@ -41,7 +39,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 135168 +#define AO_TEMPLATE_VERSION 135171 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -65,13 +63,13 @@ typedef enum { } teOptIndex; #define OPTION_CT 10 -#define CLKTEST_VERSION "4.2.5p245-RC" -#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.5p245-RC" +#define CLKTEST_VERSION "4.2.7p89" +#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p89" /* * Interface defines for all options. Replace "n" with the UPPER_CASED * option name (as in the teOptIndex enumeration above). - * e.g. HAVE_OPT( SPEED ) + * e.g. HAVE_OPT(SPEED) */ #define DESC(n) (clktestOptions.pOptDesc[INDEX_OPT_## n]) #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) @@ -85,44 +83,10 @@ typedef enum { #define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) #define CLEAR_OPT(n) STMTS( \ DESC(n).fOptState &= OPTST_PERSISTENT_MASK; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \ DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) -/* * * * * * - * - * Globals exported from the test the clock line discipline option definitions - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../include/ntp_fp.h" -#include "../include/ntp.h" -#include "../include/ntp_unixtime.h" - -#ifdef CLKLDISC -# define DEFMAGIC '\r' -#endif - -#ifdef CLKLDISC -# ifdef STREAM -# include -# ifdef HAVE_SYS_CLKDEFS_H -# include -# endif -# undef DEFMAGIC -# define DEFMAGIC "\r" -# endif -#endif - /* * Make sure there are no #define name conflicts with the option names */ @@ -178,14 +142,14 @@ typedef enum { /* * Interface defines not associated with particular options */ -#define ERRSKIP_OPTERR STMTS( clktestOptions.fOptSet &= ~OPTPROC_ERRSTOP ) -#define ERRSTOP_OPTERR STMTS( clktestOptions.fOptSet |= OPTPROC_ERRSTOP ) +#define ERRSKIP_OPTERR STMTS(clktestOptions.fOptSet &= ~OPTPROC_ERRSTOP) +#define ERRSTOP_OPTERR STMTS(clktestOptions.fOptSet |= OPTPROC_ERRSTOP) #define RESTART_OPT(n) STMTS( \ clktestOptions.curOptIdx = (n); \ - clktestOptions.pzCurOpt = NULL ) + clktestOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) -#define USAGE(c) (*clktestOptions.pUsageProc)( &clktestOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */ +#define USAGE(c) (*clktestOptions.pUsageProc)(&clktestOptions, c) +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 408 */ /* * * * * * * @@ -200,9 +164,9 @@ extern tOptions clktestOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText( char const* pz ) { + static inline char* aoGetsText(char const* pz) { if (pz == NULL) return NULL; - return (char*)gettext( pz ); + return (char*)gettext(pz); } # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index c13141bad..a6629cddb 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 December 2, 2010 at 10:08:57 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:58:27 AM by AutoGen 5.11.3 * From the definitions ntpd-opts.def * and the template file options * @@ -1006,7 +1006,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.7p88\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p89\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 25900cd96..0f0494de5 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 December 2, 2010 at 10:08:57 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:58:26 AM by AutoGen 5.11.3 * From the definitions ntpd-opts.def * and the template file options * @@ -89,8 +89,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p88" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p88" +#define NTPD_VERSION "4.2.7p89" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p89" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 67a43c750..1d1a1b5f3 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed December 2, 2010 at 10:09:14 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 4, 2010 at 10:58:54 AM by AutoGen 5.11.3 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -64,7 +64,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p88 +ntpd - NTP daemon program - Ver. 4.2.7p89 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index c38b66bc8..b113c9102 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-12-02 "( 4.2.7p88)" "Programmer's Manual" +.TH NTPD 1 2010-12-04 "( 4.2.7p89)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed December 2, 2010 at 10:09:14 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 4, 2010 at 10:58:54 AM by AutoGen 5.11.3 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 5badb9ccf..143181dac 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed December 2, 2010 at 10:09:20 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:59:00 AM by AutoGen 5.11.3 * From the definitions ntpdc-opts.def * and the template file options * @@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p88\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p89\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 3bb4b9b75..e71bb706d 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed December 2, 2010 at 10:09:20 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:59:00 AM by AutoGen 5.11.3 * From the definitions ntpdc-opts.def * and the template file options * @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p88" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p88" +#define NTPDC_VERSION "4.2.7p89" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p89" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 0e350a8d6..907793c64 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed December 2, 2010 at 10:09:30 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 4, 2010 at 10:59:10 AM by AutoGen 5.11.3 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,7 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.7p88 +ntpdc - vendor-specific NTP query program - Ver. 4.2.7p89 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 98baf4be6..27895026a 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-12-02 "( 4.2.7p88)" "Programmer's Manual" +.TH NTPDC 1 2010-12-04 "( 4.2.7p89)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed December 2, 2010 at 10:09:29 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 4, 2010 at 10:59:09 AM by AutoGen 5.11.3 .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 45b7e64ac..00a169a79 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 December 2, 2010 at 10:09:30 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:59:10 AM by AutoGen 5.11.3 * From the definitions ntpq-opts.def * and the template file options * @@ -428,7 +428,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.7p88\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p89\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index ecfd91d0a..57c7080cb 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 December 2, 2010 at 10:09:30 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:59:10 AM by AutoGen 5.11.3 * From the definitions ntpq-opts.def * and the template file options * @@ -67,8 +67,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.7p88" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p88" +#define NTPQ_VERSION "4.2.7p89" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p89" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index b8ceb9af9..7d579500e 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed December 2, 2010 at 10:09:41 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 4, 2010 at 10:59:22 AM by AutoGen 5.11.3 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.7p88 +ntpq - standard NTP query program - Ver. 4.2.7p89 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index e91c5b352..d51893cc8 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-12-02 "( 4.2.7p88)" "Programmer's Manual" +.TH NTPQ 1 2010-12-04 "( 4.2.7p89)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed December 2, 2010 at 10:09:41 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 4, 2010 at 10:59:21 AM by AutoGen 5.11.3 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 1f69cb632..dc958c31c 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed December 2, 2010 at 10:09:42 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:59:22 AM by AutoGen 5.11.3 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -255,7 +255,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p88\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p89\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 6a1ec6b7b..e91549ccc 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed December 2, 2010 at 10:09:42 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:59:22 AM by AutoGen 5.11.3 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -61,8 +61,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.7p88" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p88" +#define NTPSNMPD_VERSION "4.2.7p89" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p89" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 262933ef8..85e1be209 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed December 2, 2010 at 10:09:47 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 4, 2010 at 10:59:27 AM by AutoGen 5.11.3 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,7 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p88 +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p89 USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -n no nofork Do not fork diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 5fb119aef..9c1921fb5 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-12-02 "( 4.2.7p88)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-12-04 "( 4.2.7p89)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed December 2, 2010 at 10:09:47 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 4, 2010 at 10:59:27 AM by AutoGen 5.11.3 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 0689b41b5..2198210ea 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0 # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=88 +point=89 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index d9839ffb2..4270fc180 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 December 2, 2010 at 10:08:50 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:58:20 AM by AutoGen 5.11.3 * From the definitions sntp-opts.def * and the template file options * @@ -473,7 +473,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.7p88\n\ +"sntp - standard SNTP program - Ver. 4.2.7p89\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -484,18 +484,12 @@ tSCC* apzHomeList[] = { tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL tSCC zDetail[] = "\n\ -.I sntp\n\ -implements the Simple Network Time Protocol, and is used\n\ -to query an NTP or SNTP server and either\n\ -display the time\n\ -or\n\ -set the local system's time (given suitable privilege).\n\n\ -It can be\n\ -run interactively from the command line or as a\n\ -.I cron\n\ -job.\n\n\ -NTP and SNTP are defined by RFC 5905, which\n\ -obsoletes RFC 4330 and RFC 1305.\n"; +sntp implements the Simple Network Time Protocol, and is used to query\n\ +an NTP or SNTP server and either display the time or set the local\n\ +system's time (given suitable privilege).\n\n\ +It can be run interactively from the command line or as a cron job.\n\n\ +NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC\n\ +1305.\n"; tSCC zFullVersion[] = SNTP_FULL_VERSION; /* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 493 */ diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index c489f4c2a..e492dd5fe 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 December 2, 2010 at 10:08:50 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 4, 2010 at 10:58:20 AM by AutoGen 5.11.3 * From the definitions sntp-opts.def * and the template file options * @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.7p88" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p88" +#define SNTP_VERSION "4.2.7p89" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p89" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index a048eccbf..a4d666665 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,26 +6,39 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed December 2, 2010 at 10:08:56 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 4, 2010 at 10:58:26 AM by AutoGen 5.11.3 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore This program has no explanation. -.I sntp -implements the Simple Network Time Protocol, and is used -to query an NTP or SNTP server and either -display the time -or -set the local system's time (given suitable privilege). - -It can be -run interactively from the command line or as a -.I cron +@code{sntp} +can be used as a SNTP client to query a NTP or SNTP server and either display +the time or set the local system's time (given suitable privilege). It can be +run as an interactive command or in a +@code{cron} job. -NTP and SNTP are defined by RFC 5905, which -obsoletes RFC 4330 and RFC 1305. +NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol) +are defined and described by RFC 5905. + +@indent +The default is to write the estimated correct local date and time (i.e. not +UTC) to the standard output in a format like +@example +1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs +@end example +where the +@example ++4.567 +/- 0.089 secs +@end example +indicates the local clock is 4.567 seconds behind the correct time +(so 4.567 seconds must be added to the local clock to get it to be correct), +and the time of +@code{1996 Oct 15 20:17:25.123} +is believed to be correct to within +@code{+/- 0.089} +seconds. This section was generated by @strong{AutoGen}, the aginfo template and the option descriptions for the @command{sntp} program. It documents the sntp usage text and option meanings. @@ -56,7 +69,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp - standard SNTP program - Ver. 4.2.7p88 +sntp - standard SNTP program - Ver. 4.2.7p89 USAGE: sntp [ - [] | --[@{=| @}] ]... hostname-or-IP ... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution @@ -99,20 +112,14 @@ The following option preset mechanisms are supported: - reading file /deacon/backroom/snaps/ntp-dev/sntp/.ntprc - examining environment variables named SNTP_* -.I sntp -implements the Simple Network Time Protocol, and is used -to query an NTP or SNTP server and either -display the time -or -set the local system's time (given suitable privilege). +sntp implements the Simple Network Time Protocol, and is used to query +an NTP or SNTP server and either display the time or set the local +system's time (given suitable privilege). -It can be -run interactively from the command line or as a -.I cron -job. +It can be run interactively from the command line or as a cron job. -NTP and SNTP are defined by RFC 5905, which -obsoletes RFC 4330 and RFC 1305. +NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC +1305. please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @@ -165,7 +172,7 @@ syslog. @end itemize This option causes the client to write log messages to the specified -logfile. +logfile. @node sntp ipv4 @subsection ipv4 option (-4) @@ -204,12 +211,12 @@ to the IPv6 namespace. @cindex sntp-keyfile This is the ``specify a keyfile. sntp will look in this file for the key specified with -a'' option. -This option specifies the keyfile. SNTP will search for the key specified with -a keyno in this +This option specifies the keyfile. SNTP will search for the key specified with -a keyno in this file. Key files follow the following format: keyid keytype key -Where keyid is a number identifying this key +Where keyid is a number identifying this key keytype is one of the follow: S Key in 64 Bit hexadecimal number as specified in in the DES specification. N Key in 64 Bit hexadecimal number as specified in the NTP standard. @@ -272,5 +279,5 @@ When this option is set all logging will be done using syslog. @cindex sntp-timeout This is the ``specify the number of seconds to wait for broadcasts'' option. -When waiting for a broadcast packet SNTP will wait the number +When waiting for a broadcast packet SNTP will wait the number of seconds specified before giving up. Default 68 seconds. diff --git a/sntp/sntp.1 b/sntp/sntp.1 index a074c091f..187ea4cb9 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-12-02 "( 4.2.7p88)" "Programmer's Manual" +.TH SNTP 1 2010-12-04 "( 4.2.7p89)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed December 2, 2010 at 10:08:55 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 4, 2010 at 10:58:25 AM by AutoGen 5.11.3 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" @@ -85,7 +85,7 @@ This option must not appear in combination with any of the following options: syslog. .sp This option causes the client to write log messages to the specified -logfile. +logfile. .TP .BR \-s ", " \--settod Set (step) the time with settimeofday(). @@ -115,7 +115,7 @@ The default \fIseconds\fP for this option is: .ti +4 68 .sp -When waiting for a broadcast packet SNTP will wait the number +When waiting for a broadcast packet SNTP will wait the number of seconds specified before giving up. Default 68 seconds. .TP .BR \-a " \fIauth-keynumber\fP, " \--authentication "=" \fIauth-keynumber\fP @@ -129,12 +129,12 @@ key's identifier. See the keyfile option (-k) for more details. .BR \-k " \fIfile-name\fP, " \--keyfile "=" \fIfile-name\fP Specify a keyfile. SNTP will look in this file for the key specified with \-a. .sp -This option specifies the keyfile. SNTP will search for the key specified with \-a keyno in this +This option specifies the keyfile. SNTP will search for the key specified with \-a keyno in this file. Key files follow the following format: keyid keytype key -Where keyid is a number identifying this key +Where keyid is a number identifying this key keytype is one of the follow: S Key in 64 Bit hexadecimal number as specified in in the DES specification. N Key in 64 Bit hexadecimal number as specified in the NTP standard. diff --git a/sntp/sntp.html b/sntp/sntp.html index 17dce8564..b119a36d2 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -36,9 +36,9 @@ 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.7p88 of sntp. +

This document applies to version 4.2.7p89 of sntp. -

The program implements the SNTP protocol as defined by the draft NTPv4 +

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification.

@@ -73,7 +73,358 @@ standard output in the format:

where the +4.567 +/- 0.089 secs indicates the time offset and error bound of the system clock relative to the server clock. - +

+

+ +
+
+ +

Invoking sntp

+ +

This program has no explanation. + +

sntp +can be used as a SNTP client to query a NTP or SNTP server and either display +the time or set the local system's time (given suitable privilege). It can be +run as an interactive command or in a +cron +job. + +

NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol) +are defined and described by RFC 5905. + +

The default is to write the estimated correct local date and time (i.e. not +UTC) to the standard output in a format like +

     1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs
+
+

where the +

     +4.567 +/- 0.089 secs
+
+

indicates the local clock is 4.567 seconds behind the correct time +(so 4.567 seconds must be added to the local clock to get it to be correct), +and the time of +1996 Oct 15 20:17:25.123 +is believed to be correct to within ++/- 0.089 +seconds. + +

This section was generated by AutoGen, +the aginfo template and the option descriptions for the sntp program. It documents the sntp usage text and option meanings. + +

This software is released under a specialized copyright license. + +

+ +
+

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

sntp usage help (-?)

+ +

+This is the automatically generated usage text for sntp: + +

sntp - standard SNTP program - Ver. 4.2.7p89
+USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...
+  Flg Arg Option-Name    Description
+   -4 no  ipv4           Force IPv4 DNS name resolution
+                                - prohibits these options:
+                                ipv6
+   -6 no  ipv6           Force IPv6 DNS name resolution
+                                - prohibits these options:
+                                ipv4
+   -d no  normalverbose  Normal verbose
+   -K Str kod            KoD history filename
+   -p no  syslog         Logging with syslog
+                                - prohibits these options:
+                                filelog
+   -l Str filelog        Log to specified logfile
+                                - prohibits these options:
+                                syslog
+   -s no  settod         Set (step) the time with settimeofday()
+                                - prohibits these options:
+                                adjtime
+   -j no  adjtime        Set (slew) the time with adjtime()
+                                - prohibits these options:
+                                settod
+   -b Str broadcast      Use broadcasts to the address specified for synchronisation
+   -t Num timeout        Specify the number of seconds to wait for broadcasts
+   -a Num authentication Enable authentication with the key auth-keynumber
+   -k Str keyfile        Specify a keyfile. SNTP will look in this file for the key specified with -a
+      opt version        Output version information and exit
+   -? no  help           Display extended usage information and exit
+   -! no  more-help      Extended usage information passed thru pager
+   -> opt save-opts      Save the option state to a config file
+   -< Str load-opts      Load options from a config file
+                                - disabled as --no-load-opts
+                                - may appear multiple times
+
+Options are specified by doubled hyphens and their name
+or by a single hyphen and the flag character.
+
+The following option preset mechanisms are supported:
+ - reading file /deacon/users/stenn/.ntprc
+ - reading file /deacon/backroom/snaps/ntp-dev/sntp/.ntprc
+ - examining environment variables named SNTP_*
+
+sntp implements the Simple Network Time Protocol, and is used to query
+an NTP or SNTP server and either display the time or set the local
+system's time (given suitable privilege).
+
+It can be run interactively from the command line or as a cron job.
+
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
+
+
+

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

adjtime option (-j)

+ +

+This is the “set (slew) the time with adjtime()” option. + +

This option has some usage constraints. It: +

    +
  • must not appear in combination with any of the following options: +settod. +
+ +
+

+Next: , +Previous: sntp adjtime, +Up: sntp Invocation +
+
+ +

authentication option (-a)

+ +

+This is the “enable authentication with the key auth-keynumber” option. +This option enables 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. + +

+

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

broadcast option (-b)

+ +

+This is the “use broadcasts to the address specified for synchronisation” option. +If specified SNTP will listen to the specified broadcast address +for NTP broadcasts. The default maximum wait time, +68 seconds, can be modified with -t. + +

+

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

filelog option (-l)

+ +

+This is the “log to specified logfile” option. + +

This option has some usage constraints. It: +

    +
  • must not appear in combination with any of the following options: +syslog. +
+ +

This option causes the client to write log messages to the specified +logfile. + +

+

+Next: , +Previous: sntp filelog, +Up: sntp Invocation +
+
+ +

ipv4 option (-4)

+ +

+This is the “force ipv4 dns name resolution” option. + +

This option has some usage constraints. It: +

    +
  • must not appear in combination with any of the following options: +ipv6. +
+ +

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

+

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

ipv6 option (-6)

+ +

+This is the “force ipv6 dns name resolution” option. + +

This option has some usage constraints. It: +

    +
  • must not appear in combination with any of the following options: +ipv4. +
+ +

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

+

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

keyfile option (-k)

+ +

+This is the “specify a keyfile. sntp will look in this file for the key specified with -a” option. +This option specifies the keyfile. SNTP will search for the key specified with -a keyno in this +file. Key files follow the following format: + +

keyid keytype key + +

Where keyid is a number identifying this key +keytype is one of the follow: +S Key in 64 Bit hexadecimal number as specified in in the DES specification. +N Key in 64 Bit hexadecimal number as specified in the NTP standard. +A Key in a 1-to-8 character ASCII string. +M Key in a 1-to-8 character ASCII string using the MD5 authentication scheme. + +

For more information see ntp.keys(5). + +

+

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

kod option (-K)

+ +

+This is the “kod history filename” option. +Modifies the filename to be used to persist the history of KoD +responses received from servers. The default is +/var/db/ntp-kod. + +

+

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

normalverbose option (-d)

+ +

+This is the “normal verbose” option. +Diagnostic messages for non-fatal errors and a limited amount of +tracing should be written to standard error. Fatal ones always +produce a diagnostic. This option should be set when there is a +suspected problem with the server, network or the source. + +

+

+Next: , +Previous: sntp normalverbose, +Up: sntp Invocation +
+
+ +

settod option (-s)

+ +

+This is the “set (step) the time with settimeofday()” option. + +

This option has some usage constraints. It: +

    +
  • must not appear in combination with any of the following options: +adjtime. +
+ +
+

+Next: , +Previous: sntp settod, +Up: sntp Invocation +
+
+ +

syslog option (-p)

+ +

+This is the “logging with syslog” option. + +

This option has some usage constraints. It: +

    +
  • must not appear in combination with any of the following options: +filelog. +
+ +

When this option is set all logging will be done using syslog. + +

+

+Previous: sntp syslog, +Up: sntp Invocation +
+
+ +

timeout option (-t)

+ +

+This is the “specify the number of seconds to wait for broadcasts” option. +When waiting for a broadcast packet SNTP will wait the number +of seconds specified before giving up. Default 68 seconds. +

Previous: sntp Description, @@ -88,14 +439,14 @@ Up: Top check the current time, offset, and error in the local clock. For example: -
     sntp ntpserver.somewhere
+
    sntp ntpserver.somewhere
 

   
With suitable privilege, it can be run as a command or in a
 crom job to reset the local clock from a reliable server, like
 the ntpdate and rdate commands. 
 For example:
 
-
     sntp -a ntpserver.somewhere
+
    sntp -a ntpserver.somewhere
 

   
 
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 848dc7cbf..d005e9118 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  December  2, 2010 at 10:09:48 AM by AutoGen 5.11.3
+ *  It has been AutoGen-ed  December  4, 2010 at 10:59:32 AM by AutoGen 5.11.3
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -757,7 +757,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p88\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p89\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index f68e4ffd2..f75a7e324 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  December  2, 2010 at 10:09:48 AM by AutoGen 5.11.3
+ *  It has been AutoGen-ed  December  4, 2010 at 10:59:32 AM by AutoGen 5.11.3
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -77,8 +77,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p88"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p88"
+#define NTP_KEYGEN_VERSION       "4.2.7p89"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p89"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 420bf0cc6..7ab54c026 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  December  2, 2010 at 10:09:56 AM by AutoGen 5.11.3
+# It has been AutoGen-ed  December  4, 2010 at 10:59:40 AM by AutoGen 5.11.3
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -52,7 +52,7 @@ This is the automatically generated usage text for ntp-keygen:
 @exampleindent 0
 @example
 Using OpenSSL version 90704f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p88
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p89
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index adade8f9b..d270bfa16 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-02 "(ntp 4.2.7p88)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-12-04 "(ntp 4.2.7p89)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December  2, 2010 at 10:09:56 AM by AutoGen 5.11.3
+.\"  It has been AutoGen-ed  December  4, 2010 at 10:59:40 AM by AutoGen 5.11.3
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"