Module Name: src
Committed By: kardel
Date: Sun Jan 9 14:49:40 UTC 2011
Modified Files:
src/external/bsd/ntp/dist/lib/isc/unix: net.c
src/external/bsd/ntp/dist/ntpd: ntp_io.c
Log Message:
make ntp compile for MKINET6=no
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/lib/isc/unix/net.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpd/ntp_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/lib/isc/unix/net.c
diff -u src/external/bsd/ntp/dist/lib/isc/unix/net.c:1.1.1.1 src/external/bsd/ntp/dist/lib/isc/unix/net.c:1.2
--- src/external/bsd/ntp/dist/lib/isc/unix/net.c:1.1.1.1 Sun Dec 13 16:54:38 2009
+++ src/external/bsd/ntp/dist/lib/isc/unix/net.c Sun Jan 9 14:49:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.1.1.1 2009/12/13 16:54:38 kardel Exp $ */
+/* $NetBSD: net.c,v 1.2 2011/01/09 14:49:39 kardel Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
@@ -106,11 +106,11 @@
# if defined(WANT_IPV6)
static isc_once_t once_ipv6only = ISC_ONCE_INIT;
-# endif
# if defined(ISC_PLATFORM_HAVEIN6PKTINFO)
static isc_once_t once_ipv6pktinfo = ISC_ONCE_INIT;
# endif
+# endif
#endif /* ISC_PLATFORM_HAVEIPV6 */
static isc_once_t once = ISC_ONCE_INIT;
@@ -319,7 +319,6 @@
RUNTIME_CHECK(isc_once_do(&once_ipv6only,
try_ipv6only) == ISC_R_SUCCESS);
}
-#endif /* WANT_IPV6 */
#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
static void
@@ -376,6 +375,7 @@
}
#endif /* ISC_PLATFORM_HAVEIN6PKTINFO */
#endif /* ISC_PLATFORM_HAVEIPV6 */
+#endif /* WANT_IPV6 */
isc_result_t
isc_net_probe_ipv6only(void) {
Index: src/external/bsd/ntp/dist/ntpd/ntp_io.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.4 src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.5
--- src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.4 Sat Dec 4 23:08:35 2010
+++ src/external/bsd/ntp/dist/ntpd/ntp_io.c Sun Jan 9 14:49:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_io.c,v 1.4 2010/12/04 23:08:35 christos Exp $ */
+/* $NetBSD: ntp_io.c,v 1.5 2011/01/09 14:49:40 kardel Exp $ */
/*
* ntp_io.c - input/output routines for ntpd. The socket-opening code
@@ -923,7 +923,10 @@
u_short port
)
{
- int v4wild, v6wild;
+ int v4wild;
+#ifdef INCLUDE_IPV6_SUPPORT
+ int v6wild;
+#endif
sockaddr_u wildaddr;
isc_netaddr_t wnaddr;
nic_rule_action action;
@@ -2902,7 +2905,9 @@
*/
int rtc;
u_char cttl;
+#ifdef INCLUDE_IPV6_SUPPORT
u_int uttl;
+#endif
switch (AF(&inter->sin)) {
