diff options
| author | Matt Kraai <mkraai@beckman.com> | 2009-08-12 08:49:24 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-08-17 12:55:37 +0200 |
| commit | ce3636bb502da954dfd79afdeb040b1fbfef6faf (patch) | |
| tree | 877581c5d1b94fe997be4d7da79bca4c4027d2e1 /lib | |
| parent | 3ac99dded70132326ec3f310ad93993ffc68952a (diff) | |
| download | samba-ce3636bb502da954dfd79afdeb040b1fbfef6faf.tar.gz | |
libreplace: undef AI_ADDRCONFIG on QNX 6.3.0 (fix bug #6630)
Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX
6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This
prevents smbd from opening any sockets.
If I undefine AI_ADDRCONFIG on such systems and allow
lib/replace/system/network.h to define it to be 0, this works around the issue.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 91d13b68be55728a85b3832e2da9267dbf4f2464)
Fixes bug #6630.
(cherry picked from commit 3be12b15f1758b54456d49368dbca7f25a99f4cc)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/system/network.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index 6add99c0db7..4fe1084c1aa 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -195,6 +195,20 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]); #endif #endif +/* + * Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX + * 6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This + * prevents smbd from opening any sockets. + * + * If I undefine AI_ADDRCONFIG on such systems and define it to be 0, + * this works around the issue. + */ +#ifdef __QNX__ +#include <sys/neutrino.h> +#if _NTO_VERSION == 630 +#undef AI_ADDRCONFIG +#endif +#endif #ifndef AI_ADDRCONFIG /* * logic copied from AI_NUMERICHOST |