From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 19 Dec 2014 09:43:15 +0000 (-0500)
Subject: Disable Sec 2672 interim fix for now
X-Git-Tag: NTP_4_2_8~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5af89557d51687ca9664e9af4ab38deca59999dd;p=thirdparty%2Fntp.git

Disable Sec 2672 interim fix for now

bk: 5493f333hALqPcXLR4-76bC6j-16xQ
---

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 8be7247d3..ae00e55d1 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3449,6 +3449,8 @@ read_network_packet(
 	** Bug 2672: Some OSes (MacOSX and Linux) don't block spoofed ::1
 	*/
 
+	// temporary hack...
+#ifndef HAVE_SOLARIS_PRIVS
 	if (AF_INET6 == itf->family) {
 		DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n",
 			stoa(&rb->recv_srcadr),
@@ -3468,6 +3470,7 @@ read_network_packet(
 		return buflen;
 	}
 	DPRINTF(1, ("processing that packet\n"));
+#endif
 
 	/*
 	 * Got one.  Mark how and when it got here,