ChangeLog, configure, configure.in, confopt.htm, ntpd.htm, ntp_config.c:

  * configure.in: 4.0.99j5
  * html/ntpd.htm (HREF): Document other missing command-line options
  * html/ntpd.htm (HREF): Document
  * html/confopt.htm (href): Undocument
  * ntpd/ntp_config.c (getconfig): -N high for high-priority.
  Lose the ntp.conf way of setting priority.

bk: 39750c167WJpiNJwZ0f4Lu-JdCy09A

diff --git a/ChangeLog b/ChangeLog
index 30c691b0184a9feeb64e2fc8b0648c4cc509f87e..ba206608992cb9b395c720ae532e037353b36ce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2000-07-18  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in: 4.0.99j5
+
+       * html/ntpd.htm (HREF): Document other missing command-line options
+
+       * html/ntpd.htm (HREF): Document
+       * html/confopt.htm (href): Undocument
+       * ntpd/ntp_config.c (getconfig): -N high for high-priority.
+       Lose the ntp.conf way of setting priority.
+       
        * ntpd/ntp_crypto.c: PUBKEY/AUTOKEY cleanup
        From Dave Mills
 

diff --git a/configure b/configure
index 8a70645be697428fb1a792aadc33fee5c2d396d6..2f3c8c55117062418c17ddcd565dcacb50965b41 100755 (executable)
--- a/configure
+++ b/configure
@@ -1091,7 +1091,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.99j4
+VERSION=4.0.99j5
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then

diff --git a/configure.in b/configure.in
index fcccf771b9fa74cdf149a14f9f387b7ada802226..39d53c14db181e20fda530579d4f509cabc8cef3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99j4)
+AM_INIT_AUTOMAKE(ntp, 4.0.99j5)
 AC_PREREQ(2.14)
 
 ac_cv_var_oncore_ok=no

diff --git a/html/confopt.htm b/html/confopt.htm
index aa92d77cc0a0375827fbb10ac39725c9c71178c6..e3a8a629807ac5135630690c20037373857c82ad 100644 (file)
--- a/html/confopt.htm
+++ b/html/confopt.htm
@@ -204,12 +204,6 @@ command operates in the same way as the <tt>broadcastclient</tt>
 command, but uses IP multicasting. Support for this command requires
 multicast kernel support.</dd>
 
-<dt><tt>priority <i>mode</i></tt>
-<dd>This directive controls the CPU priority of the local server.  At
-present, choices for <i>mode</i> are either <tt>high</tt> or
-<tt>normal</tt> (the default).  
-</dd>
-
 </dl>
 
 <h4>Bugs</h4>

diff --git a/html/ntpd.htm b/html/ntpd.htm
index b67c783f434ac36ee439afea6374baad77cfc647..70966a91d40b21cf8eb3d373d71e9d72cd600aea 100644 (file)
--- a/html/ntpd.htm
+++ b/html/ntpd.htm
@@ -7,9 +7,10 @@
 <H4>Synopsis</H4>
 
 <TT>ntpd [ -aAbdm ] [ -c <I>conffile</I> ] [ -f <I>driftfile</I> ] [ -g
-] [ -k <I>keyfile</I> ] [ -l <I>logfile</I> ] [ -p <I>pidfile</I> ] [ -r
-<I>broadcastdelay</I> ] [ -s <I>statsdir</I> ] [ -t <I>key</I> ] [ -v
-<I>variable</I> ] [ -V <I>variable</I> ] [ -x ]</TT>
+] [ -k <I>keyfile</I> ] [ -l <I>logfile</I> ] [ -N high ] [ -p
+<I>pidfile</I> ] [ -r <I>broadcastdelay</I> ] [ -s <I>statsdir</I> ] [
+-t <I>key</I> ] [ -v <I>variable</I> ] [ -V <I>variable</I> ] [ -x
+]</TT>
 
 <H4>Description</H4>
 
@@ -70,7 +71,8 @@ and if it's zero <TT>ntpd</TT> will set the <TT>umask</TT> to
 <DD>Synchronize using NTP broadcast messages.</DD>
 
 <DT><TT>-c <I>conffile</I></TT></DT>
-<DD>Specify the name and path of the configuration file.</DD>
+<DD>Specify the name and path of the configuration file.
+(Disable netinfo?)</DD>
 
 <DT><TT>-d</TT></DT>
 <DD>Specify debugging mode. This flag may occur multiple times, with
@@ -96,10 +98,20 @@ authentication keys.</DD>
 <DD>Specify the name and path of the log file. The default is the system
 log facility.</DD>
 
+<DT><TT>-L</TT></DT>
+<DD>Listen to virtual IPs.</DD>
+
 <DT><TT>-m</TT></DT>
 <DD>Synchronize using NTP multicast messages on the IP multicast group
 address 224.0.1.1 (requires multicast kernel).</DD>
 
+<DT><TT>-n</TT></DT>
+<DD>Don't fork.</DD>
+
+<DT><TT>-N high</TT></DT>
+<DD>To the extent permitted by the operating system, run the daemon at a
+high priority.</DD>
+
 <DT><TT>-p <I>pidfile</I></TT></DT>
 <DD>Specify the name and path to record the daemon's process ID.</DD>
 

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 66db3e17b0c6e28199580271ae0e6ef04e16cea6..0225127c65407fb8985b301582fd6d41efcb56c7 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -144,7 +144,6 @@ extern int priority_done;
 #ifdef PUBKEY
 #define CONFIG_CRYPTO          34
 #endif /* PUBKEY */
-#define CONFIG_PRIORITY                35
 
 /*
  * "peer", "server", "broadcast" modifier keywords
@@ -265,7 +264,6 @@ static      struct keyword keywords[] = {
        { "phone",              CONFIG_PHONE },
        { "pidfile",            CONFIG_PIDFILE },
        { "pps",                CONFIG_PPS },
-       { "priority",           CONFIG_PRIORITY },
        { "requestkey",         CONFIG_REQUESTKEY },
        { "restrict",           CONFIG_RESTRICT },
        { "revoke",             CONFIG_REVOKE },
@@ -482,7 +480,7 @@ int config_priority_override = 0;
 int    config_priority;
 #endif
 
-static const char *ntp_options = "aAbc:dD:f:gk:l:Lmnp:P:r:s:t:v:V:x";
+static const char *ntp_options = "aAbc:dD:f:gk:l:LmnN:p:P:r:s:t:v:V:x";
 
 #ifdef HAVE_NETINFO
 /*
@@ -853,6 +851,10 @@ getconfig(
                    case 'n':   /* already done at pre-scan */
                        break;
 
+                   case 'N':
+                       priority_done = strcmp(ntp_optarg, "high");
+                       break;
+
                    case 'p':
                        stats_config(STATS_PID_FILE, ntp_optarg);
                        break;
@@ -1179,13 +1181,6 @@ getconfig(
                            stats_config(STATS_PID_FILE, (char *)0);
                        break;
 
-                   case CONFIG_PRIORITY:
-                       if (ntokens >= 1)
-                               priority_done = strcmp(tokens[1], "high");
-                       else
-                               priority_done = 1;
-                       break;
-
                    case CONFIG_LOGFILE:
                        if (ntokens >= 2) {
                                FILE *new_file;