summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-10-02 21:12:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:31:07 -0500
commite817616a0ed32dcaa91e3ab7a64c9f3cefe191b5 (patch)
tree7baf28fa9412176b7ee2fd63af0f94013ed5d9f8 /source3
parent989120d53e69adfc3fb86775a683147cb62d8d04 (diff)
downloadsamba-e817616a0ed32dcaa91e3ab7a64c9f3cefe191b5.tar.gz
samba-e817616a0ed32dcaa91e3ab7a64c9f3cefe191b5.tar.bz2
samba-e817616a0ed32dcaa91e3ab7a64c9f3cefe191b5.zip
r25476: Finally fix up new interface detection code :-).
Jeremy. (This used to be commit fffdad52859b5a8bc5dd61912d80b93e8c030c8f)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in4
-rw-r--r--source3/lib/interfaces.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 919cfc93dc..c8cdf0a018 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3093,7 +3093,7 @@ if test x"$samba_cv_HAVE_IFACE_AIX" = x"yes"; then
fi
if test $iface = no; then
-AC_CACHE_CHECK([for iface getifaddrs],samba_cv_HAVE_GETIFADDRS,[
+AC_CACHE_CHECK([for iface getifaddrs],samba_cv_HAVE_IFACE_GETIFADDRS,[
SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
AC_TRY_RUN([
@@ -3103,7 +3103,7 @@ AC_TRY_RUN([
samba_cv_HAVE_IFACE_GETIFADDRS=yes,samba_cv_HAVE_IFACE_GETIFADDRS=no,samba_cv_HAVE_IFACE_GETIFADDRS=cross)])
CPPFLAGS="$SAVE_CPPFLAGS"
if test x"$samba_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
- iface=yes;AC_DEFINE(HAVE_IFACE_GETIFADDRS,1,[Whether iface ifconf is available])
+ iface=yes;AC_DEFINE(HAVE_IFACE_GETIFADDRS,1,[Whether iface getifaddrs is available])
fi
fi
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c
index e5b9d87488..632b38f2b6 100644
--- a/source3/lib/interfaces.c
+++ b/source3/lib/interfaces.c
@@ -126,7 +126,7 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces)
ifaces[total].sa_family = ifptr->ifa_addr->sa_family;
ifaces[total].iface_addr.ip =
- ((struct sockaddr_in *)ifptr->ifa_addr).sin_addr;
+ ((struct sockaddr_in *)ifptr->ifa_addr)->sin_addr;
ifaces[total].iface_netmask.netmask =
((struct sockaddr_in *)ifptr->ifa_netmask)->sin_addr;