diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 05:53:37 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:44 +0100 |
| commit | 70cea01a9ec0be4ef9fd141a16b52e8141a1c94a (patch) | |
| tree | 42d60afac6d684e0fe4180a390eff6bf5dadd98f | |
| parent | b1cd9c39c3465dff1e94241779c643a28d008ce8 (diff) | |
| download | samba-70cea01a9ec0be4ef9fd141a16b52e8141a1c94a.tar.gz samba-70cea01a9ec0be4ef9fd141a16b52e8141a1c94a.tar.bz2 samba-70cea01a9ec0be4ef9fd141a16b52e8141a1c94a.zip | |
r26487: Cope with systems that don't have struct sockaddr.sa_len.
(This used to be commit 56080469ab28ae5a2f456cced34814d9c33480c6)
| -rw-r--r-- | source4/lib/replace/getifaddrs.c | 11 | ||||
| -rw-r--r-- | source4/lib/replace/getifaddrs.m4 | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/source4/lib/replace/getifaddrs.c b/source4/lib/replace/getifaddrs.c index e04c023209..b681a8649c 100644 --- a/source4/lib/replace/getifaddrs.c +++ b/source4/lib/replace/getifaddrs.c @@ -53,10 +53,17 @@ void freeifaddrs(struct ifaddrs *ifp) struct sockaddr *sockaddr_dup(struct sockaddr *sa) { - struct sockaddr *ret = calloc(1, sa->sa_len); + struct sockaddr *ret; + socklen_t socklen; +#ifdef HAVE_SOCKADDR_SA_LEN + socklen = sa->sa_len; +#else + socklen = sizeof(struct sockaddr_storage); +#endif + ret = = calloc(1, socklen); if (ret == NULL) return NULL; - memcpy(ret, sa, sa->sa_len); + memcpy(ret, sa, socklen); return ret; } #endif diff --git a/source4/lib/replace/getifaddrs.m4 b/source4/lib/replace/getifaddrs.m4 index 7e6016ed8f..85f08ee6c3 100644 --- a/source4/lib/replace/getifaddrs.m4 +++ b/source4/lib/replace/getifaddrs.m4 @@ -1,5 +1,11 @@ AC_CHECK_HEADERS([ifaddrs.h]) +dnl Used when getifaddrs is not available +AC_CHECK_MEMBERS([struct sockaddr.sa_len], + [AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Whether struct sockaddr has a sa_len member])], + [], + [#include <sys/socket.h>]) + dnl test for getifaddrs and freeifaddrs AC_CACHE_CHECK([for getifaddrs and freeifaddrs],samba_cv_HAVE_GETIFADDRS,[ AC_TRY_COMPILE([ |