From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 20 Jul 2015 07:33:44 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_62~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af898681b3e60ad52415d985f899d7a1905c9423;p=thirdparty%2Fntp.git

merge cleanup

bk: 55aca458tf0K19HWihXe65U7S0j24w
---

diff --git a/ChangeLog b/ChangeLog
index 22d5ae384..514f9be27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Below are from 4.2.8p4:
   be reverted once Bug 2043 has been fixed.
 * libntp/icom.c: Typo fix.  Harlan Stenn.
 * util/ntptime.c: initialization nit.  Harlan Stenn.
+* ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr).  Harlan Stenn.
 (4.3.61) 2015/07/19 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * Code cleanup.  Harlan Stenn.