The branch, master has been updated via 40dd6ce Revert "s3-waf: make use of LIBCLI_CLDAP subsystem" via 8bca9df s3-waf: add check for getspnam(). via b1e5dc7 s3-waf: add check for TDB_ERR_NESTING. from 7f0ef4f s3-waf: add check for sendfile on AIX.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 40dd6ce3ac63bb187dedc836c0bce14798b0ed8d Author: Günther Deschner <g...@samba.org> Date: Tue Feb 22 23:07:58 2011 +0100 Revert "s3-waf: make use of LIBCLI_CLDAP subsystem" Metze, we need to cleanup deps to idtree and cli-ldap first. Guenther This reverts commit ac4497edae2800c3fc7c40f0e538b936f1965a75. Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Tue Feb 22 23:53:25 CET 2011 on sn-devel-104 commit 8bca9df258527125e6b7ec9b9ad060cc0fdc3ddf Author: Günther Deschner <g...@samba.org> Date: Tue Feb 22 22:56:23 2011 +0100 s3-waf: add check for getspnam(). Guenther commit b1e5dc716e1d968edf7e2686ba1dda3a42381541 Author: Günther Deschner <g...@samba.org> Date: Tue Feb 22 22:34:05 2011 +0100 s3-waf: add check for TDB_ERR_NESTING. Guenther ----------------------------------------------------------------------- Summary of changes: source3/wscript | 10 ++++++++++ source3/wscript_build | 9 ++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/wscript b/source3/wscript index 99176ac..b77a46e 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1477,6 +1477,16 @@ main() { conf.DEFINE('AIX_SENDFILE_API', '1') conf.DEFINE('WITH_SENDFILE', '1') + conf.CHECK_CODE('''enum TDB_ERROR err = TDB_ERR_NESTING''', + 'HAVE_TDB_ERR_NESTING', + headers='tdb.h', + msg='Checking whether we have TDB_ERR_NESTING') + + # UnixWare 7.x has its getspnam in -lgen + conf.CHECK_FUNCS_IN('getspnam', 'gen') + conf.CHECK_FUNCS_IN('getspnam', 'security') + conf.CHECK_FUNCS_IN('getspnam', 'sec') + default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin vfs_default diff --git a/source3/wscript_build b/source3/wscript_build index 73cc20d..0d82cb4 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -168,6 +168,10 @@ LIBSMB_SRC0 = ''' LIBSAMBA_SRC = '${LIBSMB_SRC0}' +CLDAP_SRC = '''libads/cldap.c + ../libcli/cldap/cldap.c + ../lib/util/idtree.c''' + TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c''' SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c''' @@ -841,8 +845,8 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', vars=locals()) bld.SAMBA3_SUBSYSTEM('CLDAP', - source='libads/cldap.c', - deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET', + source=CLDAP_SRC, + deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET', vars=locals()) bld.SAMBA3_SUBSYSTEM('SECRETS3', @@ -1385,7 +1389,6 @@ bld.RECURSE('../lib/async_req') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') bld.RECURSE('../libcli/ldap') -bld.RECURSE('../libcli/cldap') bld.RECURSE('../libcli/named_pipe_auth') bld.RECURSE('../libcli/netlogon') bld.RECURSE('../libcli/samsync') -- Samba Shared Repository