[ntp:bk-ntp-dev-send] BitKeeper diffs

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Sun Jul 7 06:35:41 UTC 2013


#### ChangeSet ####
2013-07-07 06:34:52+00:00, stenn at deacon.udel.edu
  NTP_4_2_7P371
  TAG: NTP_4_2_7P371

==== ChangeLog ====
2013-07-07 06:34:48+00:00, stenn at deacon.udel.edu +1 -0
  NTP_4_2_7P371

--- 1.1304/ChangeLog	2013-07-07 05:47:26 +00:00
+++ 1.1305/ChangeLog	2013-07-07 06:34:48 +00:00
@@ -1,3 +1,4 @@
+(4.2.7p371) 2013/07/07 Released by Harlan Stenn <stenn at ntp.org>
 * CID 1042586: Check the return value of clock_gettime() in worker_sleep().
 * Upgrade to libopts-39.0.14 from 5.17.5pre10.
 (4.2.7p370) 2013/07/06 Released by Harlan Stenn <stenn at ntp.org>

==== ntpd/invoke-ntp.conf.texi ====
2013-07-07 06:34:48+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.45/ntpd/invoke-ntp.conf.texi	2013-07-06 11:30:47 +00:00
+++ 1.46/ntpd/invoke-ntp.conf.texi	2013-07-07 06:34:48 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp.conf.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:28:39 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:26:19 AM by AutoGen 5.17.5pre10
 # From the definitions    ntp.conf.def
 # and the template file   agtexi-file.tpl
 @end ignore

==== ntpd/invoke-ntp.keys.texi ====
2013-07-07 06:34:48+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.45/ntpd/invoke-ntp.keys.texi	2013-07-06 11:30:47 +00:00
+++ 1.46/ntpd/invoke-ntp.keys.texi	2013-07-07 06:34:48 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp.keys.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:28:41 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:26:21 AM by AutoGen 5.17.5pre10
 # From the definitions    ntp.keys.def
 # and the template file   agtexi-file.tpl
 @end ignore

==== ntpd/invoke-ntpd.texi ====
2013-07-07 06:34:48+00:00, stenn at deacon.udel.edu +4 -2
  NTP_4_2_7P371

--- 1.361/ntpd/invoke-ntpd.texi	2013-07-06 11:30:47 +00:00
+++ 1.362/ntpd/invoke-ntpd.texi	2013-07-07 06:34:48 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpd.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:28:43 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:32:10 AM by AutoGen 5.17.5pre10
 # 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.7p370
+ntpd - NTP daemon program - Ver. 4.2.7p371
 Usage:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -209,6 +209,8 @@ The following option preset mechanisms a
  - examining environment variables named NTPD_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs@@ntp.org>
+
+exit 0
 @end example
 @exampleindent 4
 

==== ntpd/ntp.conf.5man ====
2013-07-07 06:34:48+00:00, stenn at deacon.udel.edu +36 -36
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.conf.5man	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.conf.5man	2013-07-07 06:34:48 +00:00
@@ -1,8 +1,8 @@
-.TH ntp.conf 5man "06 Jul 2013" "4.2.7p370" "File Formats"
+.TH ntp.conf 5man "07 Jul 2013" "4.2.7p371" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:26 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:26:05 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -189,7 +189,7 @@ equivalent classes for that address fami
 These five commands specify the time server name or address to
 be used and the mode in which to operate.
 The
-\fIaddress\fR
+IaddressR
 can be
 either a DNS name or an IP address in dotted-quad notation.
 Additional information on association behavior can be found in the
@@ -242,7 +242,7 @@ broadcast messages go only to the interf
 subnet specified, but multicast messages go to all interfaces.
 In broadcast mode the local server sends periodic broadcast
 messages to a client population at the
-\fIaddress\fR
+IaddressR
 specified, which is usually the broadcast address on (one of) the
 local network(s) or a multicast address assigned to NTP.
 The IANA
@@ -281,7 +281,7 @@ discovered as the result of broadcast/mu
 The
 client broadcasts a request message to the group address associated
 with the specified
-\fIaddress\fR
+IaddressR
 and specifically enabled
 servers respond to these messages.
 The client selects the servers
@@ -330,7 +330,7 @@ option.
 .BR Cm key Ar key
 All packets sent to and received from the server or peer are to
 include authentication fields encrypted using the specified
-\fIkey\fR
+IkeyR
 identifier with values from 1 to 65534, inclusive.
 The
 default is to include no encryption field.
@@ -371,10 +371,10 @@ for further information.
 This option is used only with broadcast server and manycast
 client modes.
 It specifies the time-to-live
-\fIttl\fR
+IttlR
 to
 use on broadcast server and multicast server and the maximum
-\fIttl\fR
+IttlR
 for the expanding ring search with manycast
 client packets.
 Selection of the proper value, which defaults to
@@ -857,7 +857,7 @@ Specifies the key identifier to use with
 utility, which uses the standard
 protocol defined in RFC-1305.
 The
-\fIkey\fR
+IkeyR
 argument is
 the key identifier for a trusted key, where the value can be in the
 range 1 to 65,534, inclusive.
@@ -975,7 +975,7 @@ utility program, which uses a
 proprietary protocol specific to this implementation of
 .Xr ntpd 1ntpdmdoc .
 The
-\fIkey\fR
+IkeyR
 argument is a key identifier
 for the trusted key, where the value can be in the range 1 to
 65,534, inclusive.
@@ -1005,7 +1005,7 @@ and remote servers share the same key an
 purpose, although different keys can be used with different
 servers.
 The
-\fIkey\fR
+IkeyR
 arguments are 32-bit unsigned
 integers with values from 1 to 65,534.
 .SS Error Codes
@@ -1097,7 +1097,7 @@ automatically summarized and archived fo
 .BR Ic statistics Ar name ...
 Enables writing of statistics records.
 Currently, four kinds of
-\fIname\fR
+InameR
 statistics are supported.
 .in +4
 .ti -4
@@ -1319,17 +1319,17 @@ command.
 This is the file name for the statistics records.
 Filenames of set
 members are built from three concatenated elements
-\fICm prefix ,\fR
-\fICm filename\fR
+ICm prefix ,R
+ICm filenameR
 and
-\fICm suffix :\fR
+ICm suffix :R
 .in +4
 .ti -4
 .IR Cm prefix
 This is a constant filename path.
 It is not subject to
 modifications via the
-\fIfilegen\fR
+IfilegenR
 option.
 It is defined by the
 server, usually specified as a compile-time constant.
@@ -1337,11 +1337,11 @@ It may,
 however, be configurable for individual file generation sets
 via other commands.
 For example, the prefix used with
-\fIloopstats\fR
+IloopstatsR
 and
-\fIpeerstats\fR
+IpeerstatsR
 generation can be configured using the
-\fIstatsdir\fR
+IstatsdirR
 option explained above.
 .ti -4
 .IR Cm filename
@@ -1350,14 +1350,14 @@ above (no intervening
 .Ql / ) .
 This can be modified using
 the file argument to the
-\fIfilegen\fR
+IfilegenR
 statement.
 No
 .Pa ..
 elements are
 allowed in this component to prevent filenames referring to
 parts outside the filesystem hierarchy denoted by
-\fIprefix .\fR
+Iprefix .R
 .ti -4
 .IR Cm suffix
 This part is reflects individual elements of a file set.
@@ -1385,9 +1385,9 @@ server incarnations.
 The set member filename is built by appending a
 .Ql \&.
 to concatenated
-\fIprefix\fR
+IprefixR
 and
-\fIfilename\fR
+IfilenameR
 strings, and
 appending the decimal representation of the process ID of the
 .Xr ntpd 1ntpdmdoc
@@ -1411,8 +1411,8 @@ is a two digit month number.
 is a two digit day number.
 Thus, all information written at 10 December 1992 would end up
 in a file named
-\fIprefix\fR
-\fIfilename Ns .19921210 .\fR
+IprefixR
+Ifilename Ns .19921210 .R
 .ti -4
 .IR Cm week
 Any file set member contains data related to a certain week of
@@ -1590,18 +1590,18 @@ for packets that overflow the rate-contr
 [ "\fIflag\fR" ... ]
 .Xc
 The
-\fIaddress\fR
+IaddressR
 argument expressed in
 dotted-quad form is the address of a host or network.
 Alternatively, the
-\fIaddress\fR
+IaddressR
 argument can be a valid host DNS name.
 The
-\fImask\fR
+ImaskR
 argument expressed in dotted-quad form defaults to
 .Cm 255.255.255.255 ,
 meaning that the
-\fIaddress\fR
+IaddressR
 is treated as the address of an individual host.
 A default entry (address
 .Cm 0.0.0.0 ,
@@ -2185,10 +2185,10 @@ Reference clock addresses are of the for
 .Li 127.127. Ar t . Ar u ,
 .Sm on
 where
-\fIt\fR
+ItR
 is an integer
 denoting the clock type and
-\fIu\fR
+IuR
 indicates the unit
 number in the range 0-3.
 While it may seem overkill, it is in fact
@@ -2199,7 +2199,7 @@ The
 .Ic server
 command is used to configure a reference
 clock, where the
-\fIaddress\fR
+IaddressR
 argument in that command
 is the clock address.
 The
@@ -2241,7 +2241,7 @@ immediately after the
 .Ic server
 command.
 The
-\fIaddress\fR
+IaddressR
 argument specifies the clock address.
 The
 .Cm refid
@@ -2613,7 +2613,7 @@ facility or the alternate
 log file.
 By default, all output is turned on.
 All
-\fIconfigkeyword\fR
+IconfigkeywordR
 keywords can be prefixed with
 .Ql = ,
 .Ql +
@@ -2881,7 +2881,7 @@ Display usage information and exit.
 .BR \-\-more-help
 Pass the extended usage information through a pager.
 .TP
-.BR \-\-version "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -2976,7 +2976,7 @@ services when they become universally av
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP

==== ntpd/ntp.conf.5mdoc ====
2013-07-07 06:34:48+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.conf.5mdoc	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.conf.5mdoc	2013-07-07 06:34:48 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_CONF 5mdoc File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:45 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:13 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -2712,7 +2712,7 @@ The default is eight multiples of 32 sta
 Display usage information and exit.
 .It \-\-more\-help
 Pass the extended usage information through a pager.
-.It \-\-version "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -2804,7 +2804,7 @@ services when they become universally av
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP

==== ntpd/ntp.conf.html ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.43/ntpd/ntp.conf.html	2013-07-06 11:30:47 +00:00
+++ 1.44/ntpd/ntp.conf.html	2013-07-07 06:34:49 +00:00
@@ -33,7 +33,7 @@ Up: <a rel="up" accesskey="u" href=
 <p>This document describes the configuration file for the NTP Project's
 <code>ntpd</code> program.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntp.conf</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntp.conf</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntp_002econf-Description">ntp.conf Description</a>

==== ntpd/ntp.conf.man.in ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +36 -36
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.conf.man.in	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.conf.man.in	2013-07-07 06:34:49 +00:00
@@ -1,8 +1,8 @@
-.TH ntp.conf 5 "06 Jul 2013" "4.2.7p370" "File Formats"
+.TH ntp.conf 5 "07 Jul 2013" "4.2.7p371" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:26 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:26:05 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -189,7 +189,7 @@ equivalent classes for that address fami
 These five commands specify the time server name or address to
 be used and the mode in which to operate.
 The
-\fIaddress\fR
+IaddressR
 can be
 either a DNS name or an IP address in dotted-quad notation.
 Additional information on association behavior can be found in the
@@ -242,7 +242,7 @@ broadcast messages go only to the interf
 subnet specified, but multicast messages go to all interfaces.
 In broadcast mode the local server sends periodic broadcast
 messages to a client population at the
-\fIaddress\fR
+IaddressR
 specified, which is usually the broadcast address on (one of) the
 local network(s) or a multicast address assigned to NTP.
 The IANA
@@ -281,7 +281,7 @@ discovered as the result of broadcast/mu
 The
 client broadcasts a request message to the group address associated
 with the specified
-\fIaddress\fR
+IaddressR
 and specifically enabled
 servers respond to these messages.
 The client selects the servers
@@ -330,7 +330,7 @@ option.
 .BR Cm key Ar key
 All packets sent to and received from the server or peer are to
 include authentication fields encrypted using the specified
-\fIkey\fR
+IkeyR
 identifier with values from 1 to 65534, inclusive.
 The
 default is to include no encryption field.
@@ -371,10 +371,10 @@ for further information.
 This option is used only with broadcast server and manycast
 client modes.
 It specifies the time-to-live
-\fIttl\fR
+IttlR
 to
 use on broadcast server and multicast server and the maximum
-\fIttl\fR
+IttlR
 for the expanding ring search with manycast
 client packets.
 Selection of the proper value, which defaults to
@@ -857,7 +857,7 @@ Specifies the key identifier to use with
 utility, which uses the standard
 protocol defined in RFC-1305.
 The
-\fIkey\fR
+IkeyR
 argument is
 the key identifier for a trusted key, where the value can be in the
 range 1 to 65,534, inclusive.
@@ -975,7 +975,7 @@ utility program, which uses a
 proprietary protocol specific to this implementation of
 .Xr ntpd @NTPD_MS@ .
 The
-\fIkey\fR
+IkeyR
 argument is a key identifier
 for the trusted key, where the value can be in the range 1 to
 65,534, inclusive.
@@ -1005,7 +1005,7 @@ and remote servers share the same key an
 purpose, although different keys can be used with different
 servers.
 The
-\fIkey\fR
+IkeyR
 arguments are 32-bit unsigned
 integers with values from 1 to 65,534.
 .SS Error Codes
@@ -1097,7 +1097,7 @@ automatically summarized and archived fo
 .BR Ic statistics Ar name ...
 Enables writing of statistics records.
 Currently, four kinds of
-\fIname\fR
+InameR
 statistics are supported.
 .in +4
 .ti -4
@@ -1319,17 +1319,17 @@ command.
 This is the file name for the statistics records.
 Filenames of set
 members are built from three concatenated elements
-\fICm prefix ,\fR
-\fICm filename\fR
+ICm prefix ,R
+ICm filenameR
 and
-\fICm suffix :\fR
+ICm suffix :R
 .in +4
 .ti -4
 .IR Cm prefix
 This is a constant filename path.
 It is not subject to
 modifications via the
-\fIfilegen\fR
+IfilegenR
 option.
 It is defined by the
 server, usually specified as a compile-time constant.
@@ -1337,11 +1337,11 @@ It may,
 however, be configurable for individual file generation sets
 via other commands.
 For example, the prefix used with
-\fIloopstats\fR
+IloopstatsR
 and
-\fIpeerstats\fR
+IpeerstatsR
 generation can be configured using the
-\fIstatsdir\fR
+IstatsdirR
 option explained above.
 .ti -4
 .IR Cm filename
@@ -1350,14 +1350,14 @@ above (no intervening
 .Ql / ) .
 This can be modified using
 the file argument to the
-\fIfilegen\fR
+IfilegenR
 statement.
 No
 .Pa ..
 elements are
 allowed in this component to prevent filenames referring to
 parts outside the filesystem hierarchy denoted by
-\fIprefix .\fR
+Iprefix .R
 .ti -4
 .IR Cm suffix
 This part is reflects individual elements of a file set.
@@ -1385,9 +1385,9 @@ server incarnations.
 The set member filename is built by appending a
 .Ql \&.
 to concatenated
-\fIprefix\fR
+IprefixR
 and
-\fIfilename\fR
+IfilenameR
 strings, and
 appending the decimal representation of the process ID of the
 .Xr ntpd @NTPD_MS@
@@ -1411,8 +1411,8 @@ is a two digit month number.
 is a two digit day number.
 Thus, all information written at 10 December 1992 would end up
 in a file named
-\fIprefix\fR
-\fIfilename Ns .19921210 .\fR
+IprefixR
+Ifilename Ns .19921210 .R
 .ti -4
 .IR Cm week
 Any file set member contains data related to a certain week of
@@ -1590,18 +1590,18 @@ for packets that overflow the rate-contr
 [ "\fIflag\fR" ... ]
 .Xc
 The
-\fIaddress\fR
+IaddressR
 argument expressed in
 dotted-quad form is the address of a host or network.
 Alternatively, the
-\fIaddress\fR
+IaddressR
 argument can be a valid host DNS name.
 The
-\fImask\fR
+ImaskR
 argument expressed in dotted-quad form defaults to
 .Cm 255.255.255.255 ,
 meaning that the
-\fIaddress\fR
+IaddressR
 is treated as the address of an individual host.
 A default entry (address
 .Cm 0.0.0.0 ,
@@ -2185,10 +2185,10 @@ Reference clock addresses are of the for
 .Li 127.127. Ar t . Ar u ,
 .Sm on
 where
-\fIt\fR
+ItR
 is an integer
 denoting the clock type and
-\fIu\fR
+IuR
 indicates the unit
 number in the range 0-3.
 While it may seem overkill, it is in fact
@@ -2199,7 +2199,7 @@ The
 .Ic server
 command is used to configure a reference
 clock, where the
-\fIaddress\fR
+IaddressR
 argument in that command
 is the clock address.
 The
@@ -2241,7 +2241,7 @@ immediately after the
 .Ic server
 command.
 The
-\fIaddress\fR
+IaddressR
 argument specifies the clock address.
 The
 .Cm refid
@@ -2613,7 +2613,7 @@ facility or the alternate
 log file.
 By default, all output is turned on.
 All
-\fIconfigkeyword\fR
+IconfigkeywordR
 keywords can be prefixed with
 .Ql = ,
 .Ql +
@@ -2881,7 +2881,7 @@ Display usage information and exit.
 .BR \-\-more-help
 Pass the extended usage information through a pager.
 .TP
-.BR \-\-version "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -2976,7 +2976,7 @@ services when they become universally av
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp.conf\fP

==== ntpd/ntp.conf.mdoc.in ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.conf.mdoc.in	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.conf.mdoc.in	2013-07-07 06:34:49 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_CONF 5 File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:45 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:13 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -2712,7 +2712,7 @@ The default is eight multiples of 32 sta
 Display usage information and exit.
 .It \-\-more\-help
 Pass the extended usage information through a pager.
-.It \-\-version "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -2804,7 +2804,7 @@ services when they become universally av
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP

==== ntpd/ntp.keys.5man ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +10 -10
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.keys.5man	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.keys.5man	2013-07-07 06:34:49 +00:00
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "06 Jul 2013" "4.2.7p370" "File Formats"
+.TH ntp.keys 5man "07 Jul 2013" "4.2.7p371" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:31 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:26:11 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .\"
@@ -39,22 +39,22 @@ Key entries use a fixed format of the fo
 .D1 Ar keyno type key
 .PP
 where
-\fIkeyno\fR
+IkeynoR
 is a positive integer (between 1 and 65534),
-\fItype\fR
+ItypeR
 is the message digest algorithm,
 and
-\fIkey\fR
+IkeyR
 is the key itself.
 .PP
 The
-\fIkey\fR
+IkeyR
 may be given in a format
 controlled by the
-\fItype\fR
+ItypeR
 field.
 The
-\fItype\fR
+ItypeR
 .Li MD5
 is always supported.
 If
@@ -62,7 +62,7 @@ If
 was built with the OpenSSL library
 then any digest library supported by that library may be specified.
 However, if compliance with FIPS 140-2 is required the
-\fItype\fR
+ItypeR
 must be either
 .Li SHA
 or
@@ -133,7 +133,7 @@ This program is released under the terms
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp.keys\fP

==== ntpd/ntp.keys.5mdoc ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.keys.5mdoc	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.keys.5mdoc	2013-07-07 06:34:49 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_KEYS 5mdoc File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:48 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:16 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-file.tpl
 .Sh NAME
@@ -100,7 +100,7 @@ so it is generally appropriate to specif
 Display usage information and exit.
 .It \-\-more\-help
 Pass the extended usage information through a pager.
-.It \-\-version "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -163,7 +163,7 @@ This program is released under the terms
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp.keys\fP

==== ntpd/ntp.keys.html ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.44/ntpd/ntp.keys.html	2013-07-06 11:30:47 +00:00
+++ 1.45/ntpd/ntp.keys.html	2013-07-07 06:34:49 +00:00
@@ -33,7 +33,7 @@ Up: <a rel="up" accesskey="u" href=
 <p>This document describes the symmetric key file for the NTP Project's
 <code>ntpd</code> program.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntp.keys</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntp.keys</code>.
 
   <div class="shortcontents">
 <h2>Short Contents</h2>

==== ntpd/ntp.keys.man.in ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +10 -10
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.keys.man.in	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.keys.man.in	2013-07-07 06:34:49 +00:00
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "06 Jul 2013" "4.2.7p370" "File Formats"
+.TH ntp.keys 5 "07 Jul 2013" "4.2.7p371" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:31 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:26:11 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-file.tpl
 .\"
@@ -39,22 +39,22 @@ Key entries use a fixed format of the fo
 .D1 Ar keyno type key
 .PP
 where
-\fIkeyno\fR
+IkeynoR
 is a positive integer (between 1 and 65534),
-\fItype\fR
+ItypeR
 is the message digest algorithm,
 and
-\fIkey\fR
+IkeyR
 is the key itself.
 .PP
 The
-\fIkey\fR
+IkeyR
 may be given in a format
 controlled by the
-\fItype\fR
+ItypeR
 field.
 The
-\fItype\fR
+ItypeR
 .Li MD5
 is always supported.
 If
@@ -62,7 +62,7 @@ If
 was built with the OpenSSL library
 then any digest library supported by that library may be specified.
 However, if compliance with FIPS 140-2 is required the
-\fItype\fR
+ItypeR
 must be either
 .Li SHA
 or
@@ -133,7 +133,7 @@ This program is released under the terms
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp.keys\fP

==== ntpd/ntp.keys.mdoc.in ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.79/ntpd/ntp.keys.mdoc.in	2013-07-06 11:30:47 +00:00
+++ 1.80/ntpd/ntp.keys.mdoc.in	2013-07-07 06:34:49 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_KEYS 5 File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:48 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:16 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-file.tpl
 .Sh NAME
@@ -100,7 +100,7 @@ so it is generally appropriate to specif
 Display usage information and exit.
 .It \-\-more\-help
 Pass the extended usage information through a pager.
-.It \-\-version "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -163,7 +163,7 @@ This program is released under the terms
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 This document was derived from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp.keys\fP

==== ntpd/ntpd-opts.c ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +104 -99
  NTP_4_2_7P371

--- 1.379/ntpd/ntpd-opts.c	2013-07-06 11:30:48 +00:00
+++ 1.380/ntpd/ntpd-opts.c	2013-07-07 06:34:49 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:27:06 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:23:51 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -75,7 +75,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpd options
  */
 static char const ntpd_opt_strs[2986] =
-/*     0 */ "ntpd 4.2.7p370\n"
+/*     0 */ "ntpd 4.2.7p371\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -201,12 +201,12 @@ static char const ntpd_opt_strs[2986] =
 /*  2753 */ "output version information and exit\0"
 /*  2789 */ "version\0"
 /*  2797 */ "NTPD\0"
-/*  2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p370\n"
+/*  2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p371\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ <server1> ... <serverN> ]\n\0"
 /*  2935 */ "http://bugs.ntp.org, bugs at ntp.org\0"
 /*  2969 */ "\n\0"
-/*  2971 */ "ntpd 4.2.7p370";
+/*  2971 */ "ntpd 4.2.7p371";
 
 /**
  *  ipv4 option description with
@@ -749,8 +749,8 @@ static int const aWait_SyncCantList[] = 
 #define MORE_HELP_name  (ntpd_opt_strs+2743)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
-#define MORE_HELP_DESC  NULL
-#define MORE_HELP_name  NULL
+#define MORE_HELP_DESC  HELP_DESC
+#define MORE_HELP_name  HELP_name
 #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
 #endif
 #ifdef NO_OPTIONAL_OPT_ARGS
@@ -764,6 +764,8 @@ static int const aWait_SyncCantList[] = 
 /**
  *  Declare option callback procedures
  */
+/* extracted from optmain.tlib near line 745 */
+
 #if defined(TEST_NTPD_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -795,7 +797,7 @@ static tOptProc
  */
 #define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
-#endif /* defined(TEST_NTPD_OPTS) */
+#endif /* TEST_NTPD_OPTS */
 #define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -1270,7 +1272,7 @@ static tOptDesc optDesc[OPTION_CT] = {
 #define zDetail         (NULL)
 /** The full version string for ntpd. */
 #define zFullVersion    (ntpd_opt_strs+2971)
-/* extracted from optcode.tlib near line 371 */
+/* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -1291,17 +1293,19 @@ static tOptDesc optDesc[OPTION_CT] = {
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] opts the AutoOpts option description structure
+ * @param[in] od   the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+doUsageOpt(tOptions * opts, tOptDesc * od)
 {
-    optionUsage(&ntpdOptions, NTPD_EXIT_SUCCESS);
+    int ex_code;
+    ex_code = NTPD_EXIT_SUCCESS;
+    optionUsage(&ntpdOptions, ex_code);
     /* NOTREACHED */
-    (void)pOptDesc;
-    (void)pOptions;
+    (void)opts;
+    (void)od;
 }
 
 #if ! defined(TEST_NTPD_OPTS)
@@ -1330,7 +1334,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++;
 #endif /* defined(TEST_NTPD_OPTS) */
 /* extracted from optmain.tlib near line 46 */
 
-#if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */
+#if defined(TEST_NTPD_OPTS) /* TEST-MAIN-PROCEDURE: */
 
 extern void optionPutShell(tOptions*);
 
@@ -1353,8 +1357,8 @@ main(int argc, char ** argv)
         fputs("output error writing to stdout\n", stderr);
     return res;
 }
-#endif  /* defined TEST_NTPD_OPTS */
-/* extracted from optmain.tlib near line 1254 */
+#endif  /* TEST_NTPD_OPTS END-TEST-MAIN-PROCEDURE */
+/* extracted from optmain.tlib near line 1266 */
 
 /**
  * The directory containing the data associated with ntpd.
@@ -1399,7 +1403,8 @@ tOptions ntpdOptions = {
     + OPTPROC_LONGOPT
     + OPTPROC_NO_REQ_OPT
     + OPTPROC_ENVIRON
-    + OPTPROC_MISUSE ),
+    + OPTPROC_MISUSE
+    + OPTPROC_SHELL_OUTPUT ),
     0, NULL,                    /* current option index, current option */
     NULL,         NULL,         zPROGNAME,
     zRcName,      zCopyright,   zLicenseDescrip,
@@ -1552,7 +1557,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdOptions.pzCopyright */
-  puts(_("ntpd 4.2.7p370\n\
+  puts(_("ntpd 4.2.7p371\n\
 Copyright (C) 1970-2013 The University of Delaware, 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\
@@ -1689,7 +1694,7 @@ provided \"as is\" without express or im
   puts(_("output version information and exit"));
 
   /* referenced via ntpdOptions.pzUsageTitle */
-  puts(_("ntpd - NTP daemon program - Ver. 4.2.7p370\n\
+  puts(_("ntpd - NTP daemon program - Ver. 4.2.7p371\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ <server1> ... <serverN> ]\n"));
 
@@ -1697,7 +1702,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("\n"));
 
   /* referenced via ntpdOptions.pzFullVersion */
-  puts(_("ntpd 4.2.7p370"));
+  puts(_("ntpd 4.2.7p371"));
 
   /* referenced via ntpdOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -1705,39 +1710,39 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   /* referenced via ntpdOptions.pzShortUsage */
   puts(_("<<<NOT-FOUND>>>"));
   /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
+#line 45 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
+#line 71 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
+#line 90 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
+#line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
+#line 58 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
+#line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
+#line 82 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
+#line 292 "../usage.c"
   puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
+#line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
+#line 747 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
@@ -1747,9 +1752,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
+#line 89 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
+#line 301 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -1776,19 +1781,19 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: illegal option -- %s\n"));
 #line 332 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
+#line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
+#line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
+#line 746 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
+#line 1080 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
 #line 518 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
+#line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
@@ -1797,9 +1802,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
+#line 535 "../save.c"
   puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  '%s' does not match any %s keywords.\n"));
 #line 93 "../reset.c"
   puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -1809,7 +1814,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("error %d (%s) stat-ing %s\n"));
 #line 143 "../restore.c"
   puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
+#line 231 "../autoopts.c"
   puts(_("'%s' is not a command line option.\n"));
 #line 114 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
@@ -1821,41 +1826,41 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
+#line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
+#line 329 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("standard output"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard output"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard output"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard error"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard error"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("write"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("write"));
-#line 303 "../usage.c"
+#line 273 "../usage.c"
   puts(_("write"));
-#line 450 "../usage.c"
+#line 413 "../usage.c"
   puts(_("write"));
-#line 659 "../usage.c"
+#line 623 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1871,70 +1876,70 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
 #line 256 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
+#line 534 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 908 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
+#line 1147 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
+#line 923 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
+#line 836 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
+#line 1116 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
+#line 1114 "../usage.c"
   puts(_("This option has been disabled"));
-#line 899 "../usage.c"
+#line 863 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1221 "../usage.c"
+#line 1193 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
+#line 379 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
+#line 916 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
        "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
+#line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
+#line 896 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
+#line 917 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
+#line 381 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
+#line 890 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
+#line 1308 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
+#line 1244 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
+#line 1302 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
+#line 1303 "../usage.c"
   puts(_(" %3s %s"));
-#line 1337 "../usage.c"
+#line 1309 "../usage.c"
   puts(_(" %3s %s"));
-#line 423 "../usage.c"
+#line 386 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
+#line 382 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
+#line 970 "../usage.c"
   puts(_(" - reading file %s"));
-#line 445 "../usage.c"
+#line 408 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1943,17 +1948,17 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
+#line 902 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
+#line 943 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
+#line 1191 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
+#line 681 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
+#line 676 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1971,28 +1976,28 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
+#line 389 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
+#line 651 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
+#line 654 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
+#line 1320 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
+#line 1314 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
+#line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 945 "../usage.c"
+#line 909 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
+#line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
+#line 1151 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
+#line 772 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }

==== ntpd/ntpd-opts.h ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +13 -15
  NTP_4_2_7P371

--- 1.379/ntpd/ntpd-opts.h	2013-07-06 11:30:48 +00:00
+++ 1.380/ntpd/ntpd-opts.h	2013-07-07 06:34:49 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:27:05 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:23:49 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 159744
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -105,9 +105,9 @@ typedef enum {
 /** count of all options for ntpd */
 #define OPTION_CT    37
 /** ntpd version */
-#define NTPD_VERSION       "4.2.7p370"
+#define NTPD_VERSION       "4.2.7p371"
 /** Full ntpd version text */
-#define NTPD_FULL_VERSION  "ntpd 4.2.7p370"
+#define NTPD_FULL_VERSION  "ntpd 4.2.7p371"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -117,7 +117,7 @@ typedef enum {
 #define         DESC(n) (ntpdOptions.pOptDesc[INDEX_OPT_## n])
 /** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
+/** The string argument to an option. The argument type must be \"string\". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
 /** Mask the option state revealing how an option was specified.
  *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -144,17 +144,16 @@ typedef enum {
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Enumeration of ntpd exit codes
  */
 typedef enum {
-    NTPD_EXIT_SUCCESS               = 0,
-    NTPD_EXIT_FAILURE               = 1,
-    NTPD_EXIT_USAGE_ERROR           = 64,
-    NTPD_EXIT_LIBOPTS_FAILURE       = 70
-} ntpd_exit_code_t;
+    NTPD_EXIT_SUCCESS         = 0,
+    NTPD_EXIT_FAILURE         = 1,
+    NTPD_EXIT_USAGE_ERROR     = 64,
+    NTPD_EXIT_LIBOPTS_FAILURE = 70
+}   ntpd_exit_code_t;
 /** @} */
 /**
  *  Make sure there are no #define name conflicts with the option names
@@ -333,7 +332,6 @@ typedef enum {
 # undef MDNS
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Interface defines for specific options.
  * @{
@@ -394,10 +392,9 @@ typedef enum {
 #define ERRSTOP_OPTERR  STMTS(ntpdOptions.fOptSet |= OPTPROC_ERRSTOP)
 #define RESTART_OPT(n)  STMTS( \
                 ntpdOptions.curOptIdx = (n); \
-                ntpdOptions.pzCurOpt  = NULL)
+                ntpdOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdOptions.pUsageProc)(&ntpdOptions, c)
-/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -452,4 +449,5 @@ static inline char* aoGetsText(char cons
 }
 #endif
 #endif /* AUTOOPTS_NTPD_OPTS_H_GUARD */
+
 /* ntpd-opts.h ends here */

==== ntpd/ntpd.1ntpdman ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.190/ntpd/ntpd.1ntpdman	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpd/ntpd.1ntpdman	2013-07-07 06:34:49 +00:00
@@ -1,8 +1,8 @@
-.TH ntpd 1ntpdman "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpd 1ntpdman "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:35 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:26:14 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -395,7 +395,7 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -928,7 +928,7 @@ mind.
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP

==== ntpd/ntpd.1ntpdmdoc ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.190/ntpd/ntpd.1ntpdmdoc	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpd/ntpd.1ntpdmdoc	2013-07-07 06:34:49 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPD 1ntpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:50 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:18 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -363,7 +363,7 @@ the server to be discovered via mDNS cli
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -895,7 +895,7 @@ mind.
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP

==== ntpd/ntpd.html ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_7P371

--- 1.38/ntpd/ntpd.html	2013-07-06 11:30:48 +00:00
+++ 1.39/ntpd/ntpd.html	2013-07-07 06:34:49 +00:00
@@ -39,7 +39,7 @@ The program can operate in any of severa
 symmetric and broadcast modes, and with both symmetric-key and public-key
 cryptography.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntpd</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntpd</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpd-Description">ntpd Description</a>:             Description
@@ -219,7 +219,7 @@ the usage text by passing it through a p
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpd - NTP daemon program - Ver. 4.2.7p369
+<pre class="example">ntpd - NTP daemon program - Ver. 4.2.7p370
 Usage:  ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description

==== ntpd/ntpd.man.in ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.190/ntpd/ntpd.man.in	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpd/ntpd.man.in	2013-07-07 06:34:49 +00:00
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpd @NTPD_MS@ "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:35 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:26:14 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -395,7 +395,7 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -928,7 +928,7 @@ mind.
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpd\fP

==== ntpd/ntpd.mdoc.in ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.190/ntpd/ntpd.mdoc.in	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpd/ntpd.mdoc.in	2013-07-07 06:34:49 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:28:50 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:18 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -363,7 +363,7 @@ the server to be discovered via mDNS cli
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -895,7 +895,7 @@ mind.
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP

==== ntpdc/invoke-ntpdc.texi ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +4 -3
  NTP_4_2_7P371

--- 1.358/ntpdc/invoke-ntpdc.texi	2013-07-06 11:30:48 +00:00
+++ 1.359/ntpdc/invoke-ntpdc.texi	2013-07-07 06:34:49 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:29:10 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:32:47 AM by AutoGen 5.17.5pre10
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -69,7 +69,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p370
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p371
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -113,6 +113,8 @@ The following option preset mechanisms a
  - examining environment variables named NTPDC_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs@@ntp.org>
+
+exit 0
 @end example
 @exampleindent 4
 
@@ -262,7 +264,6 @@ are expanded and replaced when @file{ntp
 For any of these that are plain files, they are simply processed.
 For any that are directories, then a file named @file{.ntprc} is searched for
 within that directory and processed.
-
 
 Configuration files may be in a wide variety of formats.
 The basic format is an option name followed by a value (argument) on the

==== ntpdc/ntpdc-opts.c ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +104 -99
  NTP_4_2_7P371

--- 1.373/ntpdc/ntpdc-opts.c	2013-07-06 11:30:48 +00:00
+++ 1.374/ntpdc/ntpdc-opts.c	2013-07-07 06:34:49 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:01 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:32:30 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpdc options
  */
 static char const ntpdc_opt_strs[1861] =
-/*     0 */ "ntpdc 4.2.7p370\n"
+/*     0 */ "ntpdc 4.2.7p371\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -127,14 +127,14 @@ static char const ntpdc_opt_strs[1861] =
 /*  1640 */ "no-load-opts\0"
 /*  1653 */ "no\0"
 /*  1656 */ "NTPDC\0"
-/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p370\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p371\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1794 */ "$HOME\0"
 /*  1800 */ ".\0"
 /*  1802 */ ".ntprc\0"
 /*  1809 */ "http://bugs.ntp.org, bugs at ntp.org\0"
 /*  1843 */ "\n\0"
-/*  1845 */ "ntpdc 4.2.7p370";
+/*  1845 */ "ntpdc 4.2.7p371";
 
 /**
  *  ipv4 option description with
@@ -295,8 +295,8 @@ static int const aShowpeersCantList[] = 
 #define MORE_HELP_name  (ntpdc_opt_strs+1495)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
-#define MORE_HELP_DESC  NULL
-#define MORE_HELP_name  NULL
+#define MORE_HELP_DESC  HELP_DESC
+#define MORE_HELP_name  HELP_name
 #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
 #endif
 #ifdef NO_OPTIONAL_OPT_ARGS
@@ -317,6 +317,8 @@ static int const aShowpeersCantList[] = 
 /**
  *  Declare option callback procedures
  */
+/* extracted from optmain.tlib near line 745 */
+
 #if defined(TEST_NTPDC_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -348,7 +350,7 @@ static tOptProc
  */
 #define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
-#endif /* defined(TEST_NTPDC_OPTS) */
+#endif /* TEST_NTPDC_OPTS */
 #define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -564,7 +566,7 @@ static char const * const apzHomeList[3]
 #define zDetail         (NULL)
 /** The full version string for ntpdc. */
 #define zFullVersion    (ntpdc_opt_strs+1845)
-/* extracted from optcode.tlib near line 371 */
+/* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -585,17 +587,19 @@ static char const * const apzHomeList[3]
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] opts the AutoOpts option description structure
+ * @param[in] od   the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+doUsageOpt(tOptions * opts, tOptDesc * od)
 {
-    optionUsage(&ntpdcOptions, NTPDC_EXIT_SUCCESS);
+    int ex_code;
+    ex_code = NTPDC_EXIT_SUCCESS;
+    optionUsage(&ntpdcOptions, ex_code);
     /* NOTREACHED */
-    (void)pOptDesc;
-    (void)pOptions;
+    (void)opts;
+    (void)od;
 }
 
 #if ! defined(TEST_NTPDC_OPTS)
@@ -624,7 +628,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++;
 #endif /* defined(TEST_NTPDC_OPTS) */
 /* extracted from optmain.tlib near line 46 */
 
-#if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */
+#if defined(TEST_NTPDC_OPTS) /* TEST-MAIN-PROCEDURE: */
 
 extern void optionPutShell(tOptions*);
 
@@ -647,8 +651,8 @@ main(int argc, char ** argv)
         fputs("output error writing to stdout\n", stderr);
     return res;
 }
-#endif  /* defined TEST_NTPDC_OPTS */
-/* extracted from optmain.tlib near line 1254 */
+#endif  /* TEST_NTPDC_OPTS END-TEST-MAIN-PROCEDURE */
+/* extracted from optmain.tlib near line 1266 */
 
 /**
  * The directory containing the data associated with ntpdc.
@@ -693,7 +697,8 @@ tOptions ntpdcOptions = {
     + OPTPROC_LONGOPT
     + OPTPROC_NO_REQ_OPT
     + OPTPROC_ENVIRON
-    + OPTPROC_MISUSE ),
+    + OPTPROC_MISUSE
+    + OPTPROC_SHELL_OUTPUT ),
     0, NULL,                    /* current option index, current option */
     NULL,         NULL,         zPROGNAME,
     zRcName,      zCopyright,   zLicenseDescrip,
@@ -846,7 +851,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpdcOptions.pzCopyright */
-  puts(_("ntpdc 4.2.7p370\n\
+  puts(_("ntpdc 4.2.7p371\n\
 Copyright (C) 1970-2013 The University of Delaware, 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\
@@ -911,14 +916,14 @@ provided \"as is\" without express or im
   puts(_("load options from a config file"));
 
   /* referenced via ntpdcOptions.pzUsageTitle */
-  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p370\n\
+  puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p371\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
 
   /* referenced via ntpdcOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpdcOptions.pzFullVersion */
-  puts(_("ntpdc 4.2.7p370"));
+  puts(_("ntpdc 4.2.7p371"));
 
   /* referenced via ntpdcOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -926,39 +931,39 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   /* referenced via ntpdcOptions.pzShortUsage */
   puts(_("<<<NOT-FOUND>>>"));
   /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
+#line 45 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
+#line 71 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
+#line 90 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
+#line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
+#line 58 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
+#line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
+#line 82 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
+#line 292 "../usage.c"
   puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
+#line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
+#line 747 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
@@ -968,9 +973,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
+#line 89 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
+#line 301 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -997,19 +1002,19 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: illegal option -- %s\n"));
 #line 332 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
+#line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
+#line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
+#line 746 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
+#line 1080 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
 #line 518 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
+#line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
@@ -1018,9 +1023,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
+#line 535 "../save.c"
   puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  '%s' does not match any %s keywords.\n"));
 #line 93 "../reset.c"
   puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -1030,7 +1035,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("error %d (%s) stat-ing %s\n"));
 #line 143 "../restore.c"
   puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
+#line 231 "../autoopts.c"
   puts(_("'%s' is not a command line option.\n"));
 #line 114 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
@@ -1042,41 +1047,41 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
+#line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
+#line 329 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("standard output"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard output"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard output"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard error"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard error"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("write"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("write"));
-#line 303 "../usage.c"
+#line 273 "../usage.c"
   puts(_("write"));
-#line 450 "../usage.c"
+#line 413 "../usage.c"
   puts(_("write"));
-#line 659 "../usage.c"
+#line 623 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1092,70 +1097,70 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
 #line 256 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
+#line 534 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 908 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
+#line 1147 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
+#line 923 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
+#line 836 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
+#line 1116 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
+#line 1114 "../usage.c"
   puts(_("This option has been disabled"));
-#line 899 "../usage.c"
+#line 863 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1221 "../usage.c"
+#line 1193 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
+#line 379 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
+#line 916 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
        "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
+#line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
+#line 896 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
+#line 917 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
+#line 381 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
+#line 890 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
+#line 1308 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
+#line 1244 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
+#line 1302 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
+#line 1303 "../usage.c"
   puts(_(" %3s %s"));
-#line 1337 "../usage.c"
+#line 1309 "../usage.c"
   puts(_(" %3s %s"));
-#line 423 "../usage.c"
+#line 386 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
+#line 382 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
+#line 970 "../usage.c"
   puts(_(" - reading file %s"));
-#line 445 "../usage.c"
+#line 408 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1164,17 +1169,17 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
+#line 902 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
+#line 943 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
+#line 1191 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
+#line 681 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
+#line 676 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1192,28 +1197,28 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
+#line 389 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
+#line 651 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
+#line 654 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
+#line 1320 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
+#line 1314 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
+#line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 945 "../usage.c"
+#line 909 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
+#line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
+#line 1151 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
+#line 772 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }

==== ntpdc/ntpdc-opts.h ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +14 -16
  NTP_4_2_7P371

--- 1.373/ntpdc/ntpdc-opts.h	2013-07-06 11:30:48 +00:00
+++ 1.374/ntpdc/ntpdc-opts.h	2013-07-07 06:34:49 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:00 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:32:30 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 159744
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -83,9 +83,9 @@ typedef enum {
 /** count of all options for ntpdc */
 #define OPTION_CT    15
 /** ntpdc version */
-#define NTPDC_VERSION       "4.2.7p370"
+#define NTPDC_VERSION       "4.2.7p371"
 /** Full ntpdc version text */
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p370"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p371"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -95,7 +95,7 @@ typedef enum {
 #define         DESC(n) (ntpdcOptions.pOptDesc[INDEX_OPT_## n])
 /** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
+/** The string argument to an option. The argument type must be \"string\". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
 /** Mask the option state revealing how an option was specified.
  *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -122,18 +122,17 @@ typedef enum {
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Enumeration of ntpdc exit codes
  */
 typedef enum {
-    NTPDC_EXIT_SUCCESS              = 0,
-    NTPDC_EXIT_FAILURE              = 1,
-    NTPDC_EXIT_USAGE_ERROR          = 64,
-    NTPDC_EXIT_NO_CONFIG_INPUT      = 66,
-    NTPDC_EXIT_LIBOPTS_FAILURE      = 70
-} ntpdc_exit_code_t;
+    NTPDC_EXIT_SUCCESS         = 0,
+    NTPDC_EXIT_FAILURE         = 1,
+    NTPDC_EXIT_USAGE_ERROR     = 64,
+    NTPDC_EXIT_NO_CONFIG_INPUT = 66,
+    NTPDC_EXIT_LIBOPTS_FAILURE = 70
+}   ntpdc_exit_code_t;
 /** @} */
 /**
  *  Make sure there are no #define name conflicts with the option names
@@ -192,7 +191,6 @@ typedef enum {
 # undef SHOWPEERS
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Interface defines for specific options.
  * @{
@@ -230,10 +228,9 @@ typedef enum {
 #define ERRSTOP_OPTERR  STMTS(ntpdcOptions.fOptSet |= OPTPROC_ERRSTOP)
 #define RESTART_OPT(n)  STMTS( \
                 ntpdcOptions.curOptIdx = (n); \
-                ntpdcOptions.pzCurOpt  = NULL)
+                ntpdcOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpdcOptions.pUsageProc)(&ntpdcOptions, c)
-/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -288,4 +285,5 @@ static inline char* aoGetsText(char cons
 }
 #endif
 #endif /* AUTOOPTS_NTPDC_OPTS_H_GUARD */
+
 /* ntpdc-opts.h ends here */

==== ntpdc/ntpdc.1ntpdcman ====
2013-07-07 06:34:49+00:00, stenn at deacon.udel.edu +14 -13
  NTP_4_2_7P371

--- 1.189/ntpdc/ntpdc.1ntpdcman	2013-07-06 11:30:48 +00:00
+++ 1.190/ntpdc/ntpdc.1ntpdcman	2013-07-07 06:34:49 +00:00
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpdc 1ntpdcman "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:06 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:42 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -112,17 +112,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -615,14 +616,14 @@ association with the same peer may be de
 executed, or may simply be converted to conform to the new
 configuration, as appropriate.
 If the optional
-\fIkeyid\fR
+IkeyidR
 is a
 nonzero integer, all outgoing packets to the remote server will
 have an authentication field attached encrypted with this key.
 If
 the value is 0 (or not given) no authentication will be done.
 The
-\fIversion\fR
+IversionR
 can be 1, 2 or 3 and defaults to 3.
 The
 .Cm prefer
@@ -651,7 +652,7 @@ mode is broadcast.
 In this case a valid key identifier and key are
 required.
 The
-\fIpeer_address\fR
+Ipeer_addressR
 parameter can be the broadcast
 address of the local network or a multicast group address assigned
 to NTP.
@@ -757,7 +758,7 @@ The default for this flag is disable.
 .in -4
 .TP
 .BR Xo Ic restrict Ar address Ar mask
-\fIflag Oo Ar ... Oc\fR
+Iflag Oo Ar ... OcR
 .Xc
 This command operates in the same way as the
 .Ic restrict
@@ -765,7 +766,7 @@ configuration file commands of
 .Xr ntpd 1ntpdmdoc .
 .TP
 .BR Xo Ic unrestrict Ar address Ar mask
-\fIflag Oo Ar ... Oc\fR
+Iflag Oo Ar ... OcR
 .Xc
 Unrestrict the matching entry from the restrict list.
 .TP

==== ntpdc/ntpdc.1ntpdcmdoc ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +9 -8
  NTP_4_2_7P371

--- 1.189/ntpdc/ntpdc.1ntpdcmdoc	2013-07-06 11:30:48 +00:00
+++ 1.190/ntpdc/ntpdc.1ntpdcmdoc	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:12 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:49 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -104,15 +104,16 @@ of their state. This is equivalent to th
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.

==== ntpdc/ntpdc.html ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +4 -2
  NTP_4_2_7P371

--- 1.202/ntpdc/ntpdc.html	2013-07-06 11:30:48 +00:00
+++ 1.203/ntpdc/ntpdc.html	2013-07-07 06:34:50 +00:00
@@ -36,7 +36,7 @@ display the time offset of the system cl
 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.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntpdc</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntpdc</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -145,7 +145,7 @@ the usage text by passing it through a p
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p370
+<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p371
 Usage:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -189,6 +189,8 @@ The following option preset mechanisms a
  - examining environment variables named NTPDC_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs at ntp.org>
+
+exit 0
 </pre>
   <div class="node">
 <p><hr>

==== ntpdc/ntpdc.man.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +14 -13
  NTP_4_2_7P371

--- 1.189/ntpdc/ntpdc.man.in	2013-07-06 11:30:48 +00:00
+++ 1.190/ntpdc/ntpdc.man.in	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpdc @NTPDC_MS@ "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:06 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:42 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -112,17 +112,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -615,14 +616,14 @@ association with the same peer may be de
 executed, or may simply be converted to conform to the new
 configuration, as appropriate.
 If the optional
-\fIkeyid\fR
+IkeyidR
 is a
 nonzero integer, all outgoing packets to the remote server will
 have an authentication field attached encrypted with this key.
 If
 the value is 0 (or not given) no authentication will be done.
 The
-\fIversion\fR
+IversionR
 can be 1, 2 or 3 and defaults to 3.
 The
 .Cm prefer
@@ -651,7 +652,7 @@ mode is broadcast.
 In this case a valid key identifier and key are
 required.
 The
-\fIpeer_address\fR
+Ipeer_addressR
 parameter can be the broadcast
 address of the local network or a multicast group address assigned
 to NTP.
@@ -757,7 +758,7 @@ The default for this flag is disable.
 .in -4
 .TP
 .BR Xo Ic restrict Ar address Ar mask
-\fIflag Oo Ar ... Oc\fR
+Iflag Oo Ar ... OcR
 .Xc
 This command operates in the same way as the
 .Ic restrict
@@ -765,7 +766,7 @@ configuration file commands of
 .Xr ntpd @NTPD_MS@ .
 .TP
 .BR Xo Ic unrestrict Ar address Ar mask
-\fIflag Oo Ar ... Oc\fR
+Iflag Oo Ar ... OcR
 .Xc
 Unrestrict the matching entry from the restrict list.
 .TP

==== ntpdc/ntpdc.mdoc.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +9 -8
  NTP_4_2_7P371

--- 1.189/ntpdc/ntpdc.mdoc.in	2013-07-06 11:30:48 +00:00
+++ 1.190/ntpdc/ntpdc.mdoc.in	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:12 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:32:49 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -104,15 +104,16 @@ of their state. This is equivalent to th
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.

==== ntpq/invoke-ntpq.texi ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +4 -3
  NTP_4_2_7P371

--- 1.362/ntpq/invoke-ntpq.texi	2013-07-06 11:30:48 +00:00
+++ 1.363/ntpq/invoke-ntpq.texi	2013-07-07 06:34:50 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:29:25 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:33:18 AM by AutoGen 5.17.5pre10
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -290,7 +290,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p370
+ntpq - standard NTP query program - Ver. 4.2.7p371
 Usage:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -328,6 +328,8 @@ The following option preset mechanisms a
  - examining environment variables named NTPQ_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs@@ntp.org>
+
+exit 0
 @end example
 @exampleindent 4
 
@@ -460,7 +462,6 @@ are expanded and replaced when @file{ntp
 For any of these that are plain files, they are simply processed.
 For any that are directories, then a file named @file{.ntprc} is searched for
 within that directory and processed.
-
 
 Configuration files may be in a wide variety of formats.
 The basic format is an option name followed by a value (argument) on the

==== ntpq/ntpq-opts.c ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +104 -99
  NTP_4_2_7P371

--- 1.376/ntpq/ntpq-opts.c	2013-07-06 11:30:48 +00:00
+++ 1.377/ntpq/ntpq-opts.c	2013-07-07 06:34:50 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:15 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:32:52 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -69,7 +69,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpq options
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p370\n"
+/*     0 */ "ntpq 4.2.7p371\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -125,13 +125,13 @@ static char const ntpq_opt_strs[1833] =
 /*  1627 */ "no-load-opts\0"
 /*  1640 */ "no\0"
 /*  1643 */ "NTPQ\0"
-/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p370\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p371\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1769 */ "$HOME\0"
 /*  1775 */ ".\0"
 /*  1777 */ ".ntprc\0"
 /*  1784 */ "http://bugs.ntp.org, bugs at ntp.org\0"
-/*  1818 */ "ntpq 4.2.7p370";
+/*  1818 */ "ntpq 4.2.7p371";
 
 /**
  *  ipv4 option description with
@@ -270,8 +270,8 @@ static int const aInteractiveCantList[] 
 #define MORE_HELP_name  (ntpq_opt_strs+1482)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
-#define MORE_HELP_DESC  NULL
-#define MORE_HELP_name  NULL
+#define MORE_HELP_DESC  HELP_DESC
+#define MORE_HELP_name  HELP_name
 #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
 #endif
 #ifdef NO_OPTIONAL_OPT_ARGS
@@ -292,6 +292,8 @@ static int const aInteractiveCantList[] 
 /**
  *  Declare option callback procedures
  */
+/* extracted from optmain.tlib near line 745 */
+
 #if defined(TEST_NTPQ_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -330,7 +332,7 @@ static tOptProc
 #define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 #define PEERS_OPT_PROC ntpq_custom_opt_handler
 
-#endif /* defined(TEST_NTPQ_OPTS) */
+#endif /* TEST_NTPQ_OPTS */
 #define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -534,7 +536,7 @@ static char const * const apzHomeList[3]
 #define zDetail         (NULL)
 /** The full version string for ntpq. */
 #define zFullVersion    (ntpq_opt_strs+1818)
-/* extracted from optcode.tlib near line 371 */
+/* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -555,17 +557,19 @@ static char const * const apzHomeList[3]
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] opts the AutoOpts option description structure
+ * @param[in] od   the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+doUsageOpt(tOptions * opts, tOptDesc * od)
 {
-    optionUsage(&ntpqOptions, NTPQ_EXIT_SUCCESS);
+    int ex_code;
+    ex_code = NTPQ_EXIT_SUCCESS;
+    optionUsage(&ntpqOptions, ex_code);
     /* NOTREACHED */
-    (void)pOptDesc;
-    (void)pOptions;
+    (void)opts;
+    (void)od;
 }
 
 #if ! defined(TEST_NTPQ_OPTS)
@@ -594,7 +598,7 @@ OPT_VALUE_SET_DEBUG_LEVEL++;
 #endif /* defined(TEST_NTPQ_OPTS) */
 /* extracted from optmain.tlib near line 46 */
 
-#if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */
+#if defined(TEST_NTPQ_OPTS) /* TEST-MAIN-PROCEDURE: */
 
 extern void optionPutShell(tOptions*);
 
@@ -617,8 +621,8 @@ main(int argc, char ** argv)
         fputs("output error writing to stdout\n", stderr);
     return res;
 }
-#endif  /* defined TEST_NTPQ_OPTS */
-/* extracted from optmain.tlib near line 1254 */
+#endif  /* TEST_NTPQ_OPTS END-TEST-MAIN-PROCEDURE */
+/* extracted from optmain.tlib near line 1266 */
 
 /**
  * The directory containing the data associated with ntpq.
@@ -663,7 +667,8 @@ tOptions ntpqOptions = {
     + OPTPROC_LONGOPT
     + OPTPROC_NO_REQ_OPT
     + OPTPROC_ENVIRON
-    + OPTPROC_MISUSE ),
+    + OPTPROC_MISUSE
+    + OPTPROC_SHELL_OUTPUT ),
     0, NULL,                    /* current option index, current option */
     NULL,         NULL,         zPROGNAME,
     zRcName,      zCopyright,   zLicenseDescrip,
@@ -816,7 +821,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpqOptions.pzCopyright */
-  puts(_("ntpq 4.2.7p370\n\
+  puts(_("ntpq 4.2.7p371\n\
 Copyright (C) 1970-2013 The University of Delaware, 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\
@@ -878,11 +883,11 @@ provided \"as is\" without express or im
   puts(_("load options from a config file"));
 
   /* referenced via ntpqOptions.pzUsageTitle */
-  puts(_("ntpq - standard NTP query program - Ver. 4.2.7p370\n\
+  puts(_("ntpq - standard NTP query program - Ver. 4.2.7p371\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
 
   /* referenced via ntpqOptions.pzFullVersion */
-  puts(_("ntpq 4.2.7p370"));
+  puts(_("ntpq 4.2.7p371"));
 
   /* referenced via ntpqOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -890,39 +895,39 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   /* referenced via ntpqOptions.pzShortUsage */
   puts(_("<<<NOT-FOUND>>>"));
   /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
+#line 45 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
+#line 71 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
+#line 90 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
+#line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
+#line 58 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
+#line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
+#line 82 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
+#line 292 "../usage.c"
   puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
+#line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
+#line 747 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
@@ -932,9 +937,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
+#line 89 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
+#line 301 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -961,19 +966,19 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: illegal option -- %s\n"));
 #line 332 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
+#line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
+#line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
+#line 746 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
+#line 1080 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
 #line 518 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
+#line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
@@ -982,9 +987,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
+#line 535 "../save.c"
   puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  '%s' does not match any %s keywords.\n"));
 #line 93 "../reset.c"
   puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -994,7 +999,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("error %d (%s) stat-ing %s\n"));
 #line 143 "../restore.c"
   puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
+#line 231 "../autoopts.c"
   puts(_("'%s' is not a command line option.\n"));
 #line 114 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
@@ -1006,41 +1011,41 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
+#line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
+#line 329 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("standard output"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard output"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard output"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard error"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard error"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("write"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("write"));
-#line 303 "../usage.c"
+#line 273 "../usage.c"
   puts(_("write"));
-#line 450 "../usage.c"
+#line 413 "../usage.c"
   puts(_("write"));
-#line 659 "../usage.c"
+#line 623 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1056,70 +1061,70 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
 #line 256 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
+#line 534 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 908 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
+#line 1147 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
+#line 923 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
+#line 836 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
+#line 1116 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
+#line 1114 "../usage.c"
   puts(_("This option has been disabled"));
-#line 899 "../usage.c"
+#line 863 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1221 "../usage.c"
+#line 1193 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
+#line 379 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
+#line 916 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
        "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
+#line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
+#line 896 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
+#line 917 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
+#line 381 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
+#line 890 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
+#line 1308 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
+#line 1244 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
+#line 1302 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
+#line 1303 "../usage.c"
   puts(_(" %3s %s"));
-#line 1337 "../usage.c"
+#line 1309 "../usage.c"
   puts(_(" %3s %s"));
-#line 423 "../usage.c"
+#line 386 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
+#line 382 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
+#line 970 "../usage.c"
   puts(_(" - reading file %s"));
-#line 445 "../usage.c"
+#line 408 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1128,17 +1133,17 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
+#line 902 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
+#line 943 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
+#line 1191 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
+#line 681 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
+#line 676 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1156,28 +1161,28 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
+#line 389 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
+#line 651 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
+#line 654 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
+#line 1320 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
+#line 1314 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
+#line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 945 "../usage.c"
+#line 909 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
+#line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
+#line 1151 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
+#line 772 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }

==== ntpq/ntpq-opts.h ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +14 -16
  NTP_4_2_7P371

--- 1.376/ntpq/ntpq-opts.h	2013-07-06 11:30:48 +00:00
+++ 1.377/ntpq/ntpq-opts.h	2013-07-07 06:34:50 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:15 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:32:51 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 159744
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -82,9 +82,9 @@ typedef enum {
 /** count of all options for ntpq */
 #define OPTION_CT    14
 /** ntpq version */
-#define NTPQ_VERSION       "4.2.7p370"
+#define NTPQ_VERSION       "4.2.7p371"
 /** Full ntpq version text */
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p370"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p371"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -94,7 +94,7 @@ typedef enum {
 #define         DESC(n) (ntpqOptions.pOptDesc[INDEX_OPT_## n])
 /** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
+/** The string argument to an option. The argument type must be \"string\". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
 /** Mask the option state revealing how an option was specified.
  *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -121,18 +121,17 @@ typedef enum {
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Enumeration of ntpq exit codes
  */
 typedef enum {
-    NTPQ_EXIT_SUCCESS               = 0,
-    NTPQ_EXIT_FAILURE               = 1,
-    NTPQ_EXIT_USAGE_ERROR           = 64,
-    NTPQ_EXIT_NO_CONFIG_INPUT       = 66,
-    NTPQ_EXIT_LIBOPTS_FAILURE       = 70
-} ntpq_exit_code_t;
+    NTPQ_EXIT_SUCCESS         = 0,
+    NTPQ_EXIT_FAILURE         = 1,
+    NTPQ_EXIT_USAGE_ERROR     = 64,
+    NTPQ_EXIT_NO_CONFIG_INPUT = 66,
+    NTPQ_EXIT_LIBOPTS_FAILURE = 70
+}   ntpq_exit_code_t;
 /** @} */
 /**
  *  Make sure there are no #define name conflicts with the option names
@@ -186,7 +185,6 @@ typedef enum {
 # undef OLD_RV
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Interface defines for specific options.
  * @{
@@ -223,10 +221,9 @@ typedef enum {
 #define ERRSTOP_OPTERR  STMTS(ntpqOptions.fOptSet |= OPTPROC_ERRSTOP)
 #define RESTART_OPT(n)  STMTS( \
                 ntpqOptions.curOptIdx = (n); \
-                ntpqOptions.pzCurOpt  = NULL)
+                ntpqOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpqOptions.pUsageProc)(&ntpqOptions, c)
-/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -281,4 +278,5 @@ static inline char* aoGetsText(char cons
 }
 #endif
 #endif /* AUTOOPTS_NTPQ_OPTS_H_GUARD */
+
 /* ntpq-opts.h ends here */

==== ntpq/ntpq.1ntpqman ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/ntpq/ntpq.1ntpqman	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpq/ntpq.1ntpqman	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpq 1ntpqman "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:21 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:14 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -200,7 +200,7 @@ so this command may be obsolete.
 .TP
 .BR Ic host Ar hostname
 Set the host to which future queries will be sent.
-\fIhostname\fR
+IhostnameR
 may be either a host name or a numeric address.
 .TP
 .BR Ic hostnames Op Cm yes | Cm no
@@ -350,17 +350,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.

==== ntpq/ntpq.1ntpqmdoc ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +9 -8
  NTP_4_2_7P371

--- 1.190/ntpq/ntpq.1ntpqmdoc	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpq/ntpq.1ntpqmdoc	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:27 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:20 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -329,15 +329,16 @@ newer \fBntpq\fP to behave identically i
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.

==== ntpq/ntpq.html ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_7P371

--- 1.35/ntpq/ntpq.html	2013-07-06 11:30:48 +00:00
+++ 1.36/ntpq/ntpq.html	2013-07-07 06:34:50 +00:00
@@ -44,7 +44,7 @@ monitor the operational status
 and determine the performance of
 <code>ntpd</code>, the NTP daemon.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntpq</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntpq</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpq-Description">ntpq Description</a>
@@ -377,7 +377,7 @@ the usage text by passing it through a p
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpq - standard NTP query program - Ver. 4.2.7p369
+<pre class="example">ntpq - standard NTP query program - Ver. 4.2.7p370
 Usage:  ntpq [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution

==== ntpq/ntpq.man.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/ntpq/ntpq.man.in	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpq/ntpq.man.in	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpq @NTPQ_MS@ "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:21 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:14 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -200,7 +200,7 @@ so this command may be obsolete.
 .TP
 .BR Ic host Ar hostname
 Set the host to which future queries will be sent.
-\fIhostname\fR
+IhostnameR
 may be either a host name or a numeric address.
 .TP
 .BR Ic hostnames Op Cm yes | Cm no
@@ -350,17 +350,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.

==== ntpq/ntpq.mdoc.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +9 -8
  NTP_4_2_7P371

--- 1.190/ntpq/ntpq.mdoc.in	2013-07-06 11:30:48 +00:00
+++ 1.191/ntpq/ntpq.mdoc.in	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:27 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:20 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -329,15 +329,16 @@ newer \fBntpq\fP to behave identically i
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.

==== ntpsnmpd/invoke-ntpsnmpd.texi ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +4 -3
  NTP_4_2_7P371

--- 1.361/ntpsnmpd/invoke-ntpsnmpd.texi	2013-07-06 11:30:48 +00:00
+++ 1.362/ntpsnmpd/invoke-ntpsnmpd.texi	2013-07-07 06:34:50 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:29:40 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:33:36 AM by AutoGen 5.17.5pre10
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -47,7 +47,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p370
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p371
 Usage:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
@@ -71,6 +71,8 @@ The following option preset mechanisms a
  - examining environment variables named NTPSNMPD_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs@@ntp.org>
+
+exit 0
 @end example
 @exampleindent 4
 
@@ -110,7 +112,6 @@ are expanded and replaced when @file{ntp
 For any of these that are plain files, they are simply processed.
 For any that are directories, then a file named @file{.ntprc} is searched for
 within that directory and processed.
-
 
 Configuration files may be in a wide variety of formats.
 The basic format is an option name followed by a value (argument) on the

==== ntpsnmpd/ntpsnmpd-opts.c ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +104 -99
  NTP_4_2_7P371

--- 1.376/ntpsnmpd/ntpsnmpd-opts.c	2013-07-06 11:30:48 +00:00
+++ 1.377/ntpsnmpd/ntpsnmpd-opts.c	2013-07-07 06:34:50 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:29 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:33:22 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -61,7 +61,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntpsnmpd options
  */
 static char const ntpsnmpd_opt_strs[1560] =
-/*     0 */ "ntpsnmpd 4.2.7p370\n"
+/*     0 */ "ntpsnmpd 4.2.7p371\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -100,14 +100,14 @@ static char const ntpsnmpd_opt_strs[1560
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p370\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p371\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs at ntp.org\0"
 /*  1539 */ "\n\0"
-/*  1541 */ "ntpsnmpd 4.2.7p370";
+/*  1541 */ "ntpsnmpd 4.2.7p371";
 
 /**
  *  nofork option description:
@@ -158,8 +158,8 @@ static char const ntpsnmpd_opt_strs[1560
 #define MORE_HELP_name  (ntpsnmpd_opt_strs+1215)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
-#define MORE_HELP_DESC  NULL
-#define MORE_HELP_name  NULL
+#define MORE_HELP_DESC  HELP_DESC
+#define MORE_HELP_name  HELP_name
 #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
 #endif
 #ifdef NO_OPTIONAL_OPT_ARGS
@@ -180,6 +180,8 @@ static char const ntpsnmpd_opt_strs[1560
 /**
  *  Declare option callback procedures
  */
+/* extracted from optmain.tlib near line 745 */
+
 #if defined(TEST_NTPSNMPD_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -199,7 +201,7 @@ extern tOptProc
     optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
     doUsageOpt;
-#endif /* defined(TEST_NTPSNMPD_OPTS) */
+#endif /* TEST_NTPSNMPD_OPTS */
 #define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -331,7 +333,7 @@ static char const * const apzHomeList[3]
 #define zDetail         (NULL)
 /** The full version string for ntpsnmpd. */
 #define zFullVersion    (ntpsnmpd_opt_strs+1541)
-/* extracted from optcode.tlib near line 371 */
+/* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -352,21 +354,23 @@ static char const * const apzHomeList[3]
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] opts the AutoOpts option description structure
+ * @param[in] od   the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+doUsageOpt(tOptions * opts, tOptDesc * od)
 {
-    optionUsage(&ntpsnmpdOptions, NTPSNMPD_EXIT_SUCCESS);
+    int ex_code;
+    ex_code = NTPSNMPD_EXIT_SUCCESS;
+    optionUsage(&ntpsnmpdOptions, ex_code);
     /* NOTREACHED */
-    (void)pOptDesc;
-    (void)pOptions;
+    (void)opts;
+    (void)od;
 }
 /* extracted from optmain.tlib near line 46 */
 
-#if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */
+#if defined(TEST_NTPSNMPD_OPTS) /* TEST-MAIN-PROCEDURE: */
 
 extern void optionPutShell(tOptions*);
 
@@ -389,8 +393,8 @@ main(int argc, char ** argv)
         fputs("output error writing to stdout\n", stderr);
     return res;
 }
-#endif  /* defined TEST_NTPSNMPD_OPTS */
-/* extracted from optmain.tlib near line 1254 */
+#endif  /* TEST_NTPSNMPD_OPTS END-TEST-MAIN-PROCEDURE */
+/* extracted from optmain.tlib near line 1266 */
 
 /**
  * The directory containing the data associated with ntpsnmpd.
@@ -436,7 +440,8 @@ tOptions ntpsnmpdOptions = {
     + OPTPROC_NO_REQ_OPT
     + OPTPROC_ENVIRON
     + OPTPROC_NO_ARGS
-    + OPTPROC_MISUSE ),
+    + OPTPROC_MISUSE
+    + OPTPROC_SHELL_OUTPUT ),
     0, NULL,                    /* current option index, current option */
     NULL,         NULL,         zPROGNAME,
     zRcName,      zCopyright,   zLicenseDescrip,
@@ -589,7 +594,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntpsnmpdOptions.pzCopyright */
-  puts(_("ntpsnmpd 4.2.7p370\n\
+  puts(_("ntpsnmpd 4.2.7p371\n\
 Copyright (C) 1970-2013 The University of Delaware, 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\
@@ -633,14 +638,14 @@ provided \"as is\" without express or im
   puts(_("load options from a config file"));
 
   /* referenced via ntpsnmpdOptions.pzUsageTitle */
-  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p370\n\
+  puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p371\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
 
   /* referenced via ntpsnmpdOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntpsnmpdOptions.pzFullVersion */
-  puts(_("ntpsnmpd 4.2.7p370"));
+  puts(_("ntpsnmpd 4.2.7p371"));
 
   /* referenced via ntpsnmpdOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -648,39 +653,39 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   /* referenced via ntpsnmpdOptions.pzShortUsage */
   puts(_("<<<NOT-FOUND>>>"));
   /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
+#line 45 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
+#line 71 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
+#line 90 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
+#line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
+#line 58 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
+#line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
+#line 82 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
+#line 292 "../usage.c"
   puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
+#line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
+#line 747 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
@@ -690,9 +695,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
+#line 89 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
+#line 301 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -719,19 +724,19 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: illegal option -- %s\n"));
 #line 332 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
+#line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
+#line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
+#line 746 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
+#line 1080 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
 #line 518 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
+#line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
@@ -740,9 +745,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
+#line 535 "../save.c"
   puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  '%s' does not match any %s keywords.\n"));
 #line 93 "../reset.c"
   puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -752,7 +757,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("error %d (%s) stat-ing %s\n"));
 #line 143 "../restore.c"
   puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
+#line 231 "../autoopts.c"
   puts(_("'%s' is not a command line option.\n"));
 #line 114 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
@@ -764,41 +769,41 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
+#line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
+#line 329 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("standard output"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard output"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard output"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard error"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard error"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("write"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("write"));
-#line 303 "../usage.c"
+#line 273 "../usage.c"
   puts(_("write"));
-#line 450 "../usage.c"
+#line 413 "../usage.c"
   puts(_("write"));
-#line 659 "../usage.c"
+#line 623 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -814,70 +819,70 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
 #line 256 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
+#line 534 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 908 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
+#line 1147 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
+#line 923 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
+#line 836 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
+#line 1116 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
+#line 1114 "../usage.c"
   puts(_("This option has been disabled"));
-#line 899 "../usage.c"
+#line 863 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1221 "../usage.c"
+#line 1193 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
+#line 379 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
+#line 916 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
        "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
+#line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
+#line 896 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
+#line 917 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
+#line 381 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
+#line 890 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
+#line 1308 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
+#line 1244 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
+#line 1302 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
+#line 1303 "../usage.c"
   puts(_(" %3s %s"));
-#line 1337 "../usage.c"
+#line 1309 "../usage.c"
   puts(_(" %3s %s"));
-#line 423 "../usage.c"
+#line 386 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
+#line 382 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
+#line 970 "../usage.c"
   puts(_(" - reading file %s"));
-#line 445 "../usage.c"
+#line 408 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -886,17 +891,17 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
+#line 902 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
+#line 943 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
+#line 1191 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
+#line 681 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
+#line 676 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -914,28 +919,28 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
+#line 389 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
+#line 651 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
+#line 654 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
+#line 1320 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
+#line 1314 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
+#line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 945 "../usage.c"
+#line 909 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
+#line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
+#line 1151 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
+#line 772 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }

==== ntpsnmpd/ntpsnmpd-opts.h ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +14 -16
  NTP_4_2_7P371

--- 1.376/ntpsnmpd/ntpsnmpd-opts.h	2013-07-06 11:30:48 +00:00
+++ 1.377/ntpsnmpd/ntpsnmpd-opts.h	2013-07-07 06:34:50 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:29 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:33:22 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 159744
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -76,9 +76,9 @@ typedef enum {
 /** count of all options for ntpsnmpd */
 #define OPTION_CT    8
 /** ntpsnmpd version */
-#define NTPSNMPD_VERSION       "4.2.7p370"
+#define NTPSNMPD_VERSION       "4.2.7p371"
 /** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p370"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p371"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -88,7 +88,7 @@ typedef enum {
 #define         DESC(n) (ntpsnmpdOptions.pOptDesc[INDEX_OPT_## n])
 /** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
+/** The string argument to an option. The argument type must be \"string\". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
 /** Mask the option state revealing how an option was specified.
  *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -115,18 +115,17 @@ typedef enum {
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Enumeration of ntpsnmpd exit codes
  */
 typedef enum {
-    NTPSNMPD_EXIT_SUCCESS           = 0,
-    NTPSNMPD_EXIT_FAILURE           = 1,
-    NTPSNMPD_EXIT_USAGE_ERROR       = 64,
-    NTPSNMPD_EXIT_NO_CONFIG_INPUT   = 66,
-    NTPSNMPD_EXIT_LIBOPTS_FAILURE   = 70
-} ntpsnmpd_exit_code_t;
+    NTPSNMPD_EXIT_SUCCESS         = 0,
+    NTPSNMPD_EXIT_FAILURE         = 1,
+    NTPSNMPD_EXIT_USAGE_ERROR     = 64,
+    NTPSNMPD_EXIT_NO_CONFIG_INPUT = 66,
+    NTPSNMPD_EXIT_LIBOPTS_FAILURE = 70
+}   ntpsnmpd_exit_code_t;
 /** @} */
 /**
  *  Make sure there are no #define name conflicts with the option names
@@ -150,7 +149,6 @@ typedef enum {
 # undef AGENTXSOCKET
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Interface defines for specific options.
  * @{
@@ -179,10 +177,9 @@ typedef enum {
 #define ERRSTOP_OPTERR  STMTS(ntpsnmpdOptions.fOptSet |= OPTPROC_ERRSTOP)
 #define RESTART_OPT(n)  STMTS( \
                 ntpsnmpdOptions.curOptIdx = (n); \
-                ntpsnmpdOptions.pzCurOpt  = NULL)
+                ntpsnmpdOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpsnmpdOptions.pUsageProc)(&ntpsnmpdOptions, c)
-/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -237,4 +234,5 @@ static inline char* aoGetsText(char cons
 }
 #endif
 #endif /* AUTOOPTS_NTPSNMPD_OPTS_H_GUARD */
+
 /* ntpsnmpd-opts.h ends here */

==== ntpsnmpd/ntpsnmpd.1ntpsnmpdman ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/ntpsnmpd/ntpsnmpd.1ntpsnmpdman	2013-07-06 11:30:49 +00:00
+++ 1.191/ntpsnmpd/ntpsnmpd.1ntpsnmpdman	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:36 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:31 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -46,17 +46,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -169,7 +170,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.

==== ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc	2013-07-06 11:30:49 +00:00
+++ 1.191/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:42 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:38 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -44,15 +44,16 @@ Another common alternative is \fItcp:loc
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -156,7 +157,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpsnmpd\fP
 option definitions.

==== ntpsnmpd/ntpsnmpd.html ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.33/ntpsnmpd/ntpsnmpd.html	2013-07-06 11:30:49 +00:00
+++ 1.34/ntpsnmpd/ntpsnmpd.html	2013-07-07 06:34:50 +00:00
@@ -42,7 +42,7 @@ Up: <a rel="up" accesskey="u" href=
 <p>The <code>ntpsnmpd</code> utility program is used to monitor NTP daemon <code>ntpd</code>
 operations and determine performance.  It uses the standard NTP mode 6 control
 
-  <p>This document applies to version 4.2.7p370 of <code>ntpsnmpd</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntpsnmpd</code>.
 
 <ul class="menu">
 <li><a accesskey="1" href="#ntpsnmpd-Description">ntpsnmpd Description</a>:             Description

==== ntpsnmpd/ntpsnmpd.man.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/ntpsnmpd/ntpsnmpd.man.in	2013-07-06 11:30:49 +00:00
+++ 1.191/ntpsnmpd/ntpsnmpd.man.in	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:36 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:31 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -46,17 +46,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -169,7 +170,7 @@ please fill me in...
 .BR Li ntpEntTimeDistance
 please fill me in...
 .PP
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntpsnmpd\fP
 option definitions.

==== ntpsnmpd/ntpsnmpd.mdoc.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/ntpsnmpd/ntpsnmpd.mdoc.in	2013-07-06 11:30:49 +00:00
+++ 1.191/ntpsnmpd/ntpsnmpd.mdoc.in	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:42 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:38 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -44,15 +44,16 @@ Another common alternative is \fItcp:loc
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -156,7 +157,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntpsnmpd\fP
 option definitions.

==== packageinfo.sh ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.373/packageinfo.sh	2013-07-06 11:30:49 +00:00
+++ 1.374/packageinfo.sh	2013-07-07 06:34:50 +00:00
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=370
+point=371
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)

==== scripts/invoke-ntp-wait.texi ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.178/scripts/invoke-ntp-wait.texi	2013-07-06 11:30:49 +00:00
+++ 1.179/scripts/invoke-ntp-wait.texi	2013-07-07 06:34:50 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:26:13 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:22:14 AM by AutoGen 5.17.5pre10
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore

==== scripts/ntp-wait.1ntp-waitman ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +6 -6
  NTP_4_2_7P371

--- 1.189/scripts/ntp-wait.1ntp-waitman	2013-07-06 11:30:49 +00:00
+++ 1.190/scripts/ntp-wait.1ntp-waitman	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "06 Jul 2013" "ntp (4.2.7p370)" "User Commands"
+.TH ntp-wait 1ntp-waitman "07 Jul 2013" "ntp (4.2.7p371)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:26:09 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:22:10 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -18,11 +18,11 @@ All arguments must be options.
 .SH DESCRIPTION
 .B 
 will send at most
-\fInum-tries\fR
+Inum-triesR
 queries to
 .Xr ntpd 8 ,
 sleeping for
-\fIsecs-between-tries\fR
+Isecs-between-triesR
 after each status return that says
 .Xr ntpd 8
 has not yet produced a synchronized and stable system clock.
@@ -65,7 +65,7 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -117,7 +117,7 @@ This program is released under the terms
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-wait\fP
 option definitions.

==== scripts/ntp-wait.1ntp-waitmdoc ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.189/scripts/ntp-wait.1ntp-waitmdoc	2013-07-06 11:30:49 +00:00
+++ 1.190/scripts/ntp-wait.1ntp-waitmdoc	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:26:15 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:22:16 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -63,7 +63,7 @@ With this option, \fBntp\-wait\fP will p
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -115,7 +115,7 @@ This program is released under the terms
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-wait\fP
 option definitions.

==== scripts/ntp-wait.html ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +1 -1
  NTP_4_2_7P371

--- 1.194/scripts/ntp-wait.html	2013-07-06 11:30:49 +00:00
+++ 1.195/scripts/ntp-wait.html	2013-07-07 06:34:50 +00:00
@@ -41,7 +41,7 @@ until the system's time has stabilized a
 and only then start any applicaitons (like database servers) that require
 accurate and stable time.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntp-wait</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntp-wait</code>.
 
 <div class="shortcontents">
 <h2>Short Contents</h2>

==== scripts/ntp-wait.man.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +6 -6
  NTP_4_2_7P371

--- 1.189/scripts/ntp-wait.man.in	2013-07-06 11:30:49 +00:00
+++ 1.190/scripts/ntp-wait.man.in	2013-07-07 06:34:50 +00:00
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "06 Jul 2013" "ntp (4.2.7p370)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "07 Jul 2013" "ntp (4.2.7p371)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:26:09 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:22:10 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -18,11 +18,11 @@ All arguments must be options.
 .SH DESCRIPTION
 .B 
 will send at most
-\fInum-tries\fR
+Inum-triesR
 queries to
 .Xr ntpd 8 ,
 sleeping for
-\fIsecs-between-tries\fR
+Isecs-between-triesR
 after each status return that says
 .Xr ntpd 8
 has not yet produced a synchronized and stable system clock.
@@ -65,7 +65,7 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -117,7 +117,7 @@ This program is released under the terms
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-wait\fP
 option definitions.

==== scripts/ntp-wait.mdoc.in ====
2013-07-07 06:34:50+00:00, stenn at deacon.udel.edu +4 -4
  NTP_4_2_7P371

--- 1.189/scripts/ntp-wait.mdoc.in	2013-07-06 11:30:49 +00:00
+++ 1.190/scripts/ntp-wait.mdoc.in	2013-07-07 06:34:50 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:26:15 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:22:16 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -63,7 +63,7 @@ With this option, \fBntp\-wait\fP will p
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -115,7 +115,7 @@ This program is released under the terms
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-wait\fP
 option definitions.

==== sntp/invoke-sntp.texi ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +4 -3
  NTP_4_2_7P371

--- 1.358/sntp/invoke-sntp.texi	2013-07-06 11:30:49 +00:00
+++ 1.359/sntp/invoke-sntp.texi	2013-07-07 06:34:51 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:30:23 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:34:29 AM by AutoGen 5.17.5pre10
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -101,7 +101,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p370
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p371
 Usage:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -153,6 +153,8 @@ The following option preset mechanisms a
  - examining environment variables named SNTP_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs@@ntp.org>
+
+exit 0
 @end example
 @exampleindent 4
 
@@ -349,7 +351,6 @@ are expanded and replaced when @file{snt
 For any of these that are plain files, they are simply processed.
 For any that are directories, then a file named @file{.ntprc} is searched for
 within that directory and processed.
-
 
 Configuration files may be in a wide variety of formats.
 The basic format is an option name followed by a value (argument) on the

==== sntp/sntp-opts.c ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +104 -99
  NTP_4_2_7P371

--- 1.373/sntp/sntp-opts.c	2013-07-06 11:30:49 +00:00
+++ 1.374/sntp/sntp-opts.c	2013-07-07 06:34:51 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:20:12 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:19:19 AM by AutoGen 5.17.5pre10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -70,7 +70,7 @@ extern FILE * option_usage_fp;
  *  static const strings for sntp options
  */
 static char const sntp_opt_strs[2499] =
-/*     0 */ "sntp 4.2.7p370\n"
+/*     0 */ "sntp 4.2.7p371\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -154,7 +154,7 @@ static char const sntp_opt_strs[2499] =
 /*  2244 */ "LOAD_OPTS\0"
 /*  2254 */ "no-load-opts\0"
 /*  2267 */ "SNTP\0"
-/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p370\n"
+/*  2272 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p371\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2433 */ "$HOME\0"
@@ -162,7 +162,7 @@ static char const sntp_opt_strs[2499] =
 /*  2441 */ ".ntprc\0"
 /*  2448 */ "http://bugs.ntp.org, bugs at ntp.org\0"
 /*  2482 */ "\n\0"
-/*  2484 */ "sntp 4.2.7p370";
+/*  2484 */ "sntp 4.2.7p371";
 
 /**
  *  ipv4 option description with
@@ -421,8 +421,8 @@ static int const aIpv6CantList[] = {
 #define MORE_HELP_name  (sntp_opt_strs+2109)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
-#define MORE_HELP_DESC  NULL
-#define MORE_HELP_name  NULL
+#define MORE_HELP_DESC  HELP_DESC
+#define MORE_HELP_name  HELP_name
 #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
 #endif
 #ifdef NO_OPTIONAL_OPT_ARGS
@@ -443,6 +443,8 @@ static int const aIpv6CantList[] = {
 /**
  *  Declare option callback procedures
  */
+/* extracted from optmain.tlib near line 745 */
+
 #if defined(TEST_SNTP_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -476,7 +478,7 @@ static tOptProc
  */
 #define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
-#endif /* defined(TEST_SNTP_OPTS) */
+#endif /* TEST_SNTP_OPTS */
 #define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -788,7 +790,7 @@ static char const * const apzHomeList[3]
 #define zDetail         (NULL)
 /** The full version string for sntp. */
 #define zFullVersion    (sntp_opt_strs+2484)
-/* extracted from optcode.tlib near line 371 */
+/* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -809,17 +811,19 @@ static char const * const apzHomeList[3]
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] opts the AutoOpts option description structure
+ * @param[in] od   the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+doUsageOpt(tOptions * opts, tOptDesc * od)
 {
-    optionUsage(&sntpOptions, SNTP_EXIT_SUCCESS);
+    int ex_code;
+    ex_code = SNTP_EXIT_SUCCESS;
+    optionUsage(&sntpOptions, ex_code);
     /* NOTREACHED */
-    (void)pOptDesc;
-    (void)pOptions;
+    (void)opts;
+    (void)od;
 }
 
 #if ! defined(TEST_SNTP_OPTS)
@@ -998,7 +1002,7 @@ doOptNtpversion(tOptions* pOptions, tOpt
 }
 /* extracted from optmain.tlib near line 46 */
 
-#if defined(TEST_SNTP_OPTS) /* TEST MAIN PROCEDURE: */
+#if defined(TEST_SNTP_OPTS) /* TEST-MAIN-PROCEDURE: */
 
 extern void optionPutShell(tOptions*);
 
@@ -1021,8 +1025,8 @@ main(int argc, char ** argv)
         fputs("output error writing to stdout\n", stderr);
     return res;
 }
-#endif  /* defined TEST_SNTP_OPTS */
-/* extracted from optmain.tlib near line 1254 */
+#endif  /* TEST_SNTP_OPTS END-TEST-MAIN-PROCEDURE */
+/* extracted from optmain.tlib near line 1266 */
 
 /**
  * The directory containing the data associated with sntp.
@@ -1068,7 +1072,8 @@ tOptions sntpOptions = {
     + OPTPROC_NO_REQ_OPT
     + OPTPROC_NEGATIONS
     + OPTPROC_ENVIRON
-    + OPTPROC_MISUSE ),
+    + OPTPROC_MISUSE
+    + OPTPROC_SHELL_OUTPUT ),
     0, NULL,                    /* current option index, current option */
     NULL,         NULL,         zPROGNAME,
     zRcName,      zCopyright,   zLicenseDescrip,
@@ -1221,7 +1226,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via sntpOptions.pzCopyright */
-  puts(_("sntp 4.2.7p370\n\
+  puts(_("sntp 4.2.7p371\n\
 Copyright (C) 1970-2013 The University of Delaware, 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\
@@ -1310,7 +1315,7 @@ provided \"as is\" without express or im
   puts(_("load options from a config file"));
 
   /* referenced via sntpOptions.pzUsageTitle */
-  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p370\n\
+  puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p371\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
 \t\t[ hostname-or-IP ...]\n"));
 
@@ -1318,7 +1323,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("\n"));
 
   /* referenced via sntpOptions.pzFullVersion */
-  puts(_("sntp 4.2.7p370"));
+  puts(_("sntp 4.2.7p371"));
 
   /* referenced via sntpOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -1326,39 +1331,39 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   /* referenced via sntpOptions.pzShortUsage */
   puts(_("<<<NOT-FOUND>>>"));
   /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
+#line 45 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
+#line 71 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
+#line 90 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
+#line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
+#line 58 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
+#line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
+#line 82 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
+#line 292 "../usage.c"
   puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
+#line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
+#line 747 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
@@ -1368,9 +1373,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
+#line 89 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
+#line 301 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -1397,19 +1402,19 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: illegal option -- %s\n"));
 #line 332 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
+#line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
+#line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
+#line 746 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
+#line 1080 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
 #line 518 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
+#line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
@@ -1418,9 +1423,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
+#line 535 "../save.c"
   puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  '%s' does not match any %s keywords.\n"));
 #line 93 "../reset.c"
   puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -1430,7 +1435,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("error %d (%s) stat-ing %s\n"));
 #line 143 "../restore.c"
   puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
+#line 231 "../autoopts.c"
   puts(_("'%s' is not a command line option.\n"));
 #line 114 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
@@ -1442,41 +1447,41 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
+#line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
+#line 329 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("standard output"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard output"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard output"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard error"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard error"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("write"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("write"));
-#line 303 "../usage.c"
+#line 273 "../usage.c"
   puts(_("write"));
-#line 450 "../usage.c"
+#line 413 "../usage.c"
   puts(_("write"));
-#line 659 "../usage.c"
+#line 623 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1492,70 +1497,70 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
 #line 256 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
+#line 534 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 908 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
+#line 1147 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
+#line 923 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
+#line 836 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
+#line 1116 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
+#line 1114 "../usage.c"
   puts(_("This option has been disabled"));
-#line 899 "../usage.c"
+#line 863 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1221 "../usage.c"
+#line 1193 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
+#line 379 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
+#line 916 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
        "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
+#line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
+#line 896 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
+#line 917 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
+#line 381 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
+#line 890 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
+#line 1308 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
+#line 1244 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
+#line 1302 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
+#line 1303 "../usage.c"
   puts(_(" %3s %s"));
-#line 1337 "../usage.c"
+#line 1309 "../usage.c"
   puts(_(" %3s %s"));
-#line 423 "../usage.c"
+#line 386 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
+#line 382 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
+#line 970 "../usage.c"
   puts(_(" - reading file %s"));
-#line 445 "../usage.c"
+#line 408 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1564,17 +1569,17 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
+#line 902 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
+#line 943 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
+#line 1191 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
+#line 681 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
+#line 676 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1592,28 +1597,28 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
+#line 389 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
+#line 651 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
+#line 654 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
+#line 1320 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
+#line 1314 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
+#line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 945 "../usage.c"
+#line 909 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
+#line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
+#line 1151 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
+#line 772 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }

==== sntp/sntp-opts.h ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +14 -16
  NTP_4_2_7P371

--- 1.373/sntp/sntp-opts.h	2013-07-06 11:30:49 +00:00
+++ 1.374/sntp/sntp-opts.h	2013-07-07 06:34:51 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:20:10 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:19:18 AM by AutoGen 5.17.5pre10
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 159744
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -91,9 +91,9 @@ typedef enum {
 /** count of all options for sntp */
 #define OPTION_CT    23
 /** sntp version */
-#define SNTP_VERSION       "4.2.7p370"
+#define SNTP_VERSION       "4.2.7p371"
 /** Full sntp version text */
-#define SNTP_FULL_VERSION  "sntp 4.2.7p370"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p371"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -103,7 +103,7 @@ typedef enum {
 #define         DESC(n) (sntpOptions.pOptDesc[INDEX_OPT_## n])
 /** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
+/** The string argument to an option. The argument type must be \"string\". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
 /** Mask the option state revealing how an option was specified.
  *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -130,18 +130,17 @@ typedef enum {
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Enumeration of sntp exit codes
  */
 typedef enum {
-    SNTP_EXIT_SUCCESS               = 0,
-    SNTP_EXIT_FAILURE               = 1,
-    SNTP_EXIT_USAGE_ERROR           = 64,
-    SNTP_EXIT_NO_CONFIG_INPUT       = 66,
-    SNTP_EXIT_LIBOPTS_FAILURE       = 70
-} sntp_exit_code_t;
+    SNTP_EXIT_SUCCESS         = 0,
+    SNTP_EXIT_FAILURE         = 1,
+    SNTP_EXIT_USAGE_ERROR     = 64,
+    SNTP_EXIT_NO_CONFIG_INPUT = 66,
+    SNTP_EXIT_LIBOPTS_FAILURE = 70
+}   sntp_exit_code_t;
 /** @} */
 /**
  *  Make sure there are no #define name conflicts with the option names
@@ -240,7 +239,6 @@ typedef enum {
 # undef WAIT
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Interface defines for specific options.
  * @{
@@ -306,10 +304,9 @@ typedef enum {
 #define ERRSTOP_OPTERR  STMTS(sntpOptions.fOptSet |= OPTPROC_ERRSTOP)
 #define RESTART_OPT(n)  STMTS( \
                 sntpOptions.curOptIdx = (n); \
-                sntpOptions.pzCurOpt  = NULL)
+                sntpOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*sntpOptions.pUsageProc)(&sntpOptions, c)
-/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -364,4 +361,5 @@ static inline char* aoGetsText(char cons
 }
 #endif
 #endif /* AUTOOPTS_SNTP_OPTS_H_GUARD */
+
 /* sntp-opts.h ends here */

==== sntp/sntp.1sntpman ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.193/sntp/sntp.1sntpman	2013-07-06 11:30:49 +00:00
+++ 1.194/sntp/sntp.1sntpman	2013-07-07 06:34:51 +00:00
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH sntp 1sntpman "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:30:20 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:34:25 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -221,17 +221,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -316,7 +317,7 @@ This program is released under the terms
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of
+This document corresponds to version 4.2.7p371 of
 .B  .
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBsntp\fP

==== sntp/sntp.1sntpmdoc ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.193/sntp/sntp.1sntpmdoc	2013-07-06 11:30:49 +00:00
+++ 1.194/sntp/sntp.1sntpmdoc	2013-07-07 06:34:51 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:30:25 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:34:31 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -205,15 +205,16 @@ If we are not setting the time, wait for
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -297,7 +298,7 @@ This program is released under the terms
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of
+This document corresponds to version 4.2.7p371 of
 .Nm .
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBsntp\fP

==== sntp/sntp.html ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +4 -2
  NTP_4_2_7P371

--- 1.373/sntp/sntp.html	2013-07-06 11:30:49 +00:00
+++ 1.374/sntp/sntp.html	2013-07-07 06:34:51 +00:00
@@ -36,7 +36,7 @@ display the time offset of the system cl
 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.
 
-  <p>This document applies to version 4.2.7p370 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p371 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -176,7 +176,7 @@ the usage text by passing it through a p
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p370
+<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p371
 Usage:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -228,6 +228,8 @@ The following option preset mechanisms a
  - examining environment variables named SNTP_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs at ntp.org>
+
+exit 0
 </pre>
   <div class="node">
 <p><hr>

==== sntp/sntp.man.in ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.193/sntp/sntp.man.in	2013-07-06 11:30:49 +00:00
+++ 1.194/sntp/sntp.man.in	2013-07-07 06:34:51 +00:00
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "06 Jul 2013" "4.2.7p370" "User Commands"
+.TH sntp @SNTP_MS@ "07 Jul 2013" "4.2.7p371" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:30:20 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:34:25 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -221,17 +221,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -316,7 +317,7 @@ This program is released under the terms
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of
+This document corresponds to version 4.2.7p371 of
 .B  .
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBsntp\fP

==== sntp/sntp.mdoc.in ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.193/sntp/sntp.mdoc.in	2013-07-06 11:30:49 +00:00
+++ 1.194/sntp/sntp.mdoc.in	2013-07-07 06:34:51 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:30:25 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:34:31 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -205,15 +205,16 @@ If we are not setting the time, wait for
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -297,7 +298,7 @@ This program is released under the terms
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of
+This document corresponds to version 4.2.7p371 of
 .Nm .
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBsntp\fP

==== util/invoke-ntp-keygen.texi ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +4 -3
  NTP_4_2_7P371

--- 1.362/util/invoke-ntp-keygen.texi	2013-07-06 11:30:49 +00:00
+++ 1.363/util/invoke-ntp-keygen.texi	2013-07-07 06:34:51 +00:00
@@ -6,7 +6,7 @@
 #
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 #
-# It has been AutoGen-ed  July  6, 2013 at 11:29:58 AM by AutoGen 5.17.3
+# It has been AutoGen-ed  July  7, 2013 at 06:34:02 AM by AutoGen 5.17.5pre10
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -908,7 +908,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p370
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p371
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits
@@ -956,6 +956,8 @@ The following option preset mechanisms a
  - examining environment variables named NTP_KEYGEN_*
 
 Please send bug reports to:  <http://bugs.ntp.org, bugs@@ntp.org>
+
+exit 0
 @end example
 @exampleindent 4
 
@@ -1291,7 +1293,6 @@ are expanded and replaced when @file{ntp
 For any of these that are plain files, they are simply processed.
 For any that are directories, then a file named @file{.ntprc} is searched for
 within that directory and processed.
-
 
 Configuration files may be in a wide variety of formats.
 The basic format is an option name followed by a value (argument) on the

==== util/ntp-keygen-opts.c ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +104 -99
  NTP_4_2_7P371

--- 1.376/util/ntp-keygen-opts.c	2013-07-06 11:30:49 +00:00
+++ 1.377/util/ntp-keygen-opts.c	2013-07-07 06:34:51 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:46 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:33:43 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  static const strings for ntp-keygen options
  */
 static char const ntp_keygen_opt_strs[2357] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p370\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p371\n"
             "Copyright (C) 1970-2013 The University of Delaware, 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"
@@ -163,14 +163,14 @@ static char const ntp_keygen_opt_strs[23
 /*  2136 */ "no-load-opts\0"
 /*  2149 */ "no\0"
 /*  2152 */ "NTP_KEYGEN\0"
-/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p370\n"
+/*  2163 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p371\n"
             "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  2279 */ "$HOME\0"
 /*  2285 */ ".\0"
 /*  2287 */ ".ntprc\0"
 /*  2294 */ "http://bugs.ntp.org, bugs at ntp.org\0"
 /*  2328 */ "\n\0"
-/*  2330 */ "ntp-keygen (ntp) 4.2.7p370";
+/*  2330 */ "ntp-keygen (ntp) 4.2.7p371";
 
 /**
  *  imbits option description:
@@ -591,8 +591,8 @@ static char const ntp_keygen_opt_strs[23
 #define MORE_HELP_name  (ntp_keygen_opt_strs+1991)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
-#define MORE_HELP_DESC  NULL
-#define MORE_HELP_name  NULL
+#define MORE_HELP_DESC  HELP_DESC
+#define MORE_HELP_name  HELP_name
 #define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
 #endif
 #ifdef NO_OPTIONAL_OPT_ARGS
@@ -623,6 +623,8 @@ static char const ntp_keygen_opt_strs[23
 #else /* not AUTOKEY */
 # define doOptModulus NULL
 #endif /* def/not AUTOKEY */
+/* extracted from optmain.tlib near line 745 */
+
 #if defined(TEST_NTP_KEYGEN_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -654,7 +656,7 @@ static tOptProc
  */
 #define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
-#endif /* defined(TEST_NTP_KEYGEN_OPTS) */
+#endif /* TEST_NTP_KEYGEN_OPTS */
 #define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -1002,7 +1004,7 @@ static char const * const apzHomeList[3]
 #define zDetail         (NULL)
 /** The full version string for ntp-keygen. */
 #define zFullVersion    (ntp_keygen_opt_strs+2330)
-/* extracted from optcode.tlib near line 371 */
+/* extracted from optcode.tlib near line 364 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -1023,17 +1025,19 @@ static char const * const apzHomeList[3]
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param[in] opts the AutoOpts option description structure
+ * @param[in] od   the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+doUsageOpt(tOptions * opts, tOptDesc * od)
 {
-    optionUsage(&ntp_keygenOptions, NTP_KEYGEN_EXIT_SUCCESS);
+    int ex_code;
+    ex_code = NTP_KEYGEN_EXIT_SUCCESS;
+    optionUsage(&ntp_keygenOptions, ex_code);
     /* NOTREACHED */
-    (void)pOptDesc;
-    (void)pOptions;
+    (void)opts;
+    (void)od;
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -1136,7 +1140,7 @@ doOptModulus(tOptions* pOptions, tOptDes
 #endif /* defined AUTOKEY */
 /* extracted from optmain.tlib near line 46 */
 
-#if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */
+#if defined(TEST_NTP_KEYGEN_OPTS) /* TEST-MAIN-PROCEDURE: */
 
 extern void optionPutShell(tOptions*);
 
@@ -1159,8 +1163,8 @@ main(int argc, char ** argv)
         fputs("output error writing to stdout\n", stderr);
     return res;
 }
-#endif  /* defined TEST_NTP_KEYGEN_OPTS */
-/* extracted from optmain.tlib near line 1254 */
+#endif  /* TEST_NTP_KEYGEN_OPTS END-TEST-MAIN-PROCEDURE */
+/* extracted from optmain.tlib near line 1266 */
 
 /**
  * The directory containing the data associated with ntp-keygen.
@@ -1206,7 +1210,8 @@ tOptions ntp_keygenOptions = {
     + OPTPROC_NO_REQ_OPT
     + OPTPROC_ENVIRON
     + OPTPROC_NO_ARGS
-    + OPTPROC_MISUSE ),
+    + OPTPROC_MISUSE
+    + OPTPROC_SHELL_OUTPUT ),
     0, NULL,                    /* current option index, current option */
     NULL,         NULL,         zPROGNAME,
     zRcName,      zCopyright,   zLicenseDescrip,
@@ -1359,7 +1364,7 @@ static void bogus_function(void) {
      translate option names.
    */
   /* referenced via ntp_keygenOptions.pzCopyright */
-  puts(_("ntp-keygen (ntp) 4.2.7p370\n\
+  puts(_("ntp-keygen (ntp) 4.2.7p371\n\
 Copyright (C) 1970-2013 The University of Delaware, 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\
@@ -1457,14 +1462,14 @@ provided \"as is\" without express or im
   puts(_("load options from a config file"));
 
   /* referenced via ntp_keygenOptions.pzUsageTitle */
-  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p370\n\
+  puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p371\n\
 Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
 
   /* referenced via ntp_keygenOptions.pzExplain */
   puts(_("\n"));
 
   /* referenced via ntp_keygenOptions.pzFullVersion */
-  puts(_("ntp-keygen (ntp) 4.2.7p370"));
+  puts(_("ntp-keygen (ntp) 4.2.7p371"));
 
   /* referenced via ntp_keygenOptions.pzFullUsage */
   puts(_("<<<NOT-FOUND>>>"));
@@ -1472,39 +1477,39 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   /* referenced via ntp_keygenOptions.pzShortUsage */
   puts(_("<<<NOT-FOUND>>>"));
   /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
+#line 45 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
+#line 71 "../autoopts.c"
   puts(_("allocation of %d bytes failed\n"));
 #line 53 "../init.c"
   puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
+#line 90 "../init.c"
   puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
+#line 88 "../init.c"
   puts(_("Automated Options Processing Error!\n"
        "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
+#line 58 "../autoopts.c"
   puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
+#line 92 "../init.c"
   puts(_("\tThis is less than the minimum library version:  "));
 #line 121 "../version.c"
   puts(_("Automated Options version %s\n"
        "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
+#line 82 "../makeshell.c"
   puts(_("(AutoOpts bug):  %s.\n"));
 #line 90 "../reset.c"
   puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
+#line 292 "../usage.c"
   puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
+#line 336 "../autoopts.c"
   puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
+#line 747 "../usage.c"
   puts(_("invalid argument type specified"));
 #line 589 "../find.c"
   puts(_("defaulted to option with optional arg"));
 #line 76 "../alias.c"
   puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
 #line 108 "../find.c"
   puts(_("  The following options match:\n"));
@@ -1514,9 +1519,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: Command line arguments required\n"));
 #line 43 "../alias.c"
   puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
+#line 89 "../makeshell.c"
   puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
+#line 301 "../makeshell.c"
   puts(_("interprocess pipe"));
 #line 168 "../version.c"
   puts(_("error: version option argument '%c' invalid.  Use:\n"
@@ -1543,19 +1548,19 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: illegal option -- %s\n"));
 #line 332 "../find.c"
   puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
+#line 159 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
+#line 169 "../enum.c"
   puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
+#line 746 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
+#line 1080 "../usage.c"
   puts(_("%s error:  invalid option descriptor for %s\n"));
 #line 379 "../find.c"
   puts(_("%s: invalid option name: %s\n"));
 #line 518 "../find.c"
   puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
+#line 156 "../autoopts.c"
   puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
        "\t'%s' and '%s'."));
 #line 94 "../check.c"
@@ -1564,9 +1569,9 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s: The '%s' option cannot have an argument.\n"));
 #line 151 "../check.c"
   puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
+#line 535 "../save.c"
   puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
+#line 234 "../enum.c"
   puts(_("%s error:  '%s' does not match any %s keywords.\n"));
 #line 93 "../reset.c"
   puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -1576,7 +1581,7 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("error %d (%s) stat-ing %s\n"));
 #line 143 "../restore.c"
   puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
+#line 231 "../autoopts.c"
   puts(_("'%s' is not a command line option.\n"));
 #line 114 "../time.c"
   puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
@@ -1588,41 +1593,41 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s error:  The %s option must appear %d times.\n"));
 #line 157 "../numeric.c"
   puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
+#line 200 "../enum.c"
   puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
+#line 329 "../usage.c"
   puts(_("Try '%s %s' for more information.\n"));
 #line 45 "../alias.c"
   puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("standard output"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard output"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard output"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard output"));
 #line 175 "../version.c"
   puts(_("standard output"));
-#line 304 "../usage.c"
+#line 274 "../usage.c"
   puts(_("standard error"));
-#line 451 "../usage.c"
+#line 414 "../usage.c"
   puts(_("standard error"));
-#line 660 "../usage.c"
+#line 624 "../usage.c"
   puts(_("standard error"));
 #line 175 "../version.c"
   puts(_("standard error"));
-#line 195 "../makeshell.c"
+#line 203 "../makeshell.c"
   puts(_("write"));
-#line 930 "../makeshell.c"
+#line 938 "../makeshell.c"
   puts(_("write"));
-#line 303 "../usage.c"
+#line 273 "../usage.c"
   puts(_("write"));
-#line 450 "../usage.c"
+#line 413 "../usage.c"
   puts(_("write"));
-#line 659 "../usage.c"
+#line 623 "../usage.c"
   puts(_("write"));
 #line 174 "../version.c"
   puts(_("write"));
@@ -1638,70 +1643,70 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
 #line 256 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
+#line 534 "../save.c"
   puts(_("%s warning:  cannot save options - %s not regular file\n"));
   /* END-LIBOPTS-MESSAGES */
 
   /* USAGE-TEXT: */
-#line 908 "../usage.c"
+#line 872 "../usage.c"
   puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
+#line 1147 "../usage.c"
   puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
+#line 923 "../usage.c"
   puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
+#line 836 "../usage.c"
   puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
+#line 1116 "../usage.c"
   puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
+#line 1114 "../usage.c"
   puts(_("This option has been disabled"));
-#line 899 "../usage.c"
+#line 863 "../usage.c"
   puts(_("\t\t\t\t- enabled by default\n"));
 #line 40 "../alias.c"
   puts(_("%s error:  only "));
-#line 1221 "../usage.c"
+#line 1193 "../usage.c"
   puts(_(" - examining environment variables named %s_*\n"));
 #line 168 "../file.c"
   puts(_("\t\t\t\t- file must not pre-exist\n"));
 #line 172 "../file.c"
   puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
+#line 379 "../usage.c"
   puts(_("Options are specified by doubled hyphens and their name or by a single\n"
        "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
+#line 916 "../makeshell.c"
   puts(_("\n"
        "= = = = = = = =\n\n"
        "This incarnation of genshell will produce\n"
        "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
+#line 166 "../enum.c"
   puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
+#line 896 "../usage.c"
   puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
+#line 917 "../usage.c"
   puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
+#line 381 "../usage.c"
   puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
+#line 903 "../usage.c"
   puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
+#line 890 "../usage.c"
   puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
+#line 1308 "../usage.c"
   puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
+#line 1244 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
+#line 1302 "../usage.c"
   puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
+#line 1303 "../usage.c"
   puts(_(" %3s %s"));
-#line 1337 "../usage.c"
+#line 1309 "../usage.c"
   puts(_(" %3s %s"));
-#line 423 "../usage.c"
+#line 386 "../usage.c"
   puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
+#line 382 "../usage.c"
   puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
+#line 970 "../usage.c"
   puts(_(" - reading file %s"));
-#line 445 "../usage.c"
+#line 408 "../usage.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
 #line 100 "../version.c"
@@ -1710,17 +1715,17 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
 #line 129 "../version.c"
   puts(_("\n"
        "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
+#line 902 "../usage.c"
   puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
+#line 943 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
+#line 1191 "../usage.c"
   puts(_("\n"
        "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
+#line 681 "../usage.c"
   puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
+#line 676 "../usage.c"
   puts(_("prohibits the option '%s'\n"));
 #line 81 "../numeric.c"
   puts(_("%s%ld to %ld"));
@@ -1738,28 +1743,28 @@ Usage:  %s [ -<flag> [<val>] | --<name>[
   puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
 #line 77 "../numeric.c"
   puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
+#line 389 "../usage.c"
   puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
+#line 651 "../usage.c"
   puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
+#line 654 "../usage.c"
   puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
+#line 1320 "../usage.c"
   puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
+#line 1314 "../usage.c"
   puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
+#line 167 "../enum.c"
   puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
        "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
        "will set them all.  Multiple entries may be passed as an option\n"
        "argument list.\n"));
-#line 945 "../usage.c"
+#line 909 "../usage.c"
   puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
+#line 77 "../enum.c"
   puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
+#line 1151 "../usage.c"
   puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
+#line 772 "../usage.c"
   puts(_("These additional options are:"));
   /* END-USAGE-TEXT */
 }

==== util/ntp-keygen-opts.h ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +9 -11
  NTP_4_2_7P371

--- 1.376/util/ntp-keygen-opts.h	2013-07-06 11:30:49 +00:00
+++ 1.377/util/ntp-keygen-opts.h	2013-07-07 06:34:51 +00:00
@@ -1,11 +1,11 @@
 /*
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *
- *  It has been AutoGen-ed  July  6, 2013 at 11:29:45 AM by AutoGen 5.17.3
+ *  It has been AutoGen-ed  July  7, 2013 at 06:33:43 AM by AutoGen 5.17.5pre10
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 39:0:14 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -53,7 +53,7 @@
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 159744
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -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.7p370"
+#define NTP_KEYGEN_VERSION       "4.2.7p371"
 /** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p370"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p371"
 
 /**
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -106,7 +106,7 @@ typedef enum {
 #define         DESC(n) (ntp_keygenOptions.pOptDesc[INDEX_OPT_## n])
 /** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
+/** The string argument to an option. The argument type must be \"string\". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
 /** Mask the option state revealing how an option was specified.
  *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -133,7 +133,6 @@ typedef enum {
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Enumeration of ntp-keygen exit codes
@@ -144,7 +143,7 @@ typedef enum {
     NTP_KEYGEN_EXIT_USAGE_ERROR     = 64,
     NTP_KEYGEN_EXIT_NO_CONFIG_INPUT = 66,
     NTP_KEYGEN_EXIT_LIBOPTS_FAILURE = 70
-} ntp_keygen_exit_code_t;
+}   ntp_keygen_exit_code_t;
 /** @} */
 /**
  *  Make sure there are no #define name conflicts with the option names
@@ -258,7 +257,6 @@ typedef enum {
 # undef MV_KEYS
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  *  Interface defines for specific options.
  * @{
@@ -322,10 +320,9 @@ typedef enum {
 #define ERRSTOP_OPTERR  STMTS(ntp_keygenOptions.fOptSet |= OPTPROC_ERRSTOP)
 #define RESTART_OPT(n)  STMTS( \
                 ntp_keygenOptions.curOptIdx = (n); \
-                ntp_keygenOptions.pzCurOpt  = NULL)
+                ntp_keygenOptions.pzCurOpt  = NULL )
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntp_keygenOptions.pUsageProc)(&ntp_keygenOptions, c)
-/* extracted from opthead.tlib near line 538 */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -380,4 +377,5 @@ static inline char* aoGetsText(char cons
 }
 #endif
 #endif /* AUTOOPTS_NTP_KEYGEN_OPTS_H_GUARD */
+
 /* ntp-keygen-opts.h ends here */

==== util/ntp-keygen.1ntp-keygenman ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +36 -35
  NTP_4_2_7P371

--- 1.190/util/ntp-keygen.1ntp-keygenman	2013-07-06 11:30:49 +00:00
+++ 1.191/util/ntp-keygen.1ntp-keygenman	2013-07-07 06:34:51 +00:00
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "06 Jul 2013" "ntp (4.2.7p370)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "07 Jul 2013" "ntp (4.2.7p371)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:54 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:57 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -65,23 +65,23 @@ If no password is specified, the host na
 function, normally the DNS name of the host is used.
 .PP
 The
-\fIpw\fR
+IpwR
 option of the
-\fIcrypto\fR
+IcryptoR
 configuration command specifies the read
 password for previously encrypted local files.
 This must match the local password used by this program.
 If not specified, the host name is used.
 Thus, if files are generated by this program without password,
 they can be read back by
-\fIntpd\fR
+IntpdR
 without password but only on the same host.
 .PP
 Normally, encrypted files for each host are generated by that host and
 used only by that host, although exceptions exist as noted later on
 this page.
 The symmetric keys file, normally called
-\fIntp.keys ,\fR
+Intp.keys ,R
 is usually installed in
 .Pa /etc .
 Other files and links are usually installed in
@@ -89,20 +89,20 @@ Other files and links are usually instal
 which is normally in a shared filesystem in
 NFS-mounted networks and cannot be changed by shared clients.
 The location of the keys directory can be changed by the
-\fIkeysdir\fR
+IkeysdirR
 configuration command in such cases.
 Normally, this is in
 .Pa /etc .
 .PP
 This program directs commentary and error messages to the standard
 error stream
-\fIstderr\fR
+IstderrR
 and remote files to the standard output stream
-\fIstdout\fR
+IstdoutR
 where they can be piped to other applications or redirected to files.
 The names used for generated files and links all begin with the
 string
-\fIntpkey\fR
+IntpkeyR
 and include the file type, generating host and filestamp,
 as described in the
 .Dq Cryptographic Data Files
@@ -112,7 +112,7 @@ To test and gain experience with Autokey
 change to the keys directory, usually
 .Pa /usr/local/etc 
 When run for the first time, or if all files with names beginning with
-\fIntpkey\fR
+IntpkeyR
 have been removed, use the
 .B 
 command without arguments to generate a
@@ -179,12 +179,12 @@ these files can be read by that host wit
 File names begin with the prefix
 .Cm ntpkey_
 and end with the postfix
-\fI_hostname.filestamp ,\fR
+I_hostname.filestamp ,R
 where
-\fIhostname\fR
+IhostnameR
 is the owner name, usually the string returned
 by the Unix gethostname() routine, and
-\fIfilestamp\fR
+IfilestampR
 is the NTP seconds when the file was generated, in decimal digits.
 This both guarantees uniqueness and simplifies maintenance
 procedures, since all files can be quickly removed
@@ -193,7 +193,7 @@ by a
 command or all files generated
 at a specific time can be removed by a
 .Ic rm
-\fI\&*filestamp\fR
+I\&*filestampR
 command.
 To further reduce the risk of misconfiguration,
 the first two lines of a file contain the file name
@@ -482,7 +482,7 @@ scheme than the default, run
 with the
 S Ar type
 option, where
-\fItype\fR
+ItypeR
 is either
 .Cm RSA
 or
@@ -494,7 +494,7 @@ run
 with the
 c Ar scheme
 option and selected
-\fIscheme\fR
+IschemeR
 as needed.
 f
 .B 
@@ -630,18 +630,18 @@ On TA trish run
 V Ar n
 p Ar password ,
 where
-\fIn\fR
+InR
 is the number of revokable keys (typically 5) to produce
 the parameter file
 .Pa ntpkeys_MVpar_ Ns Ar trish.filestamp
 and client key files
 .Pa ntpkeys_MVkeyd_ Ns Ar trish.filestamp
 where
-\fId\fR
+IdR
 is the key number (0 \&<
-\fId\fR
+IdR
 \&<
-\fIn ) .\fR
+In ) .R
 Copy the parameter file to alice and install a soft link
 from the generic
 .Pa ntpkey_mv_ Ns Ar alice
@@ -661,7 +661,7 @@ these files can be refreshed as needed.
 .BR Fl c Ar scheme
 Select certificate message digest/signature encryption scheme.
 The
-\fIscheme\fR
+IschemeR
 can be one of the following:
 . Cm RSA-MD2 , RSA-MD5 , RSA-SHA , RSA-SHA1 , RSA-MDC2 , RSA-RIPEMD160 , DSA-SHA ,
 or
@@ -697,7 +697,7 @@ obsoleting any that may exist.
 .TP
 .BR Fl i Ar name
 Set the suject name to
-\fIname .\fR
+Iname .R
 This is used as the subject field in certificates
 and in the file name for host and sign keys.
 .TP
@@ -710,7 +710,7 @@ By default, the program generates public
 .TP
 .BR Fl p Ar password
 Encrypt generated files containing private data with
-\fIpassword\fR
+IpasswordR
 and the DES-CBC algorithm.
 .TP
 .BR Fl q
@@ -723,7 +723,7 @@ By default, the program uses the host ke
 .TP
 .BR Fl s Ar name
 Set the issuer name to
-\fIname .\fR
+Iname .R
 This is used for the issuer field in certificates
 and in the file name for identity files.
 .TP
@@ -805,11 +805,11 @@ Following hte heard the keys are
 entered one per line in the format
 .D1 Ar keyno type key
 where
-\fIkeyno\fR
+IkeynoR
 is a positive integer in the range 1-65,535,
-\fItype\fR
+ItypeR
 is the string MD5 defining the key format and
-\fIkey\fR
+IkeyR
 is the key itself,
 which is a printable ASCII string 16 characters or less in length.
 Each character is chosen from the 93 printable characters
@@ -1016,17 +1016,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -1109,7 +1110,7 @@ Please report bugs to http://bugs.ntp.or
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP

==== util/ntp-keygen.1ntp-keygenmdoc ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/util/ntp-keygen.1ntp-keygenmdoc	2013-07-06 11:30:49 +00:00
+++ 1.191/util/ntp-keygen.1ntp-keygenmdoc	2013-07-07 06:34:51 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:30:01 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:34:04 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -982,15 +982,16 @@ This option has not been fully documente
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -1072,7 +1073,7 @@ Please report bugs to http://bugs.ntp.or
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP

==== util/ntp-keygen.html ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +2 -2
  NTP_4_2_7P371

--- 1.39/util/ntp-keygen.html	2013-07-06 11:30:49 +00:00
+++ 1.40/util/ntp-keygen.html	2013-07-07 06:34:51 +00:00
@@ -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.
 
-  <p>This document applies to version 4.2.7p370 of <code>ntp-keygen</code>.
+  <p>This document applies to version 4.2.7p371 of <code>ntp-keygen</code>.
 
 <div class="node">
 <p><hr>
@@ -1120,7 +1120,7 @@ the usage text by passing it through a p
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p369
+<pre class="example">ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p370
 Usage:  ntp-keygen [ -<flag> [<val>] | --<name>[{=| }<val>] ]...
   Flg Arg Option-Name    Description
    -b Num imbits         identity modulus bits

==== util/ntp-keygen.man.in ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +36 -35
  NTP_4_2_7P371

--- 1.190/util/ntp-keygen.man.in	2013-07-06 11:30:49 +00:00
+++ 1.191/util/ntp-keygen.man.in	2013-07-07 06:34:51 +00:00
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "06 Jul 2013" "ntp (4.2.7p370)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "07 Jul 2013" "ntp (4.2.7p371)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:29:54 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:33:57 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -65,23 +65,23 @@ If no password is specified, the host na
 function, normally the DNS name of the host is used.
 .PP
 The
-\fIpw\fR
+IpwR
 option of the
-\fIcrypto\fR
+IcryptoR
 configuration command specifies the read
 password for previously encrypted local files.
 This must match the local password used by this program.
 If not specified, the host name is used.
 Thus, if files are generated by this program without password,
 they can be read back by
-\fIntpd\fR
+IntpdR
 without password but only on the same host.
 .PP
 Normally, encrypted files for each host are generated by that host and
 used only by that host, although exceptions exist as noted later on
 this page.
 The symmetric keys file, normally called
-\fIntp.keys ,\fR
+Intp.keys ,R
 is usually installed in
 .Pa /etc .
 Other files and links are usually installed in
@@ -89,20 +89,20 @@ Other files and links are usually instal
 which is normally in a shared filesystem in
 NFS-mounted networks and cannot be changed by shared clients.
 The location of the keys directory can be changed by the
-\fIkeysdir\fR
+IkeysdirR
 configuration command in such cases.
 Normally, this is in
 .Pa /etc .
 .PP
 This program directs commentary and error messages to the standard
 error stream
-\fIstderr\fR
+IstderrR
 and remote files to the standard output stream
-\fIstdout\fR
+IstdoutR
 where they can be piped to other applications or redirected to files.
 The names used for generated files and links all begin with the
 string
-\fIntpkey\fR
+IntpkeyR
 and include the file type, generating host and filestamp,
 as described in the
 .Dq Cryptographic Data Files
@@ -112,7 +112,7 @@ To test and gain experience with Autokey
 change to the keys directory, usually
 .Pa /usr/local/etc 
 When run for the first time, or if all files with names beginning with
-\fIntpkey\fR
+IntpkeyR
 have been removed, use the
 .B 
 command without arguments to generate a
@@ -179,12 +179,12 @@ these files can be read by that host wit
 File names begin with the prefix
 .Cm ntpkey_
 and end with the postfix
-\fI_hostname.filestamp ,\fR
+I_hostname.filestamp ,R
 where
-\fIhostname\fR
+IhostnameR
 is the owner name, usually the string returned
 by the Unix gethostname() routine, and
-\fIfilestamp\fR
+IfilestampR
 is the NTP seconds when the file was generated, in decimal digits.
 This both guarantees uniqueness and simplifies maintenance
 procedures, since all files can be quickly removed
@@ -193,7 +193,7 @@ by a
 command or all files generated
 at a specific time can be removed by a
 .Ic rm
-\fI\&*filestamp\fR
+I\&*filestampR
 command.
 To further reduce the risk of misconfiguration,
 the first two lines of a file contain the file name
@@ -482,7 +482,7 @@ scheme than the default, run
 with the
 S Ar type
 option, where
-\fItype\fR
+ItypeR
 is either
 .Cm RSA
 or
@@ -494,7 +494,7 @@ run
 with the
 c Ar scheme
 option and selected
-\fIscheme\fR
+IschemeR
 as needed.
 f
 .B 
@@ -630,18 +630,18 @@ On TA trish run
 V Ar n
 p Ar password ,
 where
-\fIn\fR
+InR
 is the number of revokable keys (typically 5) to produce
 the parameter file
 .Pa ntpkeys_MVpar_ Ns Ar trish.filestamp
 and client key files
 .Pa ntpkeys_MVkeyd_ Ns Ar trish.filestamp
 where
-\fId\fR
+IdR
 is the key number (0 \&<
-\fId\fR
+IdR
 \&<
-\fIn ) .\fR
+In ) .R
 Copy the parameter file to alice and install a soft link
 from the generic
 .Pa ntpkey_mv_ Ns Ar alice
@@ -661,7 +661,7 @@ these files can be refreshed as needed.
 .BR Fl c Ar scheme
 Select certificate message digest/signature encryption scheme.
 The
-\fIscheme\fR
+IschemeR
 can be one of the following:
 . Cm RSA-MD2 , RSA-MD5 , RSA-SHA , RSA-SHA1 , RSA-MDC2 , RSA-RIPEMD160 , DSA-SHA ,
 or
@@ -697,7 +697,7 @@ obsoleting any that may exist.
 .TP
 .BR Fl i Ar name
 Set the suject name to
-\fIname .\fR
+Iname .R
 This is used as the subject field in certificates
 and in the file name for host and sign keys.
 .TP
@@ -710,7 +710,7 @@ By default, the program generates public
 .TP
 .BR Fl p Ar password
 Encrypt generated files containing private data with
-\fIpassword\fR
+IpasswordR
 and the DES-CBC algorithm.
 .TP
 .BR Fl q
@@ -723,7 +723,7 @@ By default, the program uses the host ke
 .TP
 .BR Fl s Ar name
 Set the issuer name to
-\fIname .\fR
+Iname .R
 This is used for the issuer field in certificates
 and in the file name for identity files.
 .TP
@@ -805,11 +805,11 @@ Following hte heard the keys are
 entered one per line in the format
 .D1 Ar keyno type key
 where
-\fIkeyno\fR
+IkeynoR
 is a positive integer in the range 1-65,535,
-\fItype\fR
+ItypeR
 is the string MD5 defining the key format and
-\fIkey\fR
+IkeyR
 is the key itself,
 which is a printable ASCII string 16 characters or less in length.
 Each character is chosen from the 93 printable characters
@@ -1016,17 +1016,18 @@ Display usage information and exit.
 .BR \-! , " \-\-more-help"
 Pass the extended usage information through a pager.
 .TP
-.BR \-> " [\fIrcfile\fP]," " \-\-save-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.BR \-> " [\fIcfgfile\fP]," " \-\-save-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
+The command will exit after updating the config file.
 .TP
-.BR \-< " \fIrcfile\fP," " \-\-load-opts" "=\fIrcfile\fP," " \-\-no-load-opts"
-Load options from \fIrcfile\fP.
+.BR \-< " \fIcfgfile\fP," " \-\-load-opts" "=\fIcfgfile\fP," " \-\-no-load-opts"
+Load options from \fIcfgfile\fP.
 The \fIno-load-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no-load-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no-load-opts\fP is handled early,
 out of order.
 .TP
-.BR \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.BR \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -1109,7 +1110,7 @@ Please report bugs to http://bugs.ntp.or
 .PP
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .SH NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .PP
 This manual page was \fIAutoGen\fP-erated from the \fBntp-keygen\fP

==== util/ntp-keygen.mdoc.in ====
2013-07-07 06:34:51+00:00, stenn at deacon.udel.edu +10 -9
  NTP_4_2_7P371

--- 1.190/util/ntp-keygen.mdoc.in	2013-07-06 11:30:49 +00:00
+++ 1.191/util/ntp-keygen.mdoc.in	2013-07-07 06:34:51 +00:00
@@ -1,9 +1,9 @@
-.Dd July 6 2013
+.Dd July 7 2013
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"
-.\"  It has been AutoGen-ed  July  6, 2013 at 11:30:01 AM by AutoGen 5.17.3
+.\"  It has been AutoGen-ed  July  7, 2013 at 06:34:04 AM by AutoGen 5.17.5pre10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -982,15 +982,16 @@ This option has not been fully documente
 Display usage information and exit.
 .It \-! , " \-\-more\-help"
 Pass the extended usage information through a pager.
-.It \-> " [\fIrcfile\fP]," " \-\-save\-opts" "[=\fIrcfile\fP]"
-Save the option state to \fIrcfile\fP.  The default is the \fIlast\fP
+.It \-> " [\fIcfgfile\fP]," " \-\-save\-opts" "[=\fIcfgfile\fP]"
+Save the option state to \fIcfgfile\fP.  The default is the \fIlast\fP
 configuration file listed in the \fBOPTION PRESETS\fP section, below.
-.It \-< " \fIrcfile\fP," " \-\-load\-opts" "=\fIrcfile\fP," " \-\-no\-load\-opts"
-Load options from \fIrcfile\fP.
+The command will exit after updating the config file.
+.It \-< " \fIcfgfile\fP," " \-\-load\-opts" "=\fIcfgfile\fP," " \-\-no\-load\-opts"
+Load options from \fIcfgfile\fP.
 The \fIno\-load\-opts\fP form will disable the loading
-of earlier RC/INI files.  \fI\-\-no\-load\-opts\fP is handled early,
+of earlier config/rc/ini files.  \fI\-\-no\-load\-opts\fP is handled early,
 out of order.
-.It \- " [{\fIv|c|n\fP}]," " \-\-version" "[=\fI{v|c|n}\fP]"
+.It \-\-version "[={\fIv|c|n\fP}]"
 Output version of program and exit.  The default mode is `v', a simple
 version.  The `c' mode will print copyright information and `n' will
 print the full copyright notice.
@@ -1072,7 +1073,7 @@ Please report bugs to http://bugs.ntp.or
 .Pp
 Please send bug reports to: http://bugs.ntp.org, bugs at ntp.org
 .Sh NOTES
-This document corresponds to version 4.2.7p370 of NTP.
+This document corresponds to version 4.2.7p371 of NTP.
 Portions of this document came from FreeBSD.
 .Pp
 This manual page was \fIAutoGen\fP\-erated from the \fBntp\-keygen\fP


More information about the bk-ntp-dev-send mailing list