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

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

bk: 441eb1358tozl1qaQHD_bgYWibKKiQ

diff --cc ntpd/ntp_restrict.c
index eb454e20d923d696067d70601a2c398febdf2268,04013a1d3eba6c1a47fc62b6d7b952f44d871081..30b6ac419cc321b8c37d69b0376999745e9fe0a6
--- 1/ntpd/ntp_restrict.c
--- 2/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;

diff --cc ntpdc/ntpdc.c
Simple merge