From: Juergen Perlinger <perlinger@ntp.org>
Date: Tue, 10 Apr 2018 06:09:59 +0000 (+0200)
Subject: [Bug 3480] Refclock sample filter not cleared on clock STEP
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=144b5c885d04484a22dd5a9d86b2f61abb9775dc;p=thirdparty%2Fntp.git

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

bk: 5acc55370j0-PVzDwd6YgwpAqM6ttg
---

diff --git a/ChangeLog b/ChangeLog
index 046c9342b..a59c68a6a 100644
--- 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 fb8a837db..4ef9b56e4 100644
--- 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