From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Nov 2001 02:58:25 +0000 (-0500)
Subject: proto_config() needs a 4th arg in the IPv6 code.
X-Git-Tag: NTP_4_1_73~231^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e759e1d0dace3ce4f2d60799e07c752410299b;p=thirdparty%2Fntp.git

proto_config() needs a 4th arg in the IPv6 code.

bk: 3bf9c6d1EXgvXrKdHscf3xKY1RIrpQ
---

f2e759e1d0dace3ce4f2d60799e07c752410299b
diff --cc ntpd/ntp_request.c
index 5157cb14be,bec8202ac2..b6234b626b
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@@ -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);
  }