]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
proto_config() needs a 4th arg in the IPv6 code.
authorHarlan Stenn <stenn@ntp.org>
Tue, 20 Nov 2001 02:58:25 +0000 (21:58 -0500)
committerHarlan Stenn <stenn@ntp.org>
Tue, 20 Nov 2001 02:58:25 +0000 (21:58 -0500)
bk: 3bf9c6d1EXgvXrKdHscf3xKY1RIrpQ

1  2 
include/ntp_request.h
ntpd/ntp_config.c
ntpd/ntp_request.c

Simple merge
Simple merge
index 5157cb14be4aa1a7c1cb118f283bc495efc5c7e9,bec8202ac2bdd43d2fc5e62a1cc5b7c045d6c5a3..b6234b626b173b69f9e38c75c4c857ec056839c5
@@@ -1454,27 -1433,32 +1454,32 @@@ setclr_flags
  
        if (flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS |
                      SYS_FLAG_NTP | SYS_FLAG_KERNEL | SYS_FLAG_MONITOR |
-                     SYS_FLAG_FILEGEN)) {
+                     SYS_FLAG_FILEGEN | SYS_FLAG_AUTH | SYS_FLAG_CAL)) {
                msyslog(LOG_ERR, "setclr_flags: extra flags: %#x",
 -                      flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS | 
 +                      flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS |
                                  SYS_FLAG_NTP | SYS_FLAG_KERNEL |
-                                 SYS_FLAG_MONITOR | SYS_FLAG_FILEGEN));
+                                 SYS_FLAG_MONITOR | SYS_FLAG_FILEGEN |
+                                 SYS_FLAG_AUTH | SYS_FLAG_CAL));
                req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
                return;
        }
  
        if (flags & SYS_FLAG_BCLIENT)
-           proto_config(PROTO_BROADCLIENT, set, 0., NULL);
 -              proto_config(PROTO_BROADCLIENT, set, 0.);
++              proto_config(PROTO_BROADCLIENT, set, 0., NULL);
        if (flags & SYS_FLAG_PPS)
-           proto_config(PROTO_PPS, set, 0., NULL);
 -              proto_config(PROTO_PPS, set, 0.);
++              proto_config(PROTO_PPS, set, 0., NULL);
        if (flags & SYS_FLAG_NTP)
-           proto_config(PROTO_NTP, set, 0., NULL);
 -              proto_config(PROTO_NTP, set, 0.);
++              proto_config(PROTO_NTP, set, 0., NULL);
        if (flags & SYS_FLAG_KERNEL)
-           proto_config(PROTO_KERNEL, set, 0., NULL);
 -              proto_config(PROTO_KERNEL, set, 0.);
++              proto_config(PROTO_KERNEL, set, 0., NULL);
        if (flags & SYS_FLAG_MONITOR)
-           proto_config(PROTO_MONITOR, set, 0., NULL);
 -              proto_config(PROTO_MONITOR, set, 0.);
++              proto_config(PROTO_MONITOR, set, 0., NULL);
        if (flags & SYS_FLAG_FILEGEN)
-           proto_config(PROTO_FILEGEN, set, 0., NULL);
 -              proto_config(PROTO_FILEGEN, set, 0.);
++              proto_config(PROTO_FILEGEN, set, 0., NULL);
+       if (flags & SYS_FLAG_AUTH)
 -              proto_config(PROTO_AUTHENTICATE, set, 0.);
++              proto_config(PROTO_AUTHENTICATE, set, 0., NULL);
+       if (flags & SYS_FLAG_CAL)
 -              proto_config(PROTO_CAL, set, 0.);
++              proto_config(PROTO_CAL, set, 0., NULL);
        req_ack(srcadr, inter, inpkt, INFO_OKAY);
  }