[ntpsec commit] Simplify code paths based on SuSV2 assumption.

[Eric S. Raymond]

Module:    ntpsec
Branch:    master
Commit:    258e3be9f6c220d8a51529b485a396851deda89f
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=258e3be9f6c220d8a51529b485a396851deda89f

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Tue Sep 29 21:13:55 2015 -0400

Simplify code paths based on SuSV2 assumption.

---

 ntpd/ntp_io.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index d87f567..21bcdac 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2958,21 +2958,19 @@ open_socket(
 	 * IPv6 specific options go here
 	 */
 	if (IS_IPV6(addr)) {
-#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
+#ifdef IPV6_TCLASS
 		if (setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, (char*)&qos,
 			       sizeof(qos)))
 			msyslog(LOG_ERR,
 				"setsockopt IPV6_TCLASS (%02x) fails on address %s: %m",
 				qos, stoa(addr));
-#endif /* IPPROTO_IPV6 && IPV6_TCLASS */
-#ifdef IPV6_V6ONLY
+#endif /* IPV6_TCLASS */
 		if (isc_net_probe_ipv6only() == ISC_R_SUCCESS
 		    && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
 		    (char*)&on, sizeof(on)))
 			msyslog(LOG_ERR,
 				"setsockopt IPV6_V6ONLY on fails on address %s: %m",
 				stoa(addr));
-#endif
 	}
 
 #ifdef NEED_REUSEADDR_FOR_IFADDRBIND