diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-20 10:55:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-20 10:55:20 +0100 |
| commit | 5f0fab780220045e04adb11843bcb0cd9a9b64d7 (patch) | |
| tree | 3a9de5b37b26465c54bfaa218151451748ff3830 /source4/lib | |
| parent | 1ce345ef97cc7c737aa678b332f39d630688248a (diff) | |
| parent | db2447a7a2b1d39a6849b53f7864e9283daacb6a (diff) | |
| download | samba-5f0fab780220045e04adb11843bcb0cd9a9b64d7.tar.gz samba-5f0fab780220045e04adb11843bcb0cd9a9b64d7.tar.bz2 samba-5f0fab780220045e04adb11843bcb0cd9a9b64d7.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-nodeclare
(This used to be commit 7a2ff3ee26bce49a3eeeb270f4a5e4df2adbefbb)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/replace/libreplace_ld.m4 | 3 | ||||
| -rw-r--r-- | source4/lib/replace/system/network.h | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/source4/lib/replace/libreplace_ld.m4 b/source4/lib/replace/libreplace_ld.m4 index 2aec698967..f0d10c1e3e 100644 --- a/source4/lib/replace/libreplace_ld.m4 +++ b/source4/lib/replace/libreplace_ld.m4 @@ -289,6 +289,9 @@ AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR], *linux*) LIB_PATH_VAR=LD_LIBRARY_PATH ;; + *netbsd*) + LIB_PATH_VAR=LD_LIBRARY_PATH + ;; *solaris*) LIB_PATH_VAR=LD_LIBRARY_PATH ;; diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h index 53bef66d48..d09e3f71f8 100644 --- a/source4/lib/replace/system/network.h +++ b/source4/lib/replace/system/network.h @@ -163,8 +163,15 @@ void rep_freeifaddrs(struct ifaddrs *); #endif #ifndef AI_ADDRCONFIG +/* + * logic copied from AI_NUMERICHOST + */ +#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO) +#define AI_ADDRCONFIG 0 +#else #define AI_ADDRCONFIG 0x0020 #endif +#endif #ifndef AI_NUMERICSERV /* |