diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-12-20 15:59:39 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-18 17:02:12 +0100 |
| commit | 1e5418edbc370e87293c324eae54372a495bb932 (patch) | |
| tree | 01adc3b8f9450e679ba73bb070a511d5e092ebc1 | |
| parent | a2bfb1749ca7bc0c713d3508c1324799245c7d1a (diff) | |
| download | samba-1e5418edbc370e87293c324eae54372a495bb932.tar.gz samba-1e5418edbc370e87293c324eae54372a495bb932.tar.bz2 samba-1e5418edbc370e87293c324eae54372a495bb932.zip | |
r26550: libreplace: fallback to __ss_family of struct sockaddr_storage
metze
(cherry picked from commit 11bdc9bed80b9842ac1ab8f22509a5d191cddc91)
(This used to be commit c11122afda52ce787dd1d3357bd85b6ce36b8ca4)
| -rw-r--r-- | source3/lib/replace/libreplace.m4 | 20 | ||||
| -rw-r--r-- | source3/lib/replace/system/network.h | 9 |
2 files changed, 29 insertions, 0 deletions
diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4 index 7a5283a4d6..f866b3648f 100644 --- a/source3/lib/replace/libreplace.m4 +++ b/source3/lib/replace/libreplace.m4 @@ -153,6 +153,26 @@ AC_HAVE_TYPE([struct sockaddr_in6], [ #include <netinet/in.h> ]) +if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then +AC_CHECK_MEMBER(struct sockaddr_storage.ss_family, + AC_DEFINE(HAVE_SS_FAMILY, 1, [Defined if struct sockaddr_storage has ss_family field]),, + [ +#include <sys/socket.h> +#include <sys/types.h> +#include <netinet/in.h> + ]) + +if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then +AC_CHECK_MEMBER(struct sockaddr_storage.__ss_family, + AC_DEFINE(HAVE___SS_FAMILY, 1, [Defined if struct sockaddr_storage has __ss_family field]),, + [ +#include <sys/socket.h> +#include <sys/types.h> +#include <netinet/in.h> + ]) +fi +fi + AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror) AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename) AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup) diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h index b6ae3c7c6f..2f387de5cf 100644 --- a/source3/lib/replace/system/network.h +++ b/source3/lib/replace/system/network.h @@ -227,9 +227,18 @@ typedef unsigned short int sa_family_t; #ifdef HAVE_STRUCT_SOCKADDR_IN6 #define sockaddr_storage sockaddr_in6 #define ss_family sin6_family +#define HAVE_SS_FAMILY 1 #else #define sockaddr_storage sockaddr_in #define ss_family sin_family +#define HAVE_SS_FAMILY 1 +#endif +#endif + +#ifndef HAVE_SS_FAMILY +#ifdef HAVE___SS_FAMILY +#define ss_family __ss_family +#define HAVE_SS_FAMILY 1 #endif #endif |