From: Frank Kardel <kardel@ntp.org>
Date: Thu, 13 Apr 2006 06:35:53 +0000 (+0000)
Subject: Merge bk://www.ntp.org/home/bk/ntp-dev
X-Git-Tag: NTP_4_2_3P2~5^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c9c851324d44a6ee91f34d549b20cc5c4dd4771;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: 443df149hwOmstlgCFMx3XD5d3K7pw
---

6c9c851324d44a6ee91f34d549b20cc5c4dd4771
diff --cc ntpd/ntp_restrict.c
index 30b6ac419,0f37c1614..23f50392d
--- a/ntpd/ntp_restrict.c
+++ b/ntpd/ntp_restrict.c
@@@ -477,8 -481,12 +482,12 @@@ hack_restrict
  			 */
  			if (rl != 0
  			    && rl->addr != htonl(INADDR_ANY)
 -			    && !(rl->mflags & RESM_INTERFACE)) {
 +			    && !(rl->mflags & RESM_INTERFACE && op != RESTRICT_REMOVEIF)) {
- 				rlprev->next = rl->next;
+ 				if (rlprev != NULL) {
+ 					rlprev->next = rl->next;
+ 				} else {
+ 					restrictlist = rl->next;
+ 				}
  				restrictcount--;
  				if (rl->flags & RES_LIMITED) {
  					res_limited_refcnt--;