Merge bk://www.ntp.org/home/bk/ntp-dev

into  pogo.udel.edu:/pogo/users/kardel/dynamic-if/ntp-dev

bk: 443df149hwOmstlgCFMx3XD5d3K7pw

diff --cc ntpd/ntp_restrict.c
index 30b6ac419cc321b8c37d69b0376999745e9fe0a6,0f37c1614ec28301b946404fb31d16328173d18e..23f50392dd9eb9ae314f9d513497a57be3bc5304
--- 1/ntpd/ntp_restrict.c
--- 2/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--;