From: Frank Kardel <kardel@ntp.org>
Date: Mon, 20 Mar 2006 13:42:13 +0000 (+0000)
Subject: Merge bk://www.ntp.org/home/bk/ntp-dev
X-Git-Tag: NTP_4_2_3P2~5^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc6387ce192c6c32422c72500594a107d0a037e4;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/home/bk/ntp-dev
into  pogo.udel.edu:/pogo/users/kardel/dynamic-if/ntp-dev

bk: 441eb1358tozl1qaQHD_bgYWibKKiQ
---

cc6387ce192c6c32422c72500594a107d0a037e4
diff --cc ntpd/ntp_restrict.c
index eb454e20d,04013a1d3..30b6ac419
--- a/ntpd/ntp_restrict.c
+++ b/ntpd/ntp_restrict.c
@@@ -570,8 -568,8 +570,8 @@@ hack_restrict
  			 */
  			if (rl6 != 0 &&
  			    !IN6_IS_ADDR_UNSPECIFIED(&rl6->addr6)
 -			    && !(rl6->mflags & RESM_INTERFACE)) {
 +			    && !(rl6->mflags & RESM_INTERFACE && op != RESTRICT_REMOVEIF)) {
- 				if (rlprev6) {
+ 				if (rlprev6 != NULL) {
  					rlprev6->next = rl6->next;
  				} else {
  					restrictlist6 = rl6->next;