summaryrefslogtreecommitdiff
path: root/source3/lib/interfaces.c
diff options
context:
space:
mode:
authorGerald (Jerry) Carter <jerry@samba.org>2007-10-19 08:14:12 -0500
committerJeremy Allison <jra@samba.org>2007-10-19 13:09:26 -0700
commit80b7bcb5fbc98964014b5c8082a626aef24c5feb (patch)
treea9dc3c8114c9719140d8f83b01de5c6795b8684a /source3/lib/interfaces.c
parent61c4666a897fc85b0eb41e60dcbeb78272bfe5cf (diff)
downloadsamba-80b7bcb5fbc98964014b5c8082a626aef24c5feb.tar.gz
samba-80b7bcb5fbc98964014b5c8082a626aef24c5feb.tar.bz2
samba-80b7bcb5fbc98964014b5c8082a626aef24c5feb.zip
Add test for "struct in6_addr" to the HAVE_IPV6 configure test.
Also make use of "if defined(HAVE_IPV6)" rather than testing for AF_INET6 since this is not sufficient on HP-UX 11.11 to ensure a working IPv6 implementation. (This used to be commit 620785df4e57b72471ff0315e22e0d2f28a2b1a5)
Diffstat (limited to 'source3/lib/interfaces.c')
-rw-r--r--source3/lib/interfaces.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c
index 2b93a5ba39..3b15e3e87b 100644
--- a/source3/lib/interfaces.c
+++ b/source3/lib/interfaces.c
@@ -128,7 +128,7 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
continue;
}
-#ifdef AF_INET6
+#if defined(HAVE_IPV6)
if (ifptr->ifa_addr->sa_family == AF_INET6) {
copy_size = sizeof(struct sockaddr_in6);
}
@@ -496,7 +496,7 @@ static int iface_comp(struct iface_struct *i1, struct iface_struct *i2)
{
int r;
-#ifdef AF_INET6
+#if defined(HAVE_IPV6)
/*
* If we have IPv6 - sort these interfaces lower
* than any IPv4 ones.