123e8afbaa
Now with support for AD DC, ADS and clustering features. All dropped patches are upstream. [Thomas: move indentation fixes to a separate patch.] Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
Disable libbsd support, samba4 uses a global config.h for its own
|
|
codebase and that of heimdal (when building with builtin).
|
|
This causes redefinition conflicts for link(2) when both standard unistd.h
|
|
and bsd/unistd.h get included.
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
diff -Nura samba-4.2.0rc1.orig/lib/replace/wscript samba-4.2.0rc1/lib/replace/wscript
|
|
--- samba-4.2.0rc1.orig/lib/replace/wscript 2014-10-01 06:17:32.000000000 -0300
|
|
+++ samba-4.2.0rc1/lib/replace/wscript 2014-10-01 07:21:13.559498987 -0300
|
|
@@ -282,15 +282,6 @@
|
|
conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign')
|
|
conf.CHECK_FUNCS('prctl')
|
|
|
|
- # libbsd on some platforms provides strlcpy and strlcat
|
|
- if not conf.CHECK_FUNCS('strlcpy strlcat'):
|
|
- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
|
|
- checklibc=True)
|
|
- if not conf.CHECK_FUNCS('getpeereid'):
|
|
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
|
|
- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
|
|
- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
|
|
-
|
|
conf.CHECK_CODE('''
|
|
struct ucred cred;
|
|
socklen_t cred_len;
|