From ad6ee6d55abaeb0eb4373b148fd7e000bfbff194 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 21 Apr 2011 12:28:27 +1000 Subject: build: Move Heimdal/MIT compat build rules to heimdal_build This allows top level build rules to rely on these names at all times. Andrew Bartlett --- source3/wscript_build | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7a01a7a366..dc01554c2e 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1321,17 +1321,6 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') -else: - - # point the s3 rules at in-tree heimdal - bld.SAMBA3_SUBSYSTEM('gssapi_krb5', - source='', - deps='gssapi krb5') - bld.SAMBA3_SUBSYSTEM('k5crypto', - source='', - deps='krb5') - - ########################## INCLUDES ################################# -- cgit From 6ec4306f8c3fed7ec5b5bd164c5829b2661589b7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 16 Apr 2011 15:41:50 +1000 Subject: auth/kerberos: Create common helper to get the verified PAC from GSSAPI This only works for Heimdal and MIT Krb5 1.8, other versions will get an ACCESS_DEINED error. We no longer manually verify any details of the PAC in Samba for GSSAPI logins, as we never had the information to do it properly, and it is better to have the GSSAPI library handle it. Andrew Bartlett --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index dc01554c2e..8b337e6ccb 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1327,6 +1327,7 @@ if not bld.env.toplevel_build: bld.RECURSE('../lib/util/charset') bld.RECURSE('../auth') +bld.RECURSE('../auth/kerberos') bld.RECURSE('../lib/addns') bld.RECURSE('../lib/async_req') bld.RECURSE('../libcli/auth') -- cgit From e877d4fd1eddcb9bea01108e0b7f6b6faf380d57 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 27 Apr 2011 11:48:53 +1000 Subject: build: fixed build problems due to implicit library deps in samba3core this fixes the top level build on svart and probably other hosts Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Apr 27 08:27:49 CEST 2011 on sn-devel-104 --- source3/wscript_build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 8b337e6ccb..ca37ce3ed1 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -728,7 +728,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP', bld.SAMBA3_LIBRARY('passdb', source=PASSDB_SRC, - deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH', + deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH flag_mapping', private_library=True, vars=locals()) @@ -780,7 +780,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg passdb', private_library=True, vars=locals()) @@ -791,7 +791,7 @@ bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR', source='', - deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon', + deps='errors3 passdb ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', -- cgit From 66b26195d21f0889e7ccd0de25a5827bb3722196 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 27 Apr 2011 13:16:59 +0200 Subject: s3-waf: add pthreadpool support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Volker, please check. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Wed Apr 27 17:57:32 CEST 2011 on sn-devel-104 --- source3/wscript_build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index ca37ce3ed1..a6ce559e58 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -57,8 +57,6 @@ LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c # that requires knowledge of security contexts REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c''' -PTHREADPOOL_SRC = '' - LIB_SRC = ''' lib/messages.c lib/messages_local.c lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c @@ -91,7 +89,7 @@ LIB_SRC = ''' lib/module.c lib/events.c lib/server_contexts.c lib/ldap_escape.c - lib/secdesc.c ${PTHREADPOOL_SRC} + lib/secdesc.c lib/fncall.c libads/krb5_errs.c lib/system_smbd.c lib/audit.c lib/file_id.c lib/idmap_cache.c''' @@ -780,7 +778,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg passdb', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg passdb PTHREADPOOL', private_library=True, vars=locals()) @@ -1361,6 +1359,7 @@ bld.RECURSE('../nsswitch') bld.RECURSE('../nsswitch/libwbclient') bld.RECURSE('auth') bld.RECURSE('libgpo/gpext') +bld.RECURSE('lib/pthreadpool') bld.RECURSE('librpc') bld.RECURSE('librpc/idl') bld.RECURSE('modules') -- cgit From 4081ea5b49c6b882174d633a1eb03436341c4e63 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 12 Apr 2011 14:49:41 +1000 Subject: lib/util/charset use convert_string.c in common This brings another layer of the charcnv library in common. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index a6ce559e58..668daf8012 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -963,7 +963,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', vars=locals()) bld.SAMBA3_SUBSYSTEM('CHARSET3', - source='''lib/util_str.c lib/charcnv.c ../lib/util/charset/convert_string.c lib/fstring.c''', + source='''lib/util_str.c lib/charcnv.c lib/fstring.c''', public_deps='ICONV_WRAPPER CODEPOINTS', deps='samba-util') -- cgit From bb520dceac7e55ba63826edd9a12aba7c877db38 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 28 Apr 2011 16:23:53 +1000 Subject: build: Fix kerberos build issues in top level build --- source3/wscript_build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 668daf8012..e5384630c0 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -699,7 +699,7 @@ bld.SAMBA3_SUBSYSTEM('msrpc3', source='${LIBMSRPC_SRC}', deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH - LIBTSOCKET krb5 rpccommon''', + LIBTSOCKET KRB5_WRAP rpccommon''', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN', @@ -773,12 +773,12 @@ bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3', bld.SAMBA3_SUBSYSTEM('KRBCLIENT', source=KRBCLIENT_SRC, - public_deps='KRB5_WRAP krb5 k5crypto com_err gssapi gssapi_krb5', + public_deps='KRB5_WRAP k5crypto', vars=locals()) bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg passdb PTHREADPOOL', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL', private_library=True, vars=locals()) @@ -825,13 +825,13 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP', bld.SAMBA3_LIBRARY('ads', source=LIBADS_SRC, - deps='cli-ldap-common krb5 gssapi gssapi_krb5 ldap lber', + deps='cli-ldap-common KRB5_WRAP ldap lber', private_library=True, vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', source=LIBADS_SERVER_SRC, - deps='ndr-krb5pac krb5 KRB5_WRAP', + deps='ndr-krb5pac KRB5_WRAP', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER', @@ -900,7 +900,7 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', bld.SAMBA3_SUBSYSTEM('LIBNET', source=LIBNET_SRC, - deps='NDR_LIBNET_JOIN krb5', + deps='NDR_LIBNET_JOIN KRB5_WRAP', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC', @@ -1259,7 +1259,7 @@ bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3, bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, source=NTLM_AUTH_SRC, - deps='''tdb talloc cap krb5 k5crypto com_err wbclient param LIB_NONSMBD + deps='''tdb talloc cap KRB5_WRAP k5crypto wbclient param LIB_NONSMBD samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', -- cgit From 6021af4fd38d2a712dca42a3cacf8537007fd160 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 12:41:27 +1000 Subject: libcli/smb Move attrib_string in common --- source3/wscript_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index e5384630c0..5a7998391c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1066,7 +1066,8 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, deps='''talloc tdb cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN - msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA''', + msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA + LIBCLI_SMB_COMMON''', vars=locals()) bld.SAMBA3_BINARY('net', -- cgit From f96793142d0b5a6e0bdb0bcf4811178f3274949c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 16:57:41 +1000 Subject: build: put doserr.c into it's own subsystem, so it's no longer a duplicate Autobuild-User: Andrew Bartlett Autobuild-Date: Fri Apr 29 10:00:32 CEST 2011 on sn-devel-104 --- source3/wscript_build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 5a7998391c..94575cd716 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -971,7 +971,8 @@ bld.SAMBA3_SUBSYSTEM('ldb3', source='lib/ldb_compat.c') bld.SAMBA3_SUBSYSTEM('errors3', - source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c') + source='libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', + deps='LIBCLI_ERRORS') bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR', source=LIBCLI_SAMR_SRC, @@ -1338,6 +1339,7 @@ bld.RECURSE('../libcli/netlogon') bld.RECURSE('../libcli/samsync') bld.RECURSE('../libcli/security') bld.RECURSE('../libcli/smb') +bld.RECURSE('../libcli/util') bld.RECURSE('../libcli/smbreadline') bld.RECURSE('../libcli/nbt') bld.RECURSE('../libcli/registry') -- cgit From b1f2547699d335287d5f007d108a067eb7a0203d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 30 Apr 2011 10:50:50 +1000 Subject: s3-waf: Add dependency on popt to fix build on FreeBSD --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 94575cd716..143f90a219 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -668,7 +668,7 @@ bld.SAMBA3_LIBRARY('netapi', RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN - INIT_NETLOGON INIT_SAMR''', + INIT_NETLOGON INIT_SAMR POPT_SAMBA3''', public_headers='../source3/lib/netapi/netapi.h', vnum='0', vars=locals()) -- cgit From 897af93e3176eb62817325a8b487742034bbbee7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 30 Apr 2011 18:10:17 +1000 Subject: s3-build Add popt dep to fix build on FreeBSD Autobuild-User: Andrew Bartlett Autobuild-Date: Sat Apr 30 11:42:20 CEST 2011 on sn-devel-104 --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 143f90a219..0a12bfc5d4 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -676,7 +676,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('libsmb/smbclient', source=LIBSMBCLIENT_SRC, public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP - LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC''', + LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC POPT_SAMBA3''', public_headers='include/libsmbclient.h', vnum='0', vars=locals()) -- cgit From 85fa87ea82a1dcbd4d0145e417d615ffca116751 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 11:38:41 +1000 Subject: s3-ctdb Rename packet file and files to ctdb_packet This avoids a conflicts with the Samba4 packet.c, as these is only used in CTDB Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 0a12bfc5d4..83cc39ebe7 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -59,7 +59,7 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c''' LIB_SRC = ''' lib/messages.c lib/messages_local.c - lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c + lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c lib/interfaces.c lib/memcache.c lib/talloc_dict.c lib/util_sconn.c -- cgit From 80f1d49b61560f326fb55f2df09cc4f30e7a85ea Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 3 May 2011 12:29:12 +1000 Subject: lib/util/charset Use push_string and talloc_strupper/strlower from common code The only caller of push_string() (not to be confused with push_string_check()) in the common code was encode_pw_buffer(), and it didn't use the alignment or STR_UPPER flags. The talloc_strupper() and talloc_strlower() functions are tested in smbtorture, and are next_codepoint() based. Andrew Bartlett --- source3/wscript_build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 83cc39ebe7..fbc6693346 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -964,7 +964,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', bld.SAMBA3_SUBSYSTEM('CHARSET3', source='''lib/util_str.c lib/charcnv.c lib/fstring.c''', - public_deps='ICONV_WRAPPER CODEPOINTS', + public_deps='ICONV_WRAPPER CHARSET', deps='samba-util') bld.SAMBA3_SUBSYSTEM('ldb3', @@ -1317,7 +1317,6 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3') bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3') bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG') - bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') -- cgit From deba880986b1029fa059fcfba9b2a72abf598a9b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 4 May 2011 17:45:34 +0200 Subject: s3-torture: Add a test for notify upon read&x This makes sure that when a file is brought online by a read call we notify the client for FILE_NOTIFY_CHANGE_ATTRIBUTES. Autobuild-User: Volker Lendecke Autobuild-Date: Wed May 4 21:09:22 CEST 2011 on sn-devel-104 --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index fbc6693346..adeff836af 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -566,6 +566,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/ torture/test_addrchange.c torture/test_posix_append.c torture/test_case_insensitive.c + torture/test_notify_online.c torture/test_smbsock_any_connect.c''' SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} -- cgit From 14750139639b3531e57a3ca3f9e481d6e458dc06 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 4 May 2011 10:28:15 +1000 Subject: lib/util Move source3 tdb_wrap_open() into the common code. This #if _SAMBA_BUILD == 3 is very unfortunate, as it means that in the top level build, these options are not available for these databases. However, having two different tdb_wrap lists is a worse fate, so this will do for now. Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index adeff836af..64df8f79ec 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -961,6 +961,7 @@ bld.SAMBA3_SUBSYSTEM('ndr-util', bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', + deps='tdb-wrap', vars=locals()) bld.SAMBA3_SUBSYSTEM('CHARSET3', @@ -1315,7 +1316,6 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat') if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3') - bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3') bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3') bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') -- cgit From e3b858496ffe213f66387e4f11b311543af4dc54 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 4 May 2011 21:19:46 +1000 Subject: libcli/smb Move cifs posix helper functions and headers in common unix_perms_to_wire() was a duplicate symbol in the top level build. Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 64df8f79ec..c6bc91303d 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -800,7 +800,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', bld.SAMBA3_SUBSYSTEM('LIBSMB', source=LIBSMB_SRC, - deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT', + deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', -- cgit From 2c569cd8ba70e1aba30019618e759866c55eff30 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 3 May 2011 09:33:17 +1000 Subject: s3-waf: expose the server_exit code in the smbd_base library these functions are called from the rest of smbd_base --- source3/wscript_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index c6bc91303d..0498a9ac9f 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -343,7 +343,7 @@ WINBINDD_SRC = '''${WINBINDD_SRC1} MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c''' -SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c smbd/msg_idmap.c''' +SMBD_SRC_MAIN = '''smbd/server.c smbd/msg_idmap.c''' BUILDOPT_SRC = '''smbd/build_options.c''' @@ -388,6 +388,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c smbd/smb2_getinfo.c smbd/smb2_setinfo.c smbd/smb2_break.c + smbd/server_exit.c ${MANGLE_SRC}''' SMBD_SRC_BASE = '''${SMBD_SRC_SRV} -- cgit From 897ef820a40afffbf337b5487a49d957464def67 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 12:20:21 +1000 Subject: s3-lib Use common lib/socket code for get_interfaces() et al --- source3/wscript_build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 0498a9ac9f..149b5c545a 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -60,7 +60,7 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c''' LIB_SRC = ''' lib/messages.c lib/messages_local.c lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c - lib/interfaces.c lib/memcache.c + lib/memcache.c lib/talloc_dict.c lib/util_sconn.c lib/serverid.c @@ -780,7 +780,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', private_library=True, vars=locals()) @@ -1331,6 +1331,7 @@ bld.RECURSE('../auth') bld.RECURSE('../auth/kerberos') bld.RECURSE('../lib/addns') bld.RECURSE('../lib/async_req') +bld.RECURSE('../lib/socket') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') bld.RECURSE('../libcli/ldap') -- cgit From 6d9f33064152b62de801fbc719d99dae73fb7b91 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 12 Apr 2011 10:59:20 +0200 Subject: s3-waf: Create a registry private library. Signed-off-by: Michael Adam --- source3/wscript_build | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 149b5c545a..867e41bea9 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -754,13 +754,17 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF', source=REG_API_REGF_SRC, vars=locals()) -bld.SAMBA3_SUBSYSTEM('REG_BASE', - source=REG_BASE_SRC, - vars=locals()) +bld.SAMBA3_LIBRARY('smbregistry', + source=REG_BASE_SRC, + deps='''LIB_NONSMBD tdb-wrap3 NDR_SECURITY UTIL_TDB talloc + replace samba3core util_reg samba-util-common security + errors3 CHARSET3''', + private_library=True, + vars=locals()) bld.SAMBA3_SUBSYSTEM('REG_SMBCONF', source=REG_SMBCONF_SRC, - deps='REG_BASE', + deps='smbregistry', vars=locals()) bld.SAMBA3_SUBSYSTEM('REG_FULL', @@ -850,7 +854,7 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', bld.SAMBA3_SUBSYSTEM('LIB_SMBCONF', source=LIB_SMBCONF_SRC, - deps='LIBSMBCONF REG_BASE REG_SMBCONF', + deps='LIBSMBCONF smbregistry REG_SMBCONF', vars=locals()) bld.SAMBA3_LIBRARY('smbd_base', -- cgit From c31fd2b22aa42feb8557353a8d1bd2697f4a8eee Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 12 Apr 2011 11:02:07 +0200 Subject: s3-waf: Create a public libsmconf. Signed-off-by: Michael Adam --- source3/wscript_build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 867e41bea9..9ea7dd9c24 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -667,7 +667,7 @@ bld.SAMBA3_LIBRARY('netapi', public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP PARAM_WITHOUT_REG samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI - RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL + RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN INIT_NETLOGON INIT_SAMR POPT_SAMBA3''', @@ -742,7 +742,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', bld.SAMBA3_LIBRARY('param', source='', - deps='PARAM_WITHOUT_REG samba-util LIB_SMBCONF', + deps='PARAM_WITHOUT_REG samba-util smbconf', private_library=True, vars=locals()) @@ -852,10 +852,12 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', source=AFS_SETTOKEN_SRC, vars=locals()) -bld.SAMBA3_SUBSYSTEM('LIB_SMBCONF', - source=LIB_SMBCONF_SRC, - deps='LIBSMBCONF smbregistry REG_SMBCONF', - vars=locals()) +bld.SAMBA3_LIBRARY('smbconf', + source=LIB_SMBCONF_SRC, + deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc PARAM_WITHOUT_REG + util_reg samba-util-common errors3 CHARSET3''', + public_headers='../lib/smbconf/smbconf.h', + vnum='0') bld.SAMBA3_LIBRARY('smbd_base', source=SMBD_SRC_BASE, @@ -865,7 +867,7 @@ bld.SAMBA3_LIBRARY('smbd_base', LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO - LIB_SMBCONF REG_FULL FNAME_UTIL + smbconf REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR LIBCLI_SMB_COMMON RPC_SERVER -- cgit From c1ac023b588e1ca676cbbf542ca6f93aa199ad32 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 12 May 2011 14:33:15 +0200 Subject: s3-waf: stop building smbtortre4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Autobuild-User: Günther Deschner Autobuild-Date: Thu May 12 15:35:02 CEST 2011 on sn-devel-104 --- source3/wscript_build | 7 ------- 1 file changed, 7 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 9ea7dd9c24..105aee99cb 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -642,13 +642,6 @@ t = bld.SAMBA_GENERATOR('build_env.h', t.env.SRCDIR = bld.path.abspath() t.env.BUILDDIR = bld.path.abspath() -if not bld.env.toplevel_build: - bld.SAMBA_GENERATOR('smbtorture4', - source='', - target='', - rule='cd ../; make -f Makefile-smbtorture4 bin/smbtorture4', - always=True) - bld.SETUP_BUILD_GROUPS() if not bld.env.toplevel_build: -- cgit From f18cca9a0a690013eb609719c4798da9b0e1054b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 13 May 2011 10:26:20 +0200 Subject: lib/util/charset Move built-in charset modules to the top level This removes the 'charset' subsystem and allows these modules to be used across the whole of Samba. Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 105aee99cb..61e892d55e 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -777,7 +777,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', private_library=True, vars=locals()) -- cgit From 816c5ccc34d6107c3de619cdf4e2c99fdfd25d59 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 13 May 2011 11:49:49 +0200 Subject: s3-build: use ndr-standard in msrpc3 This avoids pulling in the symbols from the NDR_ subsystems directly. Andrew Bartlett --- source3/wscript_build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 61e892d55e..21e49ddd7c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -692,9 +692,10 @@ bld.SAMBA3_LIBRARY('nss_wins', bld.SAMBA3_SUBSYSTEM('msrpc3', source='${LIBMSRPC_SRC}', - deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL - RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH - LIBTSOCKET KRB5_WRAP rpccommon''', + deps='''ndr ndr-util ndr-standard + RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH + LIBTSOCKET KRB5_WRAP rpccommon + LIBSMB''', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN', -- cgit From 2fc342c20ab455a5961b1b2b507aa7b62ecabf1f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 12 May 2011 20:12:07 +0200 Subject: waf-build: Add more libraries to avoid duplicate symbols The new source of duplicates is calling libnetapi from inside smbtorture. Andrew Bartlett --- source3/wscript_build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 21e49ddd7c..fe02dfcd0c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -797,10 +797,11 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON', vars=locals()) -bld.SAMBA3_SUBSYSTEM('LIBSMB', - source=LIBSMB_SRC, - deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON', - vars=locals()) +bld.SAMBA3_LIBRARY('LIBSMB', + source=LIBSMB_SRC, + deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON', + vars=locals(), + private_library=True) bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', source=DRSUAPI_SRC, -- cgit From baad855bcaad28d341867ae03c67e68e520a743a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 14 May 2011 21:54:57 +0200 Subject: build: Make msrpc3 a library --- source3/wscript_build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index fe02dfcd0c..7e89745472 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -690,13 +690,14 @@ bld.SAMBA3_LIBRARY('nss_wins', realname='libnss_wins.so.2', vnum='2') -bld.SAMBA3_SUBSYSTEM('msrpc3', - source='${LIBMSRPC_SRC}', - deps='''ndr ndr-util ndr-standard +bld.SAMBA3_LIBRARY('msrpc3', + source='${LIBMSRPC_SRC}', + deps='''ndr ndr-util ndr-standard RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH LIBTSOCKET KRB5_WRAP rpccommon LIBSMB''', - vars=locals()) + vars=locals(), + private_library=True) bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN', source='', -- cgit From d17367bd6874ccc2d0e84b478ea3e12d91a9bd99 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 May 2011 21:08:06 +1000 Subject: build: Add depenencies needed by Samba3 subsystems --- source3/wscript_build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7e89745472..f49cd235e7 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -956,6 +956,7 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE', bld.SAMBA3_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, + deps='ads', vars=locals()) bld.SAMBA3_SUBSYSTEM('ndr-util', @@ -997,7 +998,7 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_SPOOLSS', bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG', source=LIBCLI_WINREG_SRC, - deps='RPC_NDR_WINREG') + deps='RPC_NDR_WINREG RPC_NCACN_NP') bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL', source=RPC_CLIENT_SCHANNEL_SRC, -- cgit From fc466282f8bb6a6fa7285b2dbc4e06d31015dc5a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 May 2011 21:08:20 +1000 Subject: build: Add rpc_client grouping library --- source3/wscript_build | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index f49cd235e7..6d644fa8ad 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -655,6 +655,13 @@ if not bld.env.toplevel_build: ######################## SUBSYSTEMS ################################# +# A grouping library to get various helper rpc clients in a library +bld.SAMBA3_LIBRARY('rpc_client', + source='', + deps='RPC_CLIENT_SCHANNEL INIT_LSA INIT_NETLOGON INIT_SAMR LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS LIBCLI_WINREG', + private_library=True, + grouping_library=True) + bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT -- cgit From 41b3c38587f1153d49c1805869aa186b66501f7a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 May 2011 21:18:25 +1000 Subject: librpc/ndr Merge ndr_print_sockaddr_storage() into common code There is no longer a reason to leave this source3 specific, and this brings it into a library (avoiding duplicate symbols). Andrew Bartlett --- source3/wscript_build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 6d644fa8ad..3e8b2b278f 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -39,8 +39,6 @@ COMPRESSION_SRC = '../lib/compression/mszip.c' DRSUAPI_SRC = '''${COMPRESSION_SRC}''' -LIBNDR_SRC = '''librpc/ndr/util.c''' - LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c rpc_client/init_spoolss.c''' @@ -699,7 +697,7 @@ bld.SAMBA3_LIBRARY('nss_wins', bld.SAMBA3_LIBRARY('msrpc3', source='${LIBMSRPC_SRC}', - deps='''ndr ndr-util ndr-standard + deps='''ndr ndr-standard RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH LIBTSOCKET KRB5_WRAP rpccommon LIBSMB''', @@ -786,7 +784,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', private_library=True, vars=locals()) @@ -966,10 +964,6 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL', deps='ads', vars=locals()) -bld.SAMBA3_SUBSYSTEM('ndr-util', - source=LIBNDR_SRC, - vars=locals()) - bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', deps='tdb-wrap', -- cgit From 75faa9eec5fecfc033bd4941427da28e4471a516 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 May 2011 21:20:36 +1000 Subject: build: Make POPT_SAMBA3 a library This avoids some duplicate symbols when libnet and libsmbclient are linked into the same binary (smbtorture4). Andrew Bartlett --- source3/wscript_build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 3e8b2b278f..f4ed9155e1 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -772,10 +772,11 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL', deps='REG_SMBCONF', vars=locals()) -bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3', - source=POPT_LIB_SRC, - deps='popt', - vars=locals()) +bld.SAMBA3_LIBRARY('POPT_SAMBA3', + source=POPT_LIB_SRC, + deps='popt', + vars=locals(), + private_library=True) bld.SAMBA3_SUBSYSTEM('KRBCLIENT', source=KRBCLIENT_SRC, -- cgit From c47b078ec339343732da21212e04a5b7cf548e8c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 May 2011 21:57:27 +1000 Subject: build: Add 'cap' as a dependency of samba3core --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index f4ed9155e1..7fdc4c3e35 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -785,7 +785,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces cap', private_library=True, vars=locals()) -- cgit From d753b3b0639d88579ce4d7118bfb586207017316 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 19 May 2011 17:37:19 +0200 Subject: fix the WAF build Autobuild-User: Volker Lendecke Autobuild-Date: Thu May 19 18:46:51 CEST 2011 on sn-devel-104 --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7fdc4c3e35..90a03fe649 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -142,7 +142,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c libsmb/clioplock.c libsmb/clirap2.c - libsmb/smb_seal.c libsmb/async_smb.c + libsmb/smb_seal.c libsmb/async_smb.c libsmb/read_smb.c libsmb/cli_np_tstream.c libsmb/smbsock_connect.c''' -- cgit From 0f8018676a6cb33238d506338d4fbb8b683550d3 Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Fri, 20 May 2011 08:12:08 +0000 Subject: Fix numerous missing dependencies in WAF build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the recent consolidation of code between s3 and s4, a number of new dependencies have been implicitly introduced. For example, previous s3 code gained an implicit dependency on talloc after the charset related consolidation (lib/util/charset/charset.h now includes talloc.h). When building against the embedded version of talloc this isn't a problem since the paths are automatically added to the search path, but when building against the external libraries build failures will occur for all components that don't directly or indirectly include talloc as a dependency. Since charset.h is included from util.h, which in turn is included from includes.h, this means most of the codebase (s3 and s4) has such an undeclared dependency. Therefore, samba-util-common and samba-util have been added as dependencies to the s3 and s4 code respectively, for all cases where the source would otherwise fail to build. Additionally, a few other dependencies are added in specific wscript_build files to address similar dependency-related problems. https://bugzilla.samba.org/show_bug.cgi?id=8128 Signed-off-by: Sean Finney Signed-off-by: Matthias Dieter Wallnöfer Signed-off-by: Andrew Bartlett Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Wed May 25 19:22:13 CEST 2011 on sn-devel-104 --- source3/wscript_build | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 90a03fe649..2ee4f62fe0 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -711,7 +711,7 @@ bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN', bld.SAMBA3_SUBSYSTEM('LIBGPO', source='${LIBGPO_SRC}', - deps='gpext', + deps='gpext talloc', vars=locals()) bld.SAMBA3_SUBSYSTEM('AVAHI', @@ -720,7 +720,8 @@ bld.SAMBA3_SUBSYSTEM('AVAHI', enabled=bld.env.with_avahi) bld.SAMBA3_SUBSYSTEM('GROUPDB', - source=GROUPDB_SRC) + source=GROUPDB_SRC, + deps='tdb') bld.SAMBA3_SUBSYSTEM('TLDAP', source=TLDAP_SRC, @@ -733,7 +734,8 @@ bld.SAMBA3_LIBRARY('passdb', vars=locals()) bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', - source=PARAM_UTIL_SRC) + source=PARAM_UTIL_SRC, + deps='samba-util-common') bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, @@ -748,10 +750,12 @@ bld.SAMBA3_LIBRARY('param', bld.SAMBA3_SUBSYSTEM('REGFIO', source=REGFIO_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('REG_API_REGF', source=REG_API_REGF_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_LIBRARY('smbregistry', @@ -774,7 +778,7 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL', bld.SAMBA3_LIBRARY('POPT_SAMBA3', source=POPT_LIB_SRC, - deps='popt', + deps='popt samba-util-common', vars=locals(), private_library=True) @@ -844,14 +848,17 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER', source=LIBADS_PRINTER_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBAFS', source=AFS_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', source=AFS_SETTOKEN_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_LIBRARY('smbconf', @@ -884,10 +891,12 @@ bld.SAMBA3_SUBSYSTEM('LOCKING', bld.SAMBA3_SUBSYSTEM('PROFILE', source='${PROFILE_SRC}', + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('PRINTBASE', source=PRINTBASE_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('PRINTBACKEND', @@ -902,10 +911,12 @@ bld.SAMBA3_SUBSYSTEM('PRINTING', bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL', source=PASSWD_UTIL_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', source=FNAME_UTIL_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNET', @@ -940,6 +951,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNBT', bld.SAMBA3_SUBSYSTEM('SERVICES', source=SERVICES_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH', @@ -954,10 +966,12 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE', bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION', source=VERSION_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('SLCACHE', source=SLCACHE_SRC, + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('DCUTIL', @@ -972,11 +986,12 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', bld.SAMBA3_SUBSYSTEM('CHARSET3', source='''lib/util_str.c lib/charcnv.c lib/fstring.c''', - public_deps='ICONV_WRAPPER CHARSET', + public_deps='ICONV_WRAPPER samba3core CHARSET', deps='samba-util') bld.SAMBA3_SUBSYSTEM('ldb3', - source='lib/ldb_compat.c') + source='lib/ldb_compat.c', + deps='samba-util-common') bld.SAMBA3_SUBSYSTEM('errors3', source='libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', @@ -1003,17 +1018,21 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG', deps='RPC_NDR_WINREG RPC_NCACN_NP') bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL', - source=RPC_CLIENT_SCHANNEL_SRC, - vars=locals()) + source=RPC_CLIENT_SCHANNEL_SRC, + deps='samba-util-common', + vars=locals()) bld.SAMBA3_SUBSYSTEM('INIT_LSA', - source='rpc_client/init_lsa.c') + source='rpc_client/init_lsa.c', + deps='samba-util-common') bld.SAMBA3_SUBSYSTEM('INIT_NETLOGON', - source='rpc_client/init_netlogon.c') + source='rpc_client/init_netlogon.c', + deps='samba-util-common') bld.SAMBA3_SUBSYSTEM('INIT_SAMR', - source='rpc_client/init_samr.c') + source='rpc_client/init_samr.c', + deps='samba-util-common') ########################## BINARIES ################################# @@ -1257,7 +1276,7 @@ bld.SAMBA3_BINARY('smbfilter', bld.SAMBA3_BINARY('versiontest', source='lib/version_test.c', - deps='SAMBA_VERSION', + deps='SAMBA_VERSION samba3core param', vars=locals()) bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3, @@ -1309,7 +1328,7 @@ bld.SAMBA3_BINARY('split_tokens', bld.SAMBA3_BINARY('vlp', source=VLP_SRC, - deps='''talloc tdb PARAM_UTIL UTIL_TDB''', + deps='''talloc tdb PARAM_UTIL UTIL_TDB samba3core param''', vars=locals()) swat_dir = os.path.join(bld.curdir, '../swat') -- cgit From 53140724f149058a8404727533ae792cbb8b1340 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 14:53:32 +1000 Subject: s3-lib Move string_init functions into their own file These have not been moved in common, as they are not talloc-based, but it helps with dependencies if these are seperated from the rest of util_str.c Andrew Bartlett --- source3/wscript_build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 2ee4f62fe0..5b89cf0427 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -789,7 +789,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces cap', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces cap string_init', private_library=True, vars=locals()) @@ -984,6 +984,9 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', deps='tdb-wrap', vars=locals()) +bld.SAMBA3_SUBSYSTEM('string_init', + source='''lib/string_init.c''') + bld.SAMBA3_SUBSYSTEM('CHARSET3', source='''lib/util_str.c lib/charcnv.c lib/fstring.c''', public_deps='ICONV_WRAPPER samba3core CHARSET', -- cgit From ade01f083c502ecf7cba19303eb16d3c9a4be52a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 14:58:24 +1000 Subject: s3-smbd Split conn.c into 3 files The idea with this split is to make it easier to handle dependencies, avoiding having the loadparm code depend on the global server variables, without resorting to dummy functions and linker tricks. conn_clear_vuid_cache() is brought in from uid.c to make it static Andrew Bartlett --- source3/wscript_build | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 5b89cf0427..89fa4ac768 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -347,7 +347,8 @@ BUILDOPT_SRC = '''smbd/build_options.c''' SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c smbd/utmp.c smbd/session.c - smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn.c + smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn_msg.c + smbd/conn_idle.c smbd/share_access.c smbd/fileio.c smbd/ipc.c smbd/lanman.c smbd/negprot.c smbd/message.c smbd/nttrans.c smbd/pipes.c @@ -739,7 +740,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL''', + deps='''PARAM_UTIL smbd_conn USER_UTIL PRINTING''', vars=locals()) bld.SAMBA3_LIBRARY('param', @@ -868,6 +869,12 @@ bld.SAMBA3_LIBRARY('smbconf', public_headers='../lib/smbconf/smbconf.h', vnum='0') +bld.SAMBA3_LIBRARY('smbd_conn', + source='smbd/conn.c', + deps='samba3core string_init', + allow_undefined_symbols=False, + private_library=True) + bld.SAMBA3_LIBRARY('smbd_base', source=SMBD_SRC_BASE, deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5 @@ -879,7 +886,7 @@ bld.SAMBA3_LIBRARY('smbd_base', smbconf REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR - LIBCLI_SMB_COMMON RPC_SERVER + LIBCLI_SMB_COMMON RPC_SERVER smbd_conn ''', private_library=True, vars=locals()) -- cgit From 33e8126c3c810388d079008d6de8291a294b9bd8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 15:01:04 +1000 Subject: s3-param split service.c into param and smbd components The dependency chain of find_service can't be satisfied sensibly outside smbd, so don't include this in the main 'param' subsystem. Also remove the duplicate find_service() and conn_snum_used() from dummysmbd.c: The WAF build does not need these dummies any more, but file. Andrew Bartlett --- source3/wscript_build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 89fa4ac768..cbb94797f0 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -740,7 +740,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn USER_UTIL PRINTING''', + deps='''PARAM_UTIL smbd_conn''', vars=locals()) bld.SAMBA3_LIBRARY('param', @@ -749,6 +749,10 @@ bld.SAMBA3_LIBRARY('param', private_library=True, vars=locals()) +bld.SAMBA3_SUBSYSTEM('param_service', + source='param/service.c', + deps = 'USER_UTIL param USER_UTIL PRINTING') + bld.SAMBA3_SUBSYSTEM('REGFIO', source=REGFIO_SRC, deps='samba-util-common', @@ -886,7 +890,7 @@ bld.SAMBA3_LIBRARY('smbd_base', smbconf REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR - LIBCLI_SMB_COMMON RPC_SERVER smbd_conn + LIBCLI_SMB_COMMON RPC_SERVER smbd_conn param_service ''', private_library=True, vars=locals()) -- cgit From 381423b1bdba4c7d1931b162d872134c42e432cf Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 13:23:56 +1000 Subject: libcli/security: move secdesc.c to the top level libcli/security This code does not rely on lp_ or other source3 only functions, so can be part of the common library. Andrew Bartlett --- source3/wscript_build | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index cbb94797f0..543aef7158 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -87,7 +87,6 @@ LIB_SRC = ''' lib/module.c lib/events.c lib/server_contexts.c lib/ldap_escape.c - lib/secdesc.c lib/fncall.c libads/krb5_errs.c lib/system_smbd.c lib/audit.c lib/file_id.c lib/idmap_cache.c''' -- cgit From 3b7e1ac31c764fc2023925288783c868eb6ec31e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 16:16:08 +1000 Subject: s3-lib Move realloc based string substitution functions out of util_str.c This makes the dependency set for source3/lib/util_str.c simpiler, which in turn makes it easier to build a dependency tree. Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 543aef7158..2e281da12c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -77,7 +77,7 @@ LIB_SRC = ''' lib/util_file.c lib/util.c lib/util_cmdline.c lib/util_names.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c - lib/substitute.c lib/dbwrap_util.c + lib/substitute.c lib/substitute_generic.c lib/dbwrap_util.c lib/ms_fnmatch.c lib/tallocmsg.c lib/dmallocmsg.c libsmb/clisigning.c libsmb/smb_signing.c -- cgit From 702d8d5f87f36a6b62a8ad35af62fd0e7cb20384 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 16:18:51 +1000 Subject: s3-lib Move free_namearray() into it's own file This makes it easier to have conn_smbd strictly depend on all it's dependencies. Andrew Bartlett --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 2e281da12c..9f922e4294 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -75,6 +75,7 @@ LIB_SRC = ''' lib/wins_srv.c lib/util_sid.c lib/util_file.c + lib/namearray.c lib/util.c lib/util_cmdline.c lib/util_names.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c lib/substitute.c lib/substitute_generic.c lib/dbwrap_util.c -- cgit From c7131e6b736cf21a94b045c2ad854016c51c316b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 16:28:17 +1000 Subject: s3-build Add dependency on 'ldap' and 'ber' These external libraries are required for the hooks in lib/ldap_debug_handler.c --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 9f922e4294..2c2da7689a 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -740,7 +740,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn''', + deps='''PARAM_UTIL smbd_conn ldap lber''', vars=locals()) bld.SAMBA3_LIBRARY('param', -- cgit From e65f4dd9d4ca7019e537da8f4ab3061c76fd8204 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 16:55:30 +1000 Subject: s3-build: Rearrange build system to seperate out simple libraries This will slowly allow us to develop a proper dependency tree without interlibrary loops and unresolved symbols. Andrew Bartlett --- source3/wscript_build | 81 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 27 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 2c2da7689a..7a8ce26f27 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -71,11 +71,10 @@ LIB_SRC = ''' lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c lib/username.c lib/access.c lib/smbrun.c - lib/bitmap.c lib/dprintf.c + lib/dprintf.c lib/wins_srv.c lib/util_sid.c lib/util_file.c - lib/namearray.c lib/util.c lib/util_cmdline.c lib/util_names.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c lib/substitute.c lib/substitute_generic.c lib/dbwrap_util.c @@ -83,7 +82,7 @@ LIB_SRC = ''' lib/tallocmsg.c lib/dmallocmsg.c libsmb/clisigning.c libsmb/smb_signing.c intl/lang_tdb.c - lib/conn_tdb.c lib/adt_tree.c lib/gencache.c + lib/conn_tdb.c lib/gencache.c lib/sessionid_tdb.c lib/module.c lib/events.c lib/server_contexts.c @@ -732,6 +731,7 @@ bld.SAMBA3_LIBRARY('passdb', source=PASSDB_SRC, deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH flag_mapping', private_library=True, + allow_undefined_symbols=False, vars=locals()) bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', @@ -743,11 +743,10 @@ bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', deps='''PARAM_UTIL smbd_conn ldap lber''', vars=locals()) -bld.SAMBA3_LIBRARY('param', - source='', - deps='PARAM_WITHOUT_REG samba-util smbconf', - private_library=True, - vars=locals()) +bld.SAMBA3_SUBSYSTEM('param', + source='', + deps='PARAM_WITHOUT_REG samba-util smbconf', + vars=locals()) bld.SAMBA3_SUBSYSTEM('param_service', source='param/service.c', @@ -766,10 +765,10 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF', bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, deps='''LIB_NONSMBD tdb-wrap3 NDR_SECURITY UTIL_TDB talloc - replace samba3core util_reg samba-util-common security - errors3 CHARSET3''', - private_library=True, - vars=locals()) + replace util_reg samba-util-common security + errors3 adt_tree''', + vars=locals(), + private_library=True) bld.SAMBA3_SUBSYSTEM('REG_SMBCONF', source=REG_SMBCONF_SRC, @@ -792,15 +791,13 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', public_deps='KRB5_WRAP k5crypto', vars=locals()) -bld.SAMBA3_LIBRARY('samba3core', +bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL interfaces cap string_init', - private_library=True, + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', source=LIB_NONSMBD_SRC, - deps='samba3core', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR', @@ -830,9 +827,9 @@ bld.SAMBA3_SUBSYSTEM('CLDAP', vars=locals()) bld.SAMBA3_SUBSYSTEM('SECRETS3', - source=SECRETS_SRC, - deps='NDR_SECRETS', - vars=locals()) + source=SECRETS_SRC, + deps='NDR_SECRETS param samba3core passdb', + vars=locals()) bld.SAMBA3_SUBSYSTEM('SMBLDAP', source=SMBLDAP_SRC, @@ -869,13 +866,13 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc PARAM_WITHOUT_REG - util_reg samba-util-common errors3 CHARSET3''', + util_reg samba-util-common errors3 CHARSET''', public_headers='../lib/smbconf/smbconf.h', vnum='0') bld.SAMBA3_LIBRARY('smbd_conn', source='smbd/conn.c', - deps='samba3core string_init', + deps='string_init bitmap namearray', allow_undefined_symbols=False, private_library=True) @@ -893,6 +890,7 @@ bld.SAMBA3_LIBRARY('smbd_base', LIBCLI_SMB_COMMON RPC_SERVER smbd_conn param_service ''', private_library=True, + allow_undefined_symbols=False, vars=locals()) bld.SAMBA3_SUBSYSTEM('LOCKING', @@ -995,13 +993,42 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', deps='tdb-wrap', vars=locals()) -bld.SAMBA3_SUBSYSTEM('string_init', - source='''lib/string_init.c''') +bld.SAMBA3_LIBRARY('string_init', + source='''lib/string_init.c''', + deps='samba-util-common', + private_library=True, + allow_undefined_symbols=False) + +bld.SAMBA3_LIBRARY('util_str', + source='''lib/util_str.c''', + deps='samba-util-common CHARSET', + private_library=True, + allow_undefined_symbols=False) + +bld.SAMBA3_LIBRARY('bitmap', + source='lib/bitmap.c', + deps='samba-util-common', + private_library=True, + allow_undefined_symbols=False) -bld.SAMBA3_SUBSYSTEM('CHARSET3', - source='''lib/util_str.c lib/charcnv.c lib/fstring.c''', - public_deps='ICONV_WRAPPER samba3core CHARSET', - deps='samba-util') +bld.SAMBA3_LIBRARY('namearray', + source='lib/namearray.c', + deps='samba-util-common', + private_library=True, + allow_undefined_symbols=False) + +bld.SAMBA3_LIBRARY('adt_tree', + source='lib/adt_tree.c', + deps='samba-util-common', + private_library=True, + allow_undefined_symbols=False) + +bld.SAMBA3_LIBRARY('CHARSET3', + source='''lib/charcnv.c lib/fstring.c''', + public_deps='ICONV_WRAPPER CHARSET', + deps='samba-util util_str', + private_library=True, + allow_undefined_symbols=False) bld.SAMBA3_SUBSYSTEM('ldb3', source='lib/ldb_compat.c', -- cgit From 019910034854dc1ed70ba09a14d419ed45903715 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 17:27:23 +1000 Subject: s3-build Create dbwrap_util subsystem This contains the functions from dbwrap that don't require lp_ functions, and can therefore be put into a library (without dependency loops). Andrew Bartlett --- source3/wscript_build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7a8ce26f27..90f03ef1c9 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -77,7 +77,7 @@ LIB_SRC = ''' lib/util_file.c lib/util.c lib/util_cmdline.c lib/util_names.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c - lib/substitute.c lib/substitute_generic.c lib/dbwrap_util.c + lib/substitute.c lib/substitute_generic.c lib/ms_fnmatch.c lib/tallocmsg.c lib/dmallocmsg.c libsmb/clisigning.c libsmb/smb_signing.c @@ -793,7 +793,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', @@ -993,6 +993,12 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', deps='tdb-wrap', vars=locals()) +bld.SAMBA3_LIBRARY('dbwrap_util', + source='lib/dbwrap_util.c', + deps='samba-util-common UTIL_TDB errors', + private_library=True, + allow_undefined_symbols=False) + bld.SAMBA3_LIBRARY('string_init', source='''lib/string_init.c''', deps='samba-util-common', -- cgit From 83e62de9a79b4542f85611126a5589ed8ad2eb34 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 17:39:35 +1000 Subject: s3-build Move dbwrap_rbt into dbwrap_util subsystem --- source3/wscript_build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 90f03ef1c9..0938fc8103 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -16,8 +16,7 @@ bld.env.public_headers_allow_broken = True TDB_LIB_SRC = ''' lib/dbwrap.c lib/dbwrap_tdb.c lib/dbwrap_ctdb.c - lib/g_lock.c - lib/dbwrap_rbt.c''' + lib/g_lock.c''' TDB_VALIDATE_SRC = '''lib/tdb_validate.c''' @@ -994,7 +993,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', vars=locals()) bld.SAMBA3_LIBRARY('dbwrap_util', - source='lib/dbwrap_util.c', + source='lib/dbwrap_util.c lib/dbwrap_rbt.c', deps='samba-util-common UTIL_TDB errors', private_library=True, allow_undefined_symbols=False) -- cgit From 355703249401aefe24caceb4e5622a9d249a745f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 17:42:06 +1000 Subject: s3-build Add util_sec subsystem --- source3/wscript_build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 0938fc8103..eb67855f58 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -75,7 +75,7 @@ LIB_SRC = ''' lib/util_sid.c lib/util_file.c lib/util.c lib/util_cmdline.c lib/util_names.c - lib/util_sock.c lib/sock_exec.c lib/util_sec.c + lib/util_sock.c lib/sock_exec.c lib/substitute.c lib/substitute_generic.c lib/ms_fnmatch.c lib/tallocmsg.c lib/dmallocmsg.c @@ -792,7 +792,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', @@ -1010,6 +1010,12 @@ bld.SAMBA3_LIBRARY('util_str', private_library=True, allow_undefined_symbols=False) +bld.SAMBA3_LIBRARY('util_sec', + source='''lib/util_sec.c''', + deps='samba-util-common', + private_library=True, + allow_undefined_symbols=False) + bld.SAMBA3_LIBRARY('bitmap', source='lib/bitmap.c', deps='samba-util-common', -- cgit From 3aa9eead2702880b1f645793b48f4e7d9e0fc17c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 18:37:00 +1000 Subject: s3-build Make smbregistry depend on more of the subsystems it needs This is not the full list (that can be seen by setting allow_undefined_symbols=True). Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index eb67855f58..7ca39ad2af 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -765,7 +765,7 @@ bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, deps='''LIB_NONSMBD tdb-wrap3 NDR_SECURITY UTIL_TDB talloc replace util_reg samba-util-common security - errors3 adt_tree''', + errors3 adt_tree dbwrap_util util_str util_sec''', vars=locals(), private_library=True) -- cgit From caf0df2dde2f39c3b271a79fab9358475de6a6e4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 May 2011 18:39:27 +1000 Subject: s3-build Specify more of the smbconf dependencies This brings more functions into util_names.c, and util_names.c into PARAM_WITHOUT_REG_SRC. This is not yet a full list, that would formalise the implicit dependency loop. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Tue May 31 01:43:37 CEST 2011 on sn-devel-104 --- source3/wscript_build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7ca39ad2af..842d95e306 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -74,7 +74,7 @@ LIB_SRC = ''' lib/wins_srv.c lib/util_sid.c lib/util_file.c - lib/util.c lib/util_cmdline.c lib/util_names.c + lib/util.c lib/util_cmdline.c lib/util_sock.c lib/sock_exec.c lib/substitute.c lib/substitute_generic.c lib/ms_fnmatch.c @@ -98,7 +98,7 @@ POPT_LIB_SRC = '''lib/popt_common.c''' PARAM_UTIL_SRC = '''param/util.c''' PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c - lib/sharesec.c lib/ldap_debug_handler.c''' + lib/sharesec.c lib/ldap_debug_handler.c lib/util_names.c''' KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c libsmb/clikrb5.c''' @@ -865,7 +865,7 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc PARAM_WITHOUT_REG - util_reg samba-util-common errors3 CHARSET''', + util_reg samba-util-common errors3 CHARSET SAMBA_VERSION''', public_headers='../lib/smbconf/smbconf.h', vnum='0') -- cgit From 8c8ff2cd6b597f7c4759cfaf178857ac533cc9ba Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 31 May 2011 10:42:30 +1000 Subject: s3-lib Move source3-specific malloc replacements into a seperate file This will make it easier to create a dep tree for otherwise simple libraries. Andrew Bartlett --- source3/wscript_build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 842d95e306..21ada04330 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -792,7 +792,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', @@ -998,6 +998,12 @@ bld.SAMBA3_LIBRARY('dbwrap_util', private_library=True, allow_undefined_symbols=False) +bld.SAMBA3_LIBRARY('util_malloc', + source='''lib/util_malloc.c''', + deps='samba-util-common', + private_library=True, + allow_undefined_symbols=False) + bld.SAMBA3_LIBRARY('string_init', source='''lib/string_init.c''', deps='samba-util-common', -- cgit From 7e5660282e94c969ac049eca5da7439982414010 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 31 May 2011 10:45:08 +1000 Subject: s3-build Put memcache in a standalone library Autobuild-User: Andrew Bartlett Autobuild-Date: Tue May 31 04:08:08 CEST 2011 on sn-devel-104 --- source3/wscript_build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 21ada04330..834c7f56c2 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -57,7 +57,6 @@ REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c''' LIB_SRC = ''' lib/messages.c lib/messages_local.c lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c - lib/memcache.c lib/talloc_dict.c lib/util_sconn.c lib/serverid.c @@ -792,7 +791,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', @@ -1040,6 +1039,12 @@ bld.SAMBA3_LIBRARY('adt_tree', private_library=True, allow_undefined_symbols=False) +bld.SAMBA3_LIBRARY('memcache', + source='lib/memcache.c', + deps='samba-util-common util_malloc', + private_library=True, + allow_undefined_symbols=False) + bld.SAMBA3_LIBRARY('CHARSET3', source='''lib/charcnv.c lib/fstring.c''', public_deps='ICONV_WRAPPER CHARSET', -- cgit From 5a6368f1e2a4348fdcdc062b2546eb45bf943aed Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 5 Jun 2011 11:30:43 +0200 Subject: s3:winbind: Convert WINBINDD_WINS_BYIP to the async API --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 834c7f56c2..4fd7a7b556 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -255,6 +255,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/winbindd_misc.c winbindd/winbindd_cm.c winbindd/winbindd_wins.c + winbindd/winbindd_wins_byip.c winbindd/winbindd_msrpc.c winbindd/winbindd_rpc.c winbindd/winbindd_reconnect.c -- cgit From 1dfc6fa558e7735341a7095aa46e5568a4f56cfe Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 1 Jun 2011 23:22:24 +1000 Subject: s4-param Add hook between Samba3 and Samba4 loadparm systems. In the top level build, this allows calls to code that requires a lpcfg_ style loadparm_context, while using the global parameters loaded from the source3 loadparm code. Andrew Bartlett --- source3/wscript_build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 4fd7a7b556..b30c204ab3 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -737,9 +737,15 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', source=PARAM_UTIL_SRC, deps='samba-util-common') +if bld.env.toplevel_build: + bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', + source='param/loadparm_ctx.c', + deps='''s3_param_h PARAM_WITHOUT_REG''', + vars=locals()) + bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn ldap lber''', + deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX''', vars=locals()) bld.SAMBA3_SUBSYSTEM('param', @@ -1410,7 +1416,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') - + bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', '') ########################## INCLUDES ################################# -- cgit From a772797a384a1142c5af95bd06c14a141dea38d7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 2 May 2011 11:10:12 +1000 Subject: librpc/idr Use the Samba3 notify.idl in common. The extra fields in the structure that Samba4 does not use should not bother it. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index b30c204ab3..f09b8707f1 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -888,7 +888,7 @@ bld.SAMBA3_LIBRARY('smbd_base', PARAM_WITHOUT_REG samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE - PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO + PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO smbconf REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR -- cgit From 264409750a569b632576e8cd6fddd72fc29e9660 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 17 Jun 2011 14:40:07 +1000 Subject: s3-util: remove the s3 nterr.c this is now in common code Pair-Programmed-With: Andrew Bartlett --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index f09b8707f1..901721573c 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1064,7 +1064,7 @@ bld.SAMBA3_SUBSYSTEM('ldb3', deps='samba-util-common') bld.SAMBA3_SUBSYSTEM('errors3', - source='libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', + source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', deps='LIBCLI_ERRORS') bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR', -- cgit From 763941f2456f6c50581a1fa54aaba810a2b9efd1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 18 Jun 2011 09:56:12 +0200 Subject: s3: Test nttrans_create This is a test for the share security descriptor exception for nttrans_create --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 901721573c..99e8d95a32 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -563,6 +563,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/ torture/test_async_echo.c torture/test_addrchange.c torture/test_posix_append.c + torture/test_nttrans_create.c torture/test_case_insensitive.c torture/test_notify_online.c torture/test_smbsock_any_connect.c''' -- cgit From 018f4a5889743f742a59e9ad72056b2ea09adfe9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 20 Jun 2011 14:03:26 +1000 Subject: libcli/util Bring samba4 unix -> nt_status code in common. Due to library link orders, this is already the function that is being used. However we still need to sort out the duplicate symbol issues, probably by renaming things. Andrew Bartlett --- source3/wscript_build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 99e8d95a32..e3160e6913 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1066,7 +1066,7 @@ bld.SAMBA3_SUBSYSTEM('ldb3', bld.SAMBA3_SUBSYSTEM('errors3', source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', - deps='LIBCLI_ERRORS') + deps='errors') bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR', source=LIBCLI_SAMR_SRC, @@ -1412,7 +1412,6 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat') if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3') - bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3') bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') -- cgit From 754c677b0bbf3ea6c7d2a73c93848f1b0d68c91e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 16:54:15 +0930 Subject: lib: import ccan modules for tdb2 Imported from git://git.ozlabs.org/~ccan/ccan init-1161-g661d41f Signed-off-by: Rusty Russell --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index e3160e6913..df38e4c9db 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1425,6 +1425,7 @@ bld.RECURSE('../auth') bld.RECURSE('../auth/kerberos') bld.RECURSE('../lib/addns') bld.RECURSE('../lib/async_req') +bld.RECURSE('../lib/ccan') bld.RECURSE('../lib/socket') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') -- cgit From 20687dcd7b66635f851f09c51f967e17203c8ab0 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 16:55:15 +0930 Subject: smb_share_modes: don't use tdb_jenkins_hash. It's a nice hash, but this usage has nothing to do with TDB. So use the Jenkins hash directly from CCAN instead (it's the same one). Signed-off-by: Rusty Russell --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index df38e4c9db..1aefad0b67 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -684,6 +684,7 @@ bld.SAMBA3_LIBRARY('libsmb/smbclient', bld.SAMBA3_LIBRARY('smbsharemodes', source=LIBSMBSHAREMODES_SRC, public_deps='''talloc tdb''', + deps='''ccan''', public_headers='include/smb_share_modes.h', vnum='0', vars=locals()) -- cgit From f72dd0cf0f5f4b9082d022e26b1d4117b3a04d52 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 16:56:15 +0930 Subject: source3/lib/util.c: str_checksum to use Jenkins hash from CCAN. Rather than tdb's internal one. --- source3/wscript_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 1aefad0b67..0e8ec502f5 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -800,7 +800,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache ccan', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', -- cgit From 0e4c358e2710580d5aeb439d767c87aaf4c0f2f3 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 20 Jun 2011 18:40:25 +0930 Subject: tdb_compat.h: divert every tdb build and includes to tdb_compat We change all the headers and wscript files to use tdb_compat; this means we have one place to decide whether to use TDB1 or TDB2. Signed-off-by: Rusty Russell --- source3/wscript_build | 80 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 0e8ec502f5..0e76d1f7af 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -662,7 +662,7 @@ bld.SAMBA3_LIBRARY('rpc_client', bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, - public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT + public_deps='''talloc tdb_compat cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP PARAM_WITHOUT_REG samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL @@ -675,7 +675,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('libsmb/smbclient', source=LIBSMBCLIENT_SRC, - public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP + public_deps='''talloc tdb_compat wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC POPT_SAMBA3''', public_headers='include/libsmbclient.h', vnum='0', @@ -683,7 +683,7 @@ bld.SAMBA3_LIBRARY('libsmb/smbclient', bld.SAMBA3_LIBRARY('smbsharemodes', source=LIBSMBSHAREMODES_SRC, - public_deps='''talloc tdb''', + public_deps='''talloc tdb_compat''', deps='''ccan''', public_headers='include/smb_share_modes.h', vnum='0', @@ -722,7 +722,7 @@ bld.SAMBA3_SUBSYSTEM('AVAHI', bld.SAMBA3_SUBSYSTEM('GROUPDB', source=GROUPDB_SRC, - deps='tdb') + deps='tdb_compat') bld.SAMBA3_SUBSYSTEM('TLDAP', source=TLDAP_SRC, @@ -885,7 +885,7 @@ bld.SAMBA3_LIBRARY('smbd_conn', bld.SAMBA3_LIBRARY('smbd_base', source=SMBD_SRC_BASE, - deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5 + deps='''tdb_compat tevent dl krb5 ldap gssapi gssapi_krb5 samba-util wbclient crypt nsl cups cap z passdb PARAM_WITHOUT_REG samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER @@ -902,7 +902,7 @@ bld.SAMBA3_LIBRARY('smbd_base', bld.SAMBA3_SUBSYSTEM('LOCKING', source='${LOCKING_SRC}', - deps='''tdb talloc''', + deps='''tdb_compat talloc''', vars=locals()) bld.SAMBA3_SUBSYSTEM('PROFILE', @@ -1116,7 +1116,7 @@ bld.SAMBA3_BINARY('smbd/smbd', bld.SAMBA3_BINARY('nmbd/nmbd', source=NMBD_SRC, - deps='''talloc tdb tevent z cap wbclient dl + deps='''talloc tdb_compat tevent z cap wbclient dl passdb param ldap LIB_NONSMBD LIBSMB POPT_SAMBA3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''', install_path='${SBINDIR}', @@ -1124,7 +1124,7 @@ bld.SAMBA3_BINARY('nmbd/nmbd', bld.SAMBA3_BINARY('winbindd/winbindd', source=WINBINDD_SRC, - deps='''talloc tdb tevent cap dl z + deps='''talloc tdb_compat tevent cap dl z wbclient passdb ldap param LIB_NONSMBD LIBSMB POPT_SAMBA3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER SRV_NDR_WBINT RPC_NDR_WBINT NDR_WBINT LIBAFS @@ -1151,7 +1151,7 @@ bld.SAMBA3_BINARY('web/swat', bld.SAMBA3_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, - deps='''talloc tdb cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL @@ -1164,7 +1164,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, - deps='''talloc tdb cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA LIBCLI_SMB_COMMON''', @@ -1172,7 +1172,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, bld.SAMBA3_BINARY('net', source=NET_SRC, - deps='''talloc tdb netapi addns cap intl POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat netapi addns cap intl POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL @@ -1186,12 +1186,12 @@ bld.SAMBA3_BINARY('net', bld.SAMBA3_BINARY('profiles', source=PROFILES_SRC, - deps='''talloc tdb cap tevent POPT_SAMBA3 param samba3core LIBSMB_ERR LIB_NONSMBD REGFIO''', + deps='''talloc tdb_compat cap tevent POPT_SAMBA3 param samba3core LIBSMB_ERR LIB_NONSMBD REGFIO''', vars=locals()) bld.SAMBA3_BINARY('smbspool', source=CUPS_SRC, - deps='''talloc tdb tevent cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core + deps='''talloc tdb_compat tevent cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) @@ -1204,61 +1204,61 @@ bld.SAMBA3_BINARY('testparm', bld.SAMBA3_BINARY('smbta-util', source=SMBTA_UTIL_SRC, - deps='''talloc tdb tevent cap param POPT_SAMBA3 LIB_NONSMBD + deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 LIB_NONSMBD LIBSMB_ERR''', vars=locals()) bld.SAMBA3_BINARY('smbstatus', source=STATUS_SRC, - deps='''talloc tdb tevent cap param POPT_SAMBA3 LIB_NONSMBD + deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 LIB_NONSMBD LIBSMB_ERR LOCKING PROFILE FNAME_UTIL''', vars=locals()) bld.SAMBA3_BINARY('smbcontrol', source=SMBCONTROL_SRC, - deps='''talloc tdb tevent cap param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3 PRINTBASE''', + deps='''talloc tdb_compat tevent cap param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3 PRINTBASE''', vars=locals()) bld.SAMBA3_BINARY('smbtree', source=SMBTREE_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE RPC_NDR_SRVSVC''', vars=locals()) bld.SAMBA3_BINARY('smbpasswd', source=SMBPASSWD_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL LIBCLI_SAMR INIT_LSA PASSCHANGE''', vars=locals()) bld.SAMBA3_BINARY('pdbedit', source=PDBEDIT_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP PASSWD_UTIL cli-ldap-common''', vars=locals()) bld.SAMBA3_BINARY('smbget', source=SMBGET_SRC, - deps='''talloc tdb libsmb/smbclient POPT_SAMBA3''', + deps='''talloc tdb_compat libsmb/smbclient POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3, source=NMBLOOKUP_SRC, - deps='''talloc tdb tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR LIBNMB''', + deps='''talloc tdb_compat tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR LIBNMB''', vars=locals()) bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3, source=SMBTORTURE_SRC, - deps='''talloc tdb tevent cap wbclient param LIBSMB KRBCLIENT TLDAP + deps='''talloc tdb_compat tevent cap wbclient param LIBSMB KRBCLIENT TLDAP LIB_NONSMBD POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''', vars=locals()) bld.SAMBA3_BINARY('smbconftort', source=SMBCONFTORT_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('replacetort', @@ -1268,25 +1268,25 @@ bld.SAMBA3_BINARY('replacetort', bld.SAMBA3_BINARY('masktest' + bld.env.suffix3, source=MASKTEST_SRC, - deps='''talloc tdb cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA3_BINARY('msgtest', source=MSGTEST_SRC, - deps='''talloc tdb tevent cap param LIBSMB_ERR LIB_NONSMBD''', + deps='''talloc tdb_compat tevent cap param LIBSMB_ERR LIB_NONSMBD''', vars=locals()) bld.SAMBA3_BINARY('smbcacls', source=SMBCACLS_SRC, - deps='''talloc tdb cap wbclient param LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) bld.SAMBA3_BINARY('smbcquotas', source=SMBCQUOTAS_SRC, - deps='''talloc tdb cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT POPT_SAMBA3 passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) @@ -1299,18 +1299,18 @@ bld.SAMBA3_BINARY('eventlogadm', bld.SAMBA3_BINARY('sharesec', source=SHARESEC_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('locktest' + bld.env.suffix3, source=LOCKTEST_SRC, - deps='''talloc tdb tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) bld.SAMBA3_BINARY('pdbtest', source=PDBTEST_SRC, - deps='''talloc tdb cap wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb + deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''', vars=locals()) @@ -1321,7 +1321,7 @@ bld.SAMBA3_BINARY('vfstest', bld.SAMBA3_BINARY('smbiconv', source=SMBICONV_SRC, - deps='''talloc tdb tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR''', + deps='''talloc tdb_compat tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR''', vars=locals()) bld.SAMBA3_BINARY('log2pcap', @@ -1331,7 +1331,7 @@ bld.SAMBA3_BINARY('log2pcap', bld.SAMBA3_BINARY('locktest2', source=LOCKTEST2_SRC, - deps='''talloc tdb tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) @@ -1360,7 +1360,7 @@ bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3, bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, source=NTLM_AUTH_SRC, - deps='''tdb talloc cap KRB5_WRAP k5crypto wbclient param LIB_NONSMBD + deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param LIB_NONSMBD samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', @@ -1372,35 +1372,35 @@ bld.SAMBA3_BINARY('timelimit', bld.SAMBA3_BINARY('rpc_open_tcp', source=RPC_OPEN_TCP_SRC, - deps='''talloc tdb tevent cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''', vars=locals()) bld.SAMBA3_BINARY('test_lp_load', source=TEST_LP_LOAD_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''', + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''', vars=locals()) bld.SAMBA3_BINARY('dbwrap_tool', source=DBWRAP_TOOL_SRC, - deps='''talloc tdb tevent cap param LIB_NONSMBD LIBSMB_ERR''', + deps='''talloc tdb_compat tevent cap param LIB_NONSMBD LIBSMB_ERR''', vars=locals()) bld.SAMBA3_BINARY('dbwrap_torture', source=DBWRAP_TORTURE_SRC, - deps='''talloc tdb tevent cap param LIB_NONSMBD LIBSMB_ERR + deps='''talloc tdb_compat tevent cap param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('split_tokens', source=SPLIT_TOKENS_SRC, - deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 + deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''', vars=locals()) bld.SAMBA3_BINARY('vlp', source=VLP_SRC, - deps='''talloc tdb PARAM_UTIL UTIL_TDB samba3core param''', + deps='''talloc tdb_compat PARAM_UTIL UTIL_TDB samba3core param''', vars=locals()) swat_dir = os.path.join(bld.curdir, '../swat') @@ -1450,7 +1450,7 @@ bld.RECURSE('../lib/smbconf') bld.RECURSE('../lib/socket_wrapper') bld.RECURSE('../lib/uid_wrapper') bld.RECURSE('../lib/talloc') -bld.RECURSE('../lib/tdb') +bld.RECURSE('../lib/tdb_compat') bld.RECURSE('../lib/util') bld.RECURSE('../lib/tevent') bld.RECURSE('../lib/tsocket') -- cgit From f83fca1c576e094e2a852cc466bd9110c05fe731 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 20 Jun 2011 19:56:50 +1000 Subject: lib/util: Use common d_printf() in the whole codebase This removes the lang_tdb based varient, the only user of the lang_tdb code is SWAT, which calls that directly. 'net' and 'pam_winbind' are internationalised using gettext. Andrew Bartlett --- source3/wscript_build | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 0e76d1f7af..2f430a9047 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -69,7 +69,6 @@ LIB_SRC = ''' lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c lib/username.c lib/access.c lib/smbrun.c - lib/dprintf.c lib/wins_srv.c lib/util_sid.c lib/util_file.c -- cgit From 5db74b9607f4a5fc5ecaa8be0d744222cd55153c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 20 Jun 2011 20:36:46 +1000 Subject: lib/util Remove samba-util-common! All of this code is now in common, so we don't need the second '-common' library any more! Andrew Bartlett --- source3/wscript_build | 61 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 2f430a9047..12f5fe99a6 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -736,7 +736,7 @@ bld.SAMBA3_LIBRARY('passdb', bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', source=PARAM_UTIL_SRC, - deps='samba-util-common') + deps='samba-util') if bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', @@ -760,18 +760,18 @@ bld.SAMBA3_SUBSYSTEM('param_service', bld.SAMBA3_SUBSYSTEM('REGFIO', source=REGFIO_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('REG_API_REGF', source=REG_API_REGF_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, deps='''LIB_NONSMBD tdb-wrap3 NDR_SECURITY UTIL_TDB talloc - replace util_reg samba-util-common security + replace util_reg samba-util security errors3 adt_tree dbwrap_util util_str util_sec''', vars=locals(), private_library=True) @@ -788,7 +788,7 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL', bld.SAMBA3_LIBRARY('POPT_SAMBA3', source=POPT_LIB_SRC, - deps='popt samba-util-common', + deps='popt samba-util', vars=locals(), private_library=True) @@ -856,23 +856,23 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER', source=LIBADS_PRINTER_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBAFS', source=AFS_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', source=AFS_SETTOKEN_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc PARAM_WITHOUT_REG - util_reg samba-util-common errors3 CHARSET SAMBA_VERSION''', + util_reg samba-util errors3 CHARSET SAMBA_VERSION''', public_headers='../lib/smbconf/smbconf.h', vnum='0') @@ -906,12 +906,12 @@ bld.SAMBA3_SUBSYSTEM('LOCKING', bld.SAMBA3_SUBSYSTEM('PROFILE', source='${PROFILE_SRC}', - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('PRINTBASE', source=PRINTBASE_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('PRINTBACKEND', @@ -926,12 +926,12 @@ bld.SAMBA3_SUBSYSTEM('PRINTING', bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL', source=PASSWD_UTIL_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', source=FNAME_UTIL_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNET', @@ -966,7 +966,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNBT', bld.SAMBA3_SUBSYSTEM('SERVICES', source=SERVICES_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH', @@ -981,12 +981,12 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE', bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION', source=VERSION_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('SLCACHE', source=SLCACHE_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('DCUTIL', @@ -1001,55 +1001,55 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', bld.SAMBA3_LIBRARY('dbwrap_util', source='lib/dbwrap_util.c lib/dbwrap_rbt.c', - deps='samba-util-common UTIL_TDB errors', + deps='samba-util UTIL_TDB errors', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('util_malloc', source='''lib/util_malloc.c''', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('string_init', source='''lib/string_init.c''', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('util_str', source='''lib/util_str.c''', - deps='samba-util-common CHARSET', + deps='samba-util CHARSET', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('util_sec', source='''lib/util_sec.c''', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('bitmap', source='lib/bitmap.c', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('namearray', source='lib/namearray.c', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('adt_tree', source='lib/adt_tree.c', - deps='samba-util-common', + deps='samba-util', private_library=True, allow_undefined_symbols=False) bld.SAMBA3_LIBRARY('memcache', source='lib/memcache.c', - deps='samba-util-common util_malloc', + deps='samba-util util_malloc', private_library=True, allow_undefined_symbols=False) @@ -1062,7 +1062,7 @@ bld.SAMBA3_LIBRARY('CHARSET3', bld.SAMBA3_SUBSYSTEM('ldb3', source='lib/ldb_compat.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('errors3', source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c', @@ -1090,20 +1090,20 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG', bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL', source=RPC_CLIENT_SCHANNEL_SRC, - deps='samba-util-common', + deps='samba-util', vars=locals()) bld.SAMBA3_SUBSYSTEM('INIT_LSA', source='rpc_client/init_lsa.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('INIT_NETLOGON', source='rpc_client/init_netlogon.c', - deps='samba-util-common') + deps='samba-util') bld.SAMBA3_SUBSYSTEM('INIT_SAMR', source='rpc_client/init_samr.c', - deps='samba-util-common') + deps='samba-util') ########################## BINARIES ################################# @@ -1412,7 +1412,6 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat') if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3') - bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') -- cgit From b373d0e777df8770c24cfcc5cc80bf4808faa815 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 31 May 2011 13:18:37 +1000 Subject: s3-build: Provide a run-time shim to work around duplicate symbols The become_root() and similar 'smbd' functions that are used widely in Samba libraries had 'dummy' copies in dummysmbd.c and dummyroot.c. These have been replaced by a runtime plugin mechanim, which ensures that standlone binaries still do nothing, while in smbd the correct function is used. This avoids having these as duplicate symbols in the smbd binary, which can cause unpredictable behaviour. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/wscript_build | 91 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 46 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 12f5fe99a6..7c914b876e 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -88,9 +88,6 @@ LIB_SRC = ''' libads/krb5_errs.c lib/system_smbd.c lib/audit.c lib/file_id.c lib/idmap_cache.c''' -LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c''' -LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}''' - POPT_LIB_SRC = '''lib/popt_common.c''' PARAM_UTIL_SRC = '''param/util.c''' @@ -661,7 +658,7 @@ bld.SAMBA3_LIBRARY('rpc_client', bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, - public_deps='''talloc tdb_compat cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT + public_deps='''talloc tdb_compat cap wbclient smbd_shim LIBSMB KRBCLIENT passdb SMBLDAP PARAM_WITHOUT_REG samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL @@ -674,7 +671,7 @@ bld.SAMBA3_LIBRARY('netapi', bld.SAMBA3_LIBRARY('libsmb/smbclient', source=LIBSMBCLIENT_SRC, - public_deps='''talloc tdb_compat wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP + public_deps='''talloc tdb_compat wbclient cap param smbd_shim LIBSMB KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC POPT_SAMBA3''', public_headers='include/libsmbclient.h', vnum='0', @@ -690,7 +687,7 @@ bld.SAMBA3_LIBRARY('smbsharemodes', bld.SAMBA3_LIBRARY('nss_wins', source=WINBIND_WINS_NSS_SRC, - deps='''winbind-client param LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT + deps='''winbind-client param LIBSMB smbd_shim LIBTSOCKET KRBCLIENT cap wbclient''', realname='libnss_wins.so.2', vnum='2') @@ -770,7 +767,7 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF', bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, - deps='''LIB_NONSMBD tdb-wrap3 NDR_SECURITY UTIL_TDB talloc + deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc replace util_reg samba-util security errors3 adt_tree dbwrap_util util_str util_sec''', vars=locals(), @@ -802,9 +799,10 @@ bld.SAMBA3_SUBSYSTEM('samba3core', deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache ccan', vars=locals()) -bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD', - source=LIB_NONSMBD_SRC, - vars=locals()) +bld.SAMBA3_LIBRARY('smbd_shim', + source='''lib/smbd_shim.c''', + private_library=True, + allow_undefined_symbols=False) bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR', source='', @@ -894,6 +892,7 @@ bld.SAMBA3_LIBRARY('smbd_base', LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR LIBCLI_SMB_COMMON RPC_SERVER smbd_conn param_service + smbd_shim ''', private_library=True, allow_undefined_symbols=False, @@ -1116,7 +1115,7 @@ bld.SAMBA3_BINARY('smbd/smbd', bld.SAMBA3_BINARY('nmbd/nmbd', source=NMBD_SRC, deps='''talloc tdb_compat tevent z cap wbclient dl - passdb param ldap LIB_NONSMBD LIBSMB + passdb param ldap smbd_shim LIBSMB POPT_SAMBA3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''', install_path='${SBINDIR}', vars=locals()) @@ -1124,7 +1123,7 @@ bld.SAMBA3_BINARY('nmbd/nmbd', bld.SAMBA3_BINARY('winbindd/winbindd', source=WINBINDD_SRC, deps='''talloc tdb_compat tevent cap dl z - wbclient passdb ldap param LIB_NONSMBD LIBSMB + wbclient passdb ldap param smbd_shim LIBSMB POPT_SAMBA3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER SRV_NDR_WBINT RPC_NDR_WBINT NDR_WBINT LIBAFS LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info @@ -1141,7 +1140,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd', bld.SAMBA3_BINARY('web/swat', source=SWAT_SRC, deps='''talloc tevent cap samba3core LIBSMB wbclient param - LIB_NONSMBD passdb POPT_SAMBA3 KRBCLIENT cups + smbd_shim passdb POPT_SAMBA3 KRBCLIENT cups LIBMSRPC_GEN msrpc3 LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL LIBCLI_SAMR INIT_LSA PASSCHANGE''', enabled=bld.env.build_swat, @@ -1150,7 +1149,7 @@ bld.SAMBA3_BINARY('web/swat', bld.SAMBA3_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, - deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB smbd_shim PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL @@ -1163,7 +1162,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, - deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB smbd_shim PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA LIBCLI_SMB_COMMON''', @@ -1171,7 +1170,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, bld.SAMBA3_BINARY('net', source=NET_SRC, - deps='''talloc tdb_compat netapi addns cap intl POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat netapi addns cap intl POPT_SAMBA3 passdb LIBSMB smbd_shim PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL @@ -1185,56 +1184,56 @@ bld.SAMBA3_BINARY('net', bld.SAMBA3_BINARY('profiles', source=PROFILES_SRC, - deps='''talloc tdb_compat cap tevent POPT_SAMBA3 param samba3core LIBSMB_ERR LIB_NONSMBD REGFIO''', + deps='''talloc tdb_compat cap tevent POPT_SAMBA3 param samba3core LIBSMB_ERR smbd_shim REGFIO''', vars=locals()) bld.SAMBA3_BINARY('smbspool', source=CUPS_SRC, - deps='''talloc tdb_compat tevent cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core + deps='''talloc tdb_compat tevent cap wbclient POPT_SAMBA3 param LIBSMB smbd_shim samba3core KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA3_BINARY('testparm', source=TESTPARM_SRC, deps='''talloc tevent ldap cap - wbclient asn1util LIBTSOCKET passdb param LIB_NONSMBD + wbclient asn1util LIBTSOCKET passdb param smbd_shim LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('smbta-util', source=SMBTA_UTIL_SRC, - deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 LIB_NONSMBD + deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 smbd_shim LIBSMB_ERR''', vars=locals()) bld.SAMBA3_BINARY('smbstatus', source=STATUS_SRC, - deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 LIB_NONSMBD + deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 smbd_shim LIBSMB_ERR LOCKING PROFILE FNAME_UTIL''', vars=locals()) bld.SAMBA3_BINARY('smbcontrol', source=SMBCONTROL_SRC, - deps='''talloc tdb_compat tevent cap param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3 PRINTBASE''', + deps='''talloc tdb_compat tevent cap param smbd_shim LIBSMB_ERR POPT_SAMBA3 PRINTBASE''', vars=locals()) bld.SAMBA3_BINARY('smbtree', source=SMBTREE_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE RPC_NDR_SRVSVC''', vars=locals()) bld.SAMBA3_BINARY('smbpasswd', source=SMBPASSWD_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP 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 LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP PASSWD_UTIL cli-ldap-common''', vars=locals()) @@ -1246,18 +1245,18 @@ bld.SAMBA3_BINARY('smbget', bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3, source=NMBLOOKUP_SRC, - deps='''talloc tdb_compat tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR LIBNMB''', + deps='''talloc tdb_compat tevent cap param smbd_shim POPT_SAMBA3 LIBSMB_ERR LIBNMB''', vars=locals()) bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3, source=SMBTORTURE_SRC, deps='''talloc tdb_compat tevent cap wbclient param LIBSMB KRBCLIENT TLDAP - LIB_NONSMBD POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''', + smbd_shim POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''', vars=locals()) bld.SAMBA3_BINARY('smbconftort', source=SMBCONFTORT_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('replacetort', @@ -1267,25 +1266,25 @@ bld.SAMBA3_BINARY('replacetort', bld.SAMBA3_BINARY('masktest' + bld.env.suffix3, source=MASKTEST_SRC, - deps='''talloc tdb_compat cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param smbd_shim LIBSMB KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA3_BINARY('msgtest', source=MSGTEST_SRC, - deps='''talloc tdb_compat tevent cap param LIBSMB_ERR LIB_NONSMBD''', + deps='''talloc tdb_compat tevent cap param LIBSMB_ERR smbd_shim''', vars=locals()) bld.SAMBA3_BINARY('smbcacls', source=SMBCACLS_SRC, deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT - LIB_NONSMBD passdb POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN + smbd_shim passdb POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) bld.SAMBA3_BINARY('smbcquotas', source=SMBCQUOTAS_SRC, - deps='''talloc tdb_compat cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT + deps='''talloc tdb_compat cap wbclient param smbd_shim LIBSMB KRBCLIENT POPT_SAMBA3 passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) @@ -1293,23 +1292,23 @@ bld.SAMBA3_BINARY('smbcquotas', bld.SAMBA3_BINARY('eventlogadm', source=EVTLOGADM_SRC, deps='''talloc tevent cap POPT_SAMBA3 samba3core param - LIB_NONSMBD LIBSMB_ERR passdb wbclient LIBEVENTLOG''', + smbd_shim LIBSMB_ERR passdb wbclient LIBEVENTLOG''', vars=locals()) bld.SAMBA3_BINARY('sharesec', source=SHARESEC_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('locktest' + bld.env.suffix3, source=LOCKTEST_SRC, - deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB smbd_shim asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) bld.SAMBA3_BINARY('pdbtest', source=PDBTEST_SRC, - deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb + deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT smbd_shim passdb SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''', vars=locals()) @@ -1320,7 +1319,7 @@ bld.SAMBA3_BINARY('vfstest', bld.SAMBA3_BINARY('smbiconv', source=SMBICONV_SRC, - deps='''talloc tdb_compat tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR''', + deps='''talloc tdb_compat tevent cap param smbd_shim POPT_SAMBA3 LIBSMB_ERR''', vars=locals()) bld.SAMBA3_BINARY('log2pcap', @@ -1330,7 +1329,7 @@ bld.SAMBA3_BINARY('log2pcap', bld.SAMBA3_BINARY('locktest2', source=LOCKTEST2_SRC, - deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB smbd_shim asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) @@ -1341,7 +1340,7 @@ bld.SAMBA3_BINARY('debug2html', bld.SAMBA3_BINARY('smbfilter', source=SMBFILTER_SRC, - deps='''talloc tevent cap wbclient param LIBSMB LIB_NONSMBD KRBCLIENT asn1util LIBTSOCKET + deps='''talloc tevent cap wbclient param LIBSMB smbd_shim KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) @@ -1353,13 +1352,13 @@ bld.SAMBA3_BINARY('versiontest', bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3, source=WBINFO_SRC, deps='''talloc wbclient tevent cap - asn1util LIBTSOCKET passdb ldap param LIB_NONSMBD + asn1util LIBTSOCKET passdb ldap param smbd_shim LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''', vars=locals()) bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, source=NTLM_AUTH_SRC, - deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param LIB_NONSMBD + deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', @@ -1371,29 +1370,29 @@ bld.SAMBA3_BINARY('timelimit', bld.SAMBA3_BINARY('rpc_open_tcp', source=RPC_OPEN_TCP_SRC, - deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD + deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core LIBSMB smbd_shim LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''', vars=locals()) bld.SAMBA3_BINARY('test_lp_load', source=TEST_LP_LOAD_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''', + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim POPT_SAMBA3 LIBNTLMSSP''', vars=locals()) bld.SAMBA3_BINARY('dbwrap_tool', source=DBWRAP_TOOL_SRC, - deps='''talloc tdb_compat tevent cap param LIB_NONSMBD LIBSMB_ERR''', + deps='''talloc tdb_compat tevent cap param smbd_shim LIBSMB_ERR''', vars=locals()) bld.SAMBA3_BINARY('dbwrap_torture', source=DBWRAP_TORTURE_SRC, - deps='''talloc tdb_compat tevent cap param LIB_NONSMBD LIBSMB_ERR + deps='''talloc tdb_compat tevent cap param smbd_shim LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('split_tokens', source=SPLIT_TOKENS_SRC, - deps='''talloc tdb_compat tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 + deps='''talloc tdb_compat tevent cap wbclient param smbd_shim POPT_SAMBA3 LIBNTLMSSP''', vars=locals()) -- cgit From 729d17e725aa1bfd306aa27728c97210c5c01d2c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 14 Jun 2011 23:51:10 +0200 Subject: s3: Convert WINBINDD_WINS_BYNAME to the async API --- source3/wscript_build | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7c914b876e..52134ea6a2 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -252,6 +252,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/winbindd_cm.c winbindd/winbindd_wins.c winbindd/winbindd_wins_byip.c + winbindd/winbindd_wins_byname.c winbindd/winbindd_msrpc.c winbindd/winbindd_rpc.c winbindd/winbindd_reconnect.c -- cgit From 7e1d4857803a17ac88b17bc0297ac13f93c57651 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 20 Jun 2011 22:25:20 +0200 Subject: s3: Remove unused code Autobuild-User: Volker Lendecke Autobuild-Date: Tue Jun 21 15:36:01 CEST 2011 on sn-devel-104 --- source3/wscript_build | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 52134ea6a2..53c412e461 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -250,7 +250,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/winbindd_pam.c winbindd/winbindd_misc.c winbindd/winbindd_cm.c - winbindd/winbindd_wins.c winbindd/winbindd_wins_byip.c winbindd/winbindd_wins_byname.c winbindd/winbindd_msrpc.c -- cgit From 9554fd6e2ff12760d463c9464f72cf6b51b7363d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 23 Jun 2011 17:33:04 +1000 Subject: s3-build: Remove SECRETS3 as a samba3core dep This resolves the the library loop between libsmbconf and SECRETS3/passdb, and allows the next commit to require fully defined symbols in public libraries. Andrew Bartlett --- source3/wscript_build | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 53c412e461..6e31eefff9 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -72,7 +72,7 @@ LIB_SRC = ''' lib/wins_srv.c lib/util_sid.c lib/util_file.c - lib/util.c lib/util_cmdline.c + lib/util.c lib/util_sock.c lib/sock_exec.c lib/substitute.c lib/substitute_generic.c lib/ms_fnmatch.c @@ -743,7 +743,7 @@ if bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX''', + deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core''', vars=locals()) bld.SAMBA3_SUBSYSTEM('param', @@ -785,10 +785,15 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL', bld.SAMBA3_LIBRARY('POPT_SAMBA3', source=POPT_LIB_SRC, - deps='popt samba-util', + deps='popt samba-util UTIL_CMDLINE', vars=locals(), private_library=True) +bld.SAMBA3_LIBRARY('UTIL_CMDLINE', + source='lib/util_cmdline.c', + deps='SECRETS3', + private_library=True) + bld.SAMBA3_SUBSYSTEM('KRBCLIENT', source=KRBCLIENT_SRC, public_deps='KRB5_WRAP k5crypto', @@ -796,7 +801,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache ccan', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap_util util_sec util_malloc memcache ccan', vars=locals()) bld.SAMBA3_LIBRARY('smbd_shim', @@ -816,7 +821,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', bld.SAMBA3_LIBRARY('LIBSMB', source=LIBSMB_SRC, - deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON', + deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON UTIL_CMDLINE', vars=locals(), private_library=True) -- cgit From 877de9fee773b3f6b5a95afe1d01001e0b1b4ff2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 24 Jun 2011 11:47:45 +1000 Subject: s3-build Require fully defined symbols in ALL libraries by default The only exception here is libsmbregistry, which needs further work to resolve the library loop caused by the registry based smb.conf loading. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Fri Jun 24 05:01:38 CEST 2011 on sn-devel-104 --- source3/wscript_build | 83 ++++++++++++++++++--------------------------------- 1 file changed, 29 insertions(+), 54 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 6e31eefff9..624fcc8a73 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -649,17 +649,10 @@ if not bld.env.toplevel_build: ######################## SUBSYSTEMS ################################# -# A grouping library to get various helper rpc clients in a library -bld.SAMBA3_LIBRARY('rpc_client', - source='', - deps='RPC_CLIENT_SCHANNEL INIT_LSA INIT_NETLOGON INIT_SAMR LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS LIBCLI_WINREG', - private_library=True, - grouping_library=True) - bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb_compat cap wbclient smbd_shim LIBSMB KRBCLIENT - passdb SMBLDAP PARAM_WITHOUT_REG samba-util + passdb SMBLDAP param samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON @@ -728,7 +721,6 @@ bld.SAMBA3_LIBRARY('passdb', source=PASSDB_SRC, deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH flag_mapping', private_library=True, - allow_undefined_symbols=False, vars=locals()) bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', @@ -738,18 +730,12 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL', if bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX', source='param/loadparm_ctx.c', - deps='''s3_param_h PARAM_WITHOUT_REG''', + deps='''s3_param_h param''', vars=locals()) -bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', - source=PARAM_WITHOUT_REG_SRC, - deps='''PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core''', - vars=locals()) - bld.SAMBA3_SUBSYSTEM('param', - source='', - deps='PARAM_WITHOUT_REG samba-util smbconf', - vars=locals()) + source=PARAM_WITHOUT_REG_SRC, + deps='samba-util PARAM_UTIL smbd_conn ldap lber LOADPARM_CTX samba3core smbconf''') bld.SAMBA3_SUBSYSTEM('param_service', source='param/service.c', @@ -769,8 +755,9 @@ bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc replace util_reg samba-util security - errors3 adt_tree dbwrap_util util_str util_sec''', + errors3 adt_tree dbwrap_util util_str util_sec util_malloc''', vars=locals(), + allow_undefined_symbols=True, private_library=True) bld.SAMBA3_SUBSYSTEM('REG_SMBCONF', @@ -801,13 +788,12 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap_util util_sec util_malloc memcache ccan', + deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap_util util_sec util_malloc memcache ccan errors3', vars=locals()) bld.SAMBA3_LIBRARY('smbd_shim', source='''lib/smbd_shim.c''', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR', source='', @@ -848,7 +834,7 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP', bld.SAMBA3_LIBRARY('ads', source=LIBADS_SRC, - deps='cli-ldap-common KRB5_WRAP ldap lber', + deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNTLMSSP LIBNMB LIBSMB DCUTIL', private_library=True, vars=locals()) @@ -874,7 +860,7 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, - deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc PARAM_WITHOUT_REG + deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc param util_reg samba-util errors3 CHARSET SAMBA_VERSION''', public_headers='../lib/smbconf/smbconf.h', vnum='0') @@ -882,14 +868,13 @@ bld.SAMBA3_LIBRARY('smbconf', bld.SAMBA3_LIBRARY('smbd_conn', source='smbd/conn.c', deps='string_init bitmap namearray', - allow_undefined_symbols=False, private_library=True) bld.SAMBA3_LIBRARY('smbd_base', source=SMBD_SRC_BASE, deps='''tdb_compat tevent dl krb5 ldap gssapi gssapi_krb5 samba-util wbclient crypt nsl cups cap z passdb - PARAM_WITHOUT_REG samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI + param samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO @@ -900,7 +885,6 @@ bld.SAMBA3_LIBRARY('smbd_base', smbd_shim ''', private_library=True, - allow_undefined_symbols=False, vars=locals()) bld.SAMBA3_SUBSYSTEM('LOCKING', @@ -995,7 +979,7 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE', bld.SAMBA3_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, - deps='ads', + deps='ads LIBRPCCLI_NETLOGON msrpc3 LIBCLI_LSA3 INIT_NETLOGON', vars=locals()) bld.SAMBA3_SUBSYSTEM('tdb-wrap3', @@ -1006,63 +990,53 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', bld.SAMBA3_LIBRARY('dbwrap_util', source='lib/dbwrap_util.c lib/dbwrap_rbt.c', deps='samba-util UTIL_TDB errors', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('util_malloc', source='''lib/util_malloc.c''', deps='samba-util', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('string_init', source='''lib/string_init.c''', deps='samba-util', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('util_str', source='''lib/util_str.c''', deps='samba-util CHARSET', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('util_sec', source='''lib/util_sec.c''', deps='samba-util', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('bitmap', source='lib/bitmap.c', deps='samba-util', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('namearray', source='lib/namearray.c', deps='samba-util', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('adt_tree', source='lib/adt_tree.c', deps='samba-util', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('memcache', source='lib/memcache.c', deps='samba-util util_malloc', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_LIBRARY('CHARSET3', source='''lib/charcnv.c lib/fstring.c''', public_deps='ICONV_WRAPPER CHARSET', deps='samba-util util_str', - private_library=True, - allow_undefined_symbols=False) + private_library=True) bld.SAMBA3_SUBSYSTEM('ldb3', source='lib/ldb_compat.c', @@ -1076,9 +1050,10 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR', source=LIBCLI_SAMR_SRC, deps='RPC_NDR_SAMR') -bld.SAMBA3_SUBSYSTEM('LIBCLI_LSA3', - source=LIBCLI_LSA_SRC, - deps='RPC_NDR_LSA INIT_LSA') +bld.SAMBA3_LIBRARY('LIBCLI_LSA3', + source=LIBCLI_LSA_SRC, + deps='RPC_NDR_LSA INIT_LSA', + private_library=True) bld.SAMBA3_SUBSYSTEM('LIBRPCCLI_NETLOGON', source=LIBRPCCLI_NETLOGON_SRC, @@ -1155,7 +1130,7 @@ bld.SAMBA3_BINARY('web/swat', bld.SAMBA3_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB smbd_shim - PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 + param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS @@ -1168,7 +1143,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, deps='''talloc tdb_compat cap POPT_SAMBA3 passdb LIBSMB smbd_shim - PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN + param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA LIBCLI_SMB_COMMON''', vars=locals()) @@ -1176,7 +1151,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, bld.SAMBA3_BINARY('net', source=NET_SRC, deps='''talloc tdb_compat netapi addns cap intl POPT_SAMBA3 passdb LIBSMB smbd_shim - PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER + param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL REGFIO NDR_NTPRINTING RPC_NDR_WINREG -- cgit