From: Harlan Stenn Date: Wed, 19 Jul 2000 02:01:58 +0000 (-0000) Subject: ChangeLog, configure, configure.in, confopt.htm, ntpd.htm, ntp_config.c: X-Git-Tag: NTP_4_0_99_K~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=638fde0b793dc0fbadae8cb173b5cefe8ba9b4e3;p=thirdparty%2Fntp.git 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 30c691b018..ba20660899 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2000-07-18 Harlan Stenn + * 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 8a70645be6..2f3c8c5511 100755 --- 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 fcccf771b9..39d53c14db 100644 --- 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 aa92d77cc0..e3a8a62980 100644 --- a/html/confopt.htm +++ b/html/confopt.htm @@ -204,12 +204,6 @@ command operates in the same way as the broadcastclient command, but uses IP multicasting. Support for this command requires multicast kernel support. -
priority mode -
This directive controls the CPU priority of the local server. At -present, choices for mode are either high or -normal (the default). -
-

Bugs

diff --git a/html/ntpd.htm b/html/ntpd.htm index b67c783f43..70966a91d4 100644 --- a/html/ntpd.htm +++ b/html/ntpd.htm @@ -7,9 +7,10 @@

Synopsis

ntpd [ -aAbdm ] [ -c conffile ] [ -f driftfile ] [ -g -] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -r -broadcastdelay ] [ -s statsdir ] [ -t key ] [ -v -variable ] [ -V variable ] [ -x ] +] [ -k keyfile ] [ -l logfile ] [ -N high ] [ -p +pidfile ] [ -r broadcastdelay ] [ -s statsdir ] [ +-t key ] [ -v variable ] [ -V variable ] [ -x +]

Description

@@ -70,7 +71,8 @@ and if it's zero ntpd will set the umask to
Synchronize using NTP broadcast messages.
-c conffile
-
Specify the name and path of the configuration file.
+
Specify the name and path of the configuration file. +(Disable netinfo?)
-d
Specify debugging mode. This flag may occur multiple times, with @@ -96,10 +98,20 @@ authentication keys.
Specify the name and path of the log file. The default is the system log facility.
+
-L
+
Listen to virtual IPs.
+
-m
Synchronize using NTP multicast messages on the IP multicast group address 224.0.1.1 (requires multicast kernel).
+
-n
+
Don't fork.
+ +
-N high
+
To the extent permitted by the operating system, run the daemon at a +high priority.
+
-p pidfile
Specify the name and path to record the daemon's process ID.
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c index 66db3e17b0..0225127c65 100644 --- 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;