X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source3%2Fwscript_build;h=adeff836afbe6f5feb59a8735827790245645145;hp=c03a6737bb4340c49c01a3be8cbda967422d5edf;hb=8563d5c384f672276d8ea2ab20a1810ff485e37d;hpb=7d798ac485b47483c9f99c67f7be196d55587a09 diff --git a/source3/wscript_build b/source3/wscript_build index c03a6737bb4..adeff836afb 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -57,11 +57,9 @@ 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 + 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 @@ -79,7 +77,7 @@ LIB_SRC = ''' lib/wins_srv.c lib/util_sid.c lib/util_file.c - lib/util.c lib/util_names.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/ms_fnmatch.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''' @@ -227,7 +225,7 @@ PRIVILEGES_SRC = '''lib/privileges.c''' PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c''' PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c - lib/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c + lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c lib/util_unixsids.c passdb/lookup_sid.c passdb/login_cache.c passdb/account_pol.c ${PRIVILEGES_SRC} @@ -245,7 +243,7 @@ OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c''' -FNAME_UTIL_SRC = '''smbd/filename_util.c''' +FNAME_UTIL_SRC = '''lib/filename_util.c''' PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c''' @@ -280,6 +278,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/winbindd_ndr.c winbindd/wb_ping.c winbindd/wb_lookupsid.c + winbindd/wb_lookupsids.c winbindd/wb_lookupname.c winbindd/wb_sid2uid.c winbindd/wb_sid2gid.c @@ -300,11 +299,13 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/wb_next_grent.c winbindd/wb_dsgetdcname.c winbindd/winbindd_lookupsid.c + winbindd/winbindd_lookupsids.c winbindd/winbindd_lookupname.c winbindd/winbindd_sid_to_uid.c winbindd/winbindd_sid_to_gid.c winbindd/winbindd_uid_to_sid.c winbindd/winbindd_gid_to_sid.c + winbindd/winbindd_sids_to_xids.c winbindd/winbindd_allocate_uid.c winbindd/winbindd_allocate_gid.c winbindd/winbindd_getpwsid.c @@ -530,7 +531,8 @@ LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c utils/net_rpc_join.c utils/net_time.c utils/net_lookup.c - utils/net_cache.c utils/net_groupmap.c utils/net_idmap.c + utils/net_cache.c utils/net_groupmap.c + utils/net_idmap.c utils/net_idmap_check.c utils/net_status.c utils/net_rpc_printer.c utils/net_rpc_rights.c utils/net_rpc_service.c utils/net_rpc_registry.c utils/net_usershare.c utils/netlookup.c utils/net_sam.c utils/net_rpc_shell.c @@ -543,6 +545,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c utils/net_serverid.c utils/net_eventlog.c utils/net_printing.c + utils/net_rpc_trust.c registry/reg_parse.c registry/reg_format.c registry/reg_parse_internal.c registry/reg_import.c lib/cbuf.c lib/srprs.c''' @@ -562,6 +565,8 @@ 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_case_insensitive.c + torture/test_notify_online.c torture/test_smbsock_any_connect.c''' SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} @@ -659,12 +664,12 @@ if not bld.env.toplevel_build: bld.SAMBA3_LIBRARY('netapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT - passdb SMBLDAP PARAM_WITHOUT_REG DYNCONFIG + passdb SMBLDAP PARAM_WITHOUT_REG samba-util LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI 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()) @@ -672,7 +677,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()) @@ -695,7 +700,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', @@ -718,11 +723,11 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB', bld.SAMBA3_SUBSYSTEM('TLDAP', source=TLDAP_SRC, - deps='ASN1_UTIL LIBTSOCKET') + deps='asn1util LIBTSOCKET') 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()) @@ -736,7 +741,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG', bld.SAMBA3_LIBRARY('param', source='', - deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF', + deps='PARAM_WITHOUT_REG samba-util LIB_SMBCONF', private_library=True, vars=locals()) @@ -769,12 +774,12 @@ bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3', bld.SAMBA3_SUBSYSTEM('KRBCLIENT', source=KRBCLIENT_SRC, - public_deps='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 samba-util3 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_WRAP flag_mapping util_reg passdb PTHREADPOOL', private_library=True, vars=locals()) @@ -785,7 +790,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', @@ -805,7 +810,7 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', bld.SAMBA3_SUBSYSTEM('CLDAP', source='libads/cldap.c', - deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET', + deps='cli-ldap-common LIBCLI_CLDAP LIBTSOCKET', vars=locals()) bld.SAMBA3_SUBSYSTEM('SECRETS3', @@ -821,14 +826,13 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP', bld.SAMBA3_LIBRARY('ads', source=LIBADS_SRC, - deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber', + deps='cli-ldap-common KRB5_WRAP ldap lber', private_library=True, - vars=locals(), - enabled=bld.env.HAVE_ADS) + vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', source=LIBADS_SERVER_SRC, - deps='ndr-krb5pac krb5', + deps='ndr-krb5pac KRB5_WRAP', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER', @@ -851,14 +855,14 @@ bld.SAMBA3_SUBSYSTEM('LIB_SMBCONF', bld.SAMBA3_LIBRARY('smbd_base', source=SMBD_SRC_BASE, deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5 - DYNCONFIG wbclient crypt nsl cups cap resolv z passdb + 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 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 LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS - RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR + RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR LIBCLI_SMB_COMMON RPC_SERVER ''', private_library=True, @@ -897,7 +901,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', @@ -917,7 +921,7 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG', bld.SAMBA3_SUBSYSTEM('LIBNMB', source=LIBNMB_SRC, - deps='lmhosts', + deps='lmhosts resolv', vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBNBT', @@ -960,19 +964,16 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', vars=locals()) bld.SAMBA3_SUBSYSTEM('CHARSET3', - source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/fstring.c''', - public_deps='ICONV_WRAPPER CODEPOINTS', - deps='DYNCONFIG') - -bld.SAMBA3_SUBSYSTEM('samba-util3', - source='../lib/util/data_blob.c', - deps='talloc CHARSET3 samba-util-common') + source='''lib/util_str.c lib/charcnv.c lib/fstring.c''', + public_deps='ICONV_WRAPPER CHARSET', + deps='samba-util') 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, @@ -1017,22 +1018,22 @@ bld.SAMBA3_BINARY('smbd/smbd', bld.SAMBA3_BINARY('nmbd/nmbd', source=NMBD_SRC, - deps='''talloc tdb tevent z cap resolv wbclient dl + deps='''talloc tdb tevent z cap wbclient dl passdb param ldap LIB_NONSMBD LIBSMB - POPT_SAMBA3 KRBCLIENT NDR_SAMR NDR_LSA''', + POPT_SAMBA3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''', install_path='${SBINDIR}', vars=locals()) bld.SAMBA3_BINARY('winbindd/winbindd', source=WINBINDD_SRC, deps='''talloc tdb tevent cap dl z - wbclient passdb ldap resolv param LIB_NONSMBD LIBSMB + wbclient passdb ldap param LIB_NONSMBD LIBSMB POPT_SAMBA3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER - SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS + SRV_NDR_WBINT RPC_NDR_WBINT NDR_WBINT LIBAFS LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON - RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON + RPC_NDR_DSSETUP npa_tstream INIT_NETLOGON RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC PAM_ERRORS WB_REQTRANS AUTH_COMMON ''', @@ -1043,7 +1044,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd', bld.SAMBA3_BINARY('web/swat', source=SWAT_SRC, deps='''talloc tevent cap samba3core LIBSMB wbclient param - LIB_NONSMBD resolv passdb POPT_SAMBA3 KRBCLIENT cups + LIB_NONSMBD 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, @@ -1052,7 +1053,7 @@ bld.SAMBA3_BINARY('web/swat', bld.SAMBA3_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, - deps='''talloc tdb cap resolv POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb 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 @@ -1065,16 +1066,17 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, source=CLIENT_SRC, - deps='''talloc tdb cap resolv POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + 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', source=NET_SRC, - deps='''talloc tdb netapi addns cap resolv intl POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD + deps='''talloc tdb 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 - LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET + LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL REGFIO NDR_NTPRINTING RPC_NDR_WINREG RPC_CLIENT_SCHANNEL TOKEN_UTIL @@ -1091,14 +1093,14 @@ bld.SAMBA3_BINARY('profiles', bld.SAMBA3_BINARY('smbspool', source=CUPS_SRC, - deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core - KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', + deps='''talloc tdb tevent cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core + KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA3_BINARY('testparm', source=TESTPARM_SRC, deps='''talloc tevent ldap cap - wbclient ASN1_UTIL LIBTSOCKET passdb param LIB_NONSMBD + wbclient asn1util LIBTSOCKET passdb param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', vars=locals()) @@ -1121,23 +1123,23 @@ bld.SAMBA3_BINARY('smbcontrol', bld.SAMBA3_BINARY('smbtree', source=SMBTREE_SRC, - deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD + deps='''talloc tdb 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 resolv wbclient param LIB_NONSMBD + deps='''talloc tdb 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 resolv wbclient param LIB_NONSMBD + deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP - PASSWD_UTIL LIBCLI_LDAP_NDR''', + PASSWD_UTIL cli-ldap-common''', vars=locals()) bld.SAMBA3_BINARY('smbget', @@ -1147,18 +1149,18 @@ bld.SAMBA3_BINARY('smbget', bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3, source=NMBLOOKUP_SRC, - deps='''talloc tdb tevent cap resolv param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR LIBNMB''', + deps='''talloc tdb 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 resolv wbclient param LIBSMB KRBCLIENT TLDAP - LIB_NONSMBD POPT_SAMBA3 ASN1_UTIL LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''', + deps='''talloc tdb 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 resolv wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', + deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', vars=locals()) bld.SAMBA3_BINARY('replacetort', @@ -1168,25 +1170,25 @@ bld.SAMBA3_BINARY('replacetort', bld.SAMBA3_BINARY('masktest' + bld.env.suffix3, source=MASKTEST_SRC, - deps='''talloc tdb cap resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', + deps='''talloc tdb 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 resolv param LIBSMB_ERR LIB_NONSMBD''', + deps='''talloc tdb tevent cap param LIBSMB_ERR LIB_NONSMBD''', vars=locals()) bld.SAMBA3_BINARY('smbcacls', source=SMBCACLS_SRC, - deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT + deps='''talloc tdb 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 resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT + deps='''talloc tdb cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT POPT_SAMBA3 passdb SMBLDAP LIBMSRPC_GEN msrpc3 LIBCLI_LSA3''', vars=locals()) @@ -1199,18 +1201,18 @@ bld.SAMBA3_BINARY('eventlogadm', bld.SAMBA3_BINARY('sharesec', source=SHARESEC_SRC, - deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''', + deps='''talloc tdb 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 resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', + deps='''talloc tdb 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 resolv wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb + deps='''talloc tdb cap wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''', vars=locals()) @@ -1231,8 +1233,8 @@ bld.SAMBA3_BINARY('log2pcap', bld.SAMBA3_BINARY('locktest2', source=LOCKTEST2_SRC, - deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', + deps='''talloc tdb tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD + asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''', vars=locals()) bld.SAMBA3_BINARY('debug2html', @@ -1242,7 +1244,7 @@ bld.SAMBA3_BINARY('debug2html', bld.SAMBA3_BINARY('smbfilter', source=SMBFILTER_SRC, - deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET + deps='''talloc tevent cap wbclient param LIBSMB LIB_NONSMBD KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) @@ -1254,16 +1256,16 @@ bld.SAMBA3_BINARY('versiontest', bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3, source=WBINFO_SRC, deps='''talloc wbclient tevent cap - ASN1_UTIL LIBTSOCKET passdb ldap param LIB_NONSMBD + asn1util LIBTSOCKET passdb ldap param LIB_NONSMBD LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''', vars=locals()) bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, source=NTLM_AUTH_SRC, - deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD - samba3core LIBNTLMSSP POPT_SAMBA3 ASN1_UTIL LIBTSOCKET + 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 LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', + NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', vars=locals()) bld.SAMBA3_BINARY('timelimit', @@ -1272,8 +1274,8 @@ bld.SAMBA3_BINARY('timelimit', bld.SAMBA3_BINARY('rpc_open_tcp', source=RPC_OPEN_TCP_SRC, - deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD - LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN msrpc3''', + deps='''talloc tdb tevent cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD + LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''', vars=locals()) bld.SAMBA3_BINARY('test_lp_load', @@ -1315,33 +1317,17 @@ 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='samba-util3') - bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3') + 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') -else: - - # dynconfig provides this in the toplevel build - bld.SAMBA3_SUBSYSTEM('LOCALE_DIR', - 'localedir.c', - cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR) - - # 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 ################################# 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') @@ -1353,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') @@ -1375,6 +1362,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')