ChangeLog, configure, cmd_args.c:

  * ntpd/cmd_args.c (getCmdOpts): Crack -N at pre-scan, as we do the
  priority wiggle before the final scan.
  From: Tom Smith <smith@cag.lkg.dec.com>
  We might do better to move the priority wiggle to after the final
  scan.  Especially if we want to permit command-line options to
  have decent control over the priority.  When we rewrite the config
  file stuff we might go to a multi-scan to solve some of these
  problems.

bk: 39a03650IBPllxFqjYOKhHqA9k9ZAw

diff --git a/ChangeLog b/ChangeLog
index 6f282cfe266bdd8107a56cd6fff2a954b04858bf..543d80307b08872238ef2d456b61594c58c70056 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-08-20  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/cmd_args.c (getCmdOpts): Crack -N at pre-scan, as we do the
+       priority wiggle before the final scan.
+       From: Tom Smith <smith@cag.lkg.dec.com>
+       We might do better to move the priority wiggle to after the final
+       scan.  Especially if we want to permit command-line options to
+       have decent control over the priority.  When we rewrite the config
+       file stuff we might go to a multi-scan to solve some of these
+       problems.
+
 2000-08-19  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: '99k6, and manually fix configure.

diff --git a/configure b/configure
index 888acfec69186de3d9a1896f745aa06fd7b01ada..50a4beb46bfb14c637364173600d0ce741175f68 100755 (executable)
--- a/configure
+++ b/configure
@@ -4874,7 +4874,7 @@ int
 main ()
 {
 struct ntptimeval foo;
-foo.time.tv_nsec;
+foo.tv_nsec;
   ;
   return 0;
 }

diff --git a/ntpd/cmd_args.c b/ntpd/cmd_args.c
index 538a2e025f95a11d8b49b0a6f230dec39b5dbeb9..2579ee9802a8e37e67496c4e2faa21cb225736c9 100644 (file)
--- a/ntpd/cmd_args.c
+++ b/ntpd/cmd_args.c
@@ -28,6 +28,7 @@ getstartup(
        )
 {
        int errflg;
+       extern int priority_done;
        int c;
 
 #ifdef DEBUG
@@ -100,6 +101,10 @@ getstartup(
                    ++nofork;
                    break;
 
+               case 'N':
+                   priority_done = strcmp(ntp_optarg, "high");
+                   break;
+
                case '?':
                    ++errflg;
                    break;
@@ -142,7 +147,6 @@ getCmdOpts(
        )
 {
        extern char *config_file;
-       extern int priority_done;
        int errflg;
        int c;
 
@@ -221,8 +225,7 @@ getCmdOpts(
                    case 'n':   /* already done at pre-scan */
                        break;
 
-                   case 'N':
-                       priority_done = strcmp(ntp_optarg, "high");
+                   case 'N':   /* already done at pre-scan */
                        break;
 
                    case 'p':