From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 13 Aug 2009 05:23:53 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
X-Git-Tag: NTP_4_2_5P201~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41b7a117ff6b6eca5941fdf4fee777b8d6da733d;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
into  whimsy.udel.edu:/deacon/backroom/ntp-dev-sntp

bk: 4a83a369gGvm1biH8eFaNJHj7phF3Q
---

41b7a117ff6b6eca5941fdf4fee777b8d6da733d
diff --cc ChangeLog
index 9c53d00e6,2a48a6fa5..81702a7fe
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* sntp: out with the old, in with the new.
+ (4.2.5p200) 2009/08/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1281] Build ntpd on Windows without big SDK download, burn,
    and install by checking in essentially unchanging messages.mc build
    products to avoid requiring mc.exe, which is not included with VC++
diff --cc sntp/sntp-opts.c
index 7443d2955,7f6dcb856..238059d5d
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@@ -1,7 -1,7 +1,7 @@@
  /*  
   *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
   *  
-  *  It has been AutoGen-ed  August  9, 2009 at 07:52:56 AM by AutoGen 5.9.9pre5
 - *  It has been AutoGen-ed  August 12, 2009 at 07:56:29 AM by AutoGen 5.9.9pre5
++ *  It has been AutoGen-ed  August 12, 2009 at 07:55:27 AM by AutoGen 5.9.9pre5
   *  From the definitions    sntp-opts.def
   *  and the template file   options
   *
@@@ -458,8 -508,8 +458,8 @@@ static tOptDesc optDesc[ OPTION_CT ] = 
   */
  tSCC   zPROGNAME[]   = "SNTP";
  tSCC   zUsageTitle[] =
- "sntp - standard SNTP program - Ver. 4.2.5p199\n\
+ "sntp - standard SNTP program - Ver. 4.2.5p200\n\
 -USAGE:  %s [ -<flag> | --<name> ]...\n";
 +USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... ...\n";
  tSCC   zRcName[]     = ".ntprc";
  tSCC*  apzHomeList[] = {
         "$HOME",
diff --cc sntp/sntp-opts.h
index e6fb7ad4e,361f21f48..5540125ca
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@@ -1,7 -1,7 +1,7 @@@
  /*  
   *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
   *  
-  *  It has been AutoGen-ed  August  9, 2009 at 07:52:55 AM by AutoGen 5.9.9pre5
 - *  It has been AutoGen-ed  August 12, 2009 at 07:56:29 AM by AutoGen 5.9.9pre5
++ *  It has been AutoGen-ed  August 12, 2009 at 07:55:26 AM by AutoGen 5.9.9pre5
   *  From the definitions    sntp-opts.def
   *  and the template file   options
   *
@@@ -52,28 -131,24 +52,28 @@@
   *  Enumeration of each option:
   */
  typedef enum {
 -    INDEX_OPT_IPV4           =  0,
 -    INDEX_OPT_IPV6           =  1,
 -    INDEX_OPT_UNPRIVPORT     =  2,
 -    INDEX_OPT_NORMALVERBOSE  =  3,
 -    INDEX_OPT_EXTRAVERBOSE   =  4,
 -    INDEX_OPT_MEGAVERBOSE    =  5,
 -    INDEX_OPT_SETTIMEOFDAY   =  6,
 -    INDEX_OPT_ADJTIME        =  7,
 -    INDEX_OPT_VERSION        =  8,
 -    INDEX_OPT_HELP           =  9,
 -    INDEX_OPT_MORE_HELP      = 10,
 -    INDEX_OPT_SAVE_OPTS      = 11,
 -    INDEX_OPT_LOAD_OPTS      = 12
 +    INDEX_OPT_IPV4            =  0,
 +    INDEX_OPT_IPV6            =  1,
 +    INDEX_OPT_NORMALVERBOSE   =  2,
 +    INDEX_OPT_KOD             =  3,
 +    INDEX_OPT_SYSLOG          =  4,
 +    INDEX_OPT_FILELOG         =  5,
 +    INDEX_OPT_SETTOD          =  6,
 +    INDEX_OPT_ADJTIME         =  7,
 +    INDEX_OPT_BROADCAST       =  8,
 +    INDEX_OPT_TIMEOUT         =  9,
 +    INDEX_OPT_AUTHENTICATION  = 10,
 +    INDEX_OPT_KEYFILE         = 11,
 +    INDEX_OPT_VERSION         = 12,
 +    INDEX_OPT_HELP            = 13,
 +    INDEX_OPT_MORE_HELP       = 14,
 +    INDEX_OPT_SAVE_OPTS       = 15,
 +    INDEX_OPT_LOAD_OPTS       = 16
  } teOptIndex;
  
 -#define OPTION_CT    13
 +#define OPTION_CT    17
- #define SNTP_VERSION       "4.2.5p199"
- #define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p199"
+ #define SNTP_VERSION       "4.2.5p200"
+ #define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p200"
  
  /*
   *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --cc sntp/sntp-opts.texi
index 95bf38f1a,57250ddc5..7cf37c632
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@@ -6,7 -6,7 +6,7 @@@
  # 
  # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
  # 
- # It has been AutoGen-ed  August  9, 2009 at 07:52:59 AM by AutoGen 5.9.9pre5
 -# It has been AutoGen-ed  August 12, 2009 at 07:56:32 AM by AutoGen 5.9.9pre5
++# It has been AutoGen-ed  August 12, 2009 at 07:55:30 AM by AutoGen 5.9.9pre5
  # From the definitions    sntp-opts.def
  # and the template file   aginfo.tpl
  @end ignore
diff --cc sntp/sntp.1
index a13b61012,275d0d1a9..8d52900bd
--- a/sntp/sntp.1
+++ b/sntp/sntp.1
@@@ -1,7 -1,7 +1,7 @@@
- .TH SNTP 1 2009-08-09 "( 4.2.5p199)" "Programmer's Manual"
+ .TH SNTP 1 2009-08-12 "( 4.2.5p200)" "Programmer's Manual"
  .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
  .\"  
- .\"  It has been AutoGen-ed  August  9, 2009 at 07:52:57 AM by AutoGen 5.9.9pre5
 -.\"  It has been AutoGen-ed  August 12, 2009 at 07:56:31 AM by AutoGen 5.9.9pre5
++.\"  It has been AutoGen-ed  August 12, 2009 at 07:55:28 AM by AutoGen 5.9.9pre5
  .\"  From the definitions    sntp-opts.def
  .\"  and the template file   agman1.tpl
  .\"