diff options
| author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-19 08:14:12 -0500 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-10-19 13:09:26 -0700 |
| commit | 80b7bcb5fbc98964014b5c8082a626aef24c5feb (patch) | |
| tree | a9dc3c8114c9719140d8f83b01de5c6795b8684a /source3/lib/interface.c | |
| parent | 61c4666a897fc85b0eb41e60dcbeb78272bfe5cf (diff) | |
| download | samba-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/interface.c')
| -rw-r--r-- | source3/lib/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/interface.c b/source3/lib/interface.c index 4892ec1248..0696329fd6 100644 --- a/source3/lib/interface.c +++ b/source3/lib/interface.c @@ -339,7 +339,7 @@ bool make_netmask(struct sockaddr_storage *pss_out, { *pss_out = *pss_in; /* Now apply masklen bits of mask. */ -#if defined(AF_INET6) +#if defined(HAVE_IPV6) if (pss_in->ss_family == AF_INET6) { char *p = (char *)&((struct sockaddr_in6 *)pss_out)->sin6_addr; unsigned int i; @@ -386,7 +386,7 @@ static void make_bcast_or_net(struct sockaddr_storage *pss_out, *pss_out = *pss_in; /* Set all zero netmask bits to 1. */ -#if defined(AF_INET6) +#if defined(HAVE_IPV6) if (pss_in->ss_family == AF_INET6) { p = (char *)&((struct sockaddr_in6 *)pss_out)->sin6_addr; pmask = (char *)&((struct sockaddr_in6 *)nmask)->sin6_addr; |