The branch, master has been updated via e30e7a6 s3-waf: remove explicit linking to SMBLDAP subsystem. via ea50207 s3-smbldap: remove an obsolete prototype. from 4c6bfac s3:lib/util: make sure panic action can attach a debugger on ubuntu (>=10.10)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e30e7a6ec02700234f73671c113743e1572efa01 Author: Günther Deschner <g...@samba.org> Date: Tue Oct 4 12:53:38 2011 +0200 s3-waf: remove explicit linking to SMBLDAP subsystem. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Tue Oct 4 14:39:57 CEST 2011 on sn-devel-104 commit ea50207230ea221deadbcf6ad6ca2a8525c27254 Author: Günther Deschner <g...@samba.org> Date: Tue Oct 4 12:53:09 2011 +0200 s3-smbldap: remove an obsolete prototype. Guenther ----------------------------------------------------------------------- Summary of changes: source3/include/smbldap.h | 1 - source3/wscript_build | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index 7bb9895..4ae8476 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -219,7 +219,6 @@ struct ldapsam_privates { /* Functions shared between pdb_ldap.c and pdb_nds.c. */ struct pdb_methods; NTSTATUS pdb_init_ldapsam_compat( struct pdb_methods **pdb_method, const char *location); -void private_data_free_fn(void **result); int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state, const char *user, LDAPMessage ** result, diff --git a/source3/wscript_build b/source3/wscript_build index f80e115..d105f1f 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -665,7 +665,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb_compat cap wbclient smbd_shim libsmb KRBCLIENT - pdb SMBLDAP param samba-util + pdb param samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON @@ -678,7 +678,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('smbclient', source=LIBSMBCLIENT_SRC, - public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT pdb SMBLDAP + public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT pdb LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''', public_headers='include/libsmbclient.h', vnum='0', @@ -1233,21 +1233,21 @@ bld.SAMBA3_BINARY('smbcontrol', bld.SAMBA3_BINARY('smbtree', source=SMBTREE_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE + libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb LIBMSRPC_GEN msrpc3 PROFILE RPC_NDR_SRVSVC''', vars=locals()) bld.SAMBA3_BINARY('smbpasswd', source=SMBPASSWD_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL + libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb LIBMSRPC_GEN msrpc3 PASSWD_UTIL LIBCLI_SAMR INIT_LSA PASSCHANGE''', vars=locals()) bld.SAMBA3_BINARY('pdbedit', source=PDBEDIT_SRC, deps='''talloc tdb_compat tevent cap wbclient param smbd_shim - LIBNTLMSSP LIBSMB_ERR popt_samba3 pdb SMBLDAP + LIBNTLMSSP LIBSMB_ERR popt_samba3 pdb PASSWD_UTIL cli-ldap-common''', vars=locals()) @@ -1291,14 +1291,14 @@ bld.SAMBA3_BINARY('msgtest', bld.SAMBA3_BINARY('smbcacls', source=SMBCACLS_SRC, deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT - smbd_shim pdb popt_samba3 SMBLDAP LIBMSRPC_GEN + smbd_shim pdb popt_samba3 LIBMSRPC_GEN msrpc3 libcli_lsa3''', vars=locals()) bld.SAMBA3_BINARY('smbcquotas', source=SMBCQUOTAS_SRC, deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT - popt_samba3 pdb SMBLDAP LIBMSRPC_GEN msrpc3 + popt_samba3 pdb LIBMSRPC_GEN msrpc3 libcli_lsa3''', vars=locals()) @@ -1322,7 +1322,7 @@ bld.SAMBA3_BINARY('locktest' + bld.env.suffix3, bld.SAMBA3_BINARY('pdbtest', source=PDBTEST_SRC, deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim pdb - SMBLDAP popt_samba3 NDR_SAMR NDR_LSA''', + popt_samba3 NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA3_BINARY('vfstest', @@ -1373,7 +1373,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, source=NTLM_AUTH_SRC, deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim samba3core LIBNTLMSSP popt_samba3 asn1util LIBTSOCKET - pdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER + pdb winbind-client LIBINIPARSER LIBADS_SERVER NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', vars=locals()) -- Samba Shared Repository