[Bug 3480] Refclock sample filter not cleared on clock STEP

bk: 5acc55370j0-PVzDwd6YgwpAqM6ttg

diff --git a/ChangeLog b/ChangeLog
index 046c9342be2e9c1aef57fd81c4dbc9fb5ab4d0ca..a59c68a6a4914c9fb6374975d6fcfe73863f6e45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---
 
+* [Bug 3480] Refclock sample filter not cleared on clock STEP <perlinger@ntp.org>
+  - applied patch by Gerry Garvey
 * [Bug 3471] Check for openssl/[ch]mac.h.  HStenn.
   - add #define ENABLE_CMAC support in configure.  HStenn.
 * [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index fb8a837db5c2c255d8f65a83ce5f84e96e205619..4ef9b56e4aeaee3e229508b2070ae9764f6dad48 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -3072,6 +3072,10 @@ peer_clear(
                peer->stratum = STRATUM_UNSPEC;
                memcpy(&peer->refid, ident, 4);
 #ifdef REFCLOCK
+       } else {
+               /* Clear refclock sample filter */
+               peer->procptr->codeproc = 0;
+               peer->procptr->coderecv = 0;
        }
 #endif