LIB_SRC = '''
lib/messages.c lib/messages_local.c
lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
+ lib/ctdb_conn.c
+ lib/msg_channel.c
lib/id_cache.c
lib/talloc_dict.c
lib/serverid.c
libads/disp_sec.c libads/ldap_utils.c
libads/ldap_schema.c libads/util.c libads/ndr.c'''
-LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c'''
+LIBADS_SERVER_SRC = '''libads/authdata.c'''
LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
LIBMSRPC_SRC = '''
rpc_client/cli_pipe.c
- librpc/crypto/cli_spnego.c
librpc/rpc/rpc_common.c
rpc_client/rpc_transport_np.c
rpc_client/rpc_transport_sock.c
lib/util_unixsids.c passdb/lookup_sid.c
passdb/login_cache.c
passdb/account_pol.c ${PRIVILEGES_SRC}
- lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}
+ lib/util_nscd.c lib/winbind_util.c
passdb/pdb_util.c passdb/pdb_interface.c
passdb/pdb_ldap_schema.c
passdb/pdb_secrets.c'''
winbindd/winbindd_ndr.c
winbindd/wb_ping.c
winbindd/wb_lookupsid.c
- winbindd/wb_lookupsids.c
+ winbindd/wb_lookupsids.c
winbindd/wb_lookupname.c
winbindd/wb_sid2uid.c
winbindd/wb_sid2gid.c
winbindd/wb_next_grent.c
winbindd/wb_dsgetdcname.c
winbindd/winbindd_lookupsid.c
- winbindd/winbindd_lookupsids.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_sids_to_xids.c
winbindd/winbindd_allocate_uid.c
winbindd/winbindd_allocate_gid.c
winbindd/winbindd_getpwsid.c
lib/sysquotas.c lib/sysquotas_linux.c
lib/sysquotas_xfs.c lib/sysquotas_4A.c
lib/sysquotas_nfs.c
+ lib/background.c
smbd/fake_file.c
smbd/quotas.c smbd/ntquotas.c smbd/msdfs.c
smbd/aio.c smbd/statvfs.c
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-# FIXME: bigballofmud
-
CLIENT_SRC1 = '''client/client.c client/clitar.c
client/dnsbrowse.c'''
utils/net_eventlog.c
utils/net_printing.c
utils/net_rpc_trust.c
- utils/net_rpc_conf.c
+ utils/net_rpc_conf.c
registry/reg_parse.c registry/reg_format.c
registry/reg_import.c
'''
torture/test_async_echo.c
torture/test_addrchange.c
torture/test_posix_append.c
- torture/test_nttrans_create.c
- torture/test_nttrans_fsctl.c
- torture/test_case_insensitive.c
- torture/test_notify_online.c
- torture/test_smb2.c
- torture/test_authinfo_structs.c
+ torture/test_nttrans_create.c
+ torture/test_nttrans_fsctl.c
+ torture/test_case_insensitive.c
+ torture/test_notify_online.c
+ torture/test_chain3.c
+ torture/test_smb2.c
+ torture/test_authinfo_structs.c
torture/test_smbsock_any_connect.c
- torture/test_cleanup.c
+ torture/test_cleanup.c
+ torture/test_ctdbconn.c
+ torture/test_msg.c
+ torture/test_notify.c
+ lib/tevent_barrier.c
torture/t_strappend.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
PDBTEST_SRC = '''torture/pdbtest.c'''
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c'''
+VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
+ torture/vfstest_chain.c'''
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
- public_deps='''talloc tdb_compat libsmb KRBCLIENT
- pdb param samba-util ndr-standard msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
- RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF
- LIBCLI_SAMR libcli_lsa3 libcli_netlogon3
- RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
- INIT_SAMR''',
+ public_deps='''
+ talloc
+ util_cmdline
+ msrpc3
+ ads
+ NDR_LIBNETAPI
+ LIBNET
+ RPC_CLIENT_SCHANNEL
+ libcli_netlogon3
+ LIBCLI_SAMR
+ INIT_SAMR
+ ''',
public_headers='../source3/lib/netapi/netapi.h',
pc_files=[],
vnum='0',
bld.SAMBA3_LIBRARY('smbclient',
source=LIBSMBCLIENT_SRC,
- public_deps='''talloc tdb_compat param libsmb KRBCLIENT pdb
- ndr-standard msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''',
+ public_deps='''
+ talloc
+ param
+ libsmb
+ KRBCLIENT
+ msrpc3
+ libcli_lsa3
+ ''',
public_headers='include/libsmbclient.h',
abi_directory='libsmb/ABI',
abi_match='smbc_*',
bld.SAMBA3_LIBRARY('gse',
source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
- deps='KRB5_WRAP gensec param KRBCLIENT SECRETS3',
+ deps='KRB5_WRAP gensec param KRBCLIENT secrets3',
private_library=True)
bld.SAMBA3_LIBRARY('msrpc3',
bld.SAMBA3_LIBRARY('pdb',
source=PASSDB_SRC,
- deps='SECRETS3 GROUPDB wbclient LIBCLI_AUTH flag_mapping',
+ deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
private_library=True,
public_headers='''
include/passdb.h
passdb/lookup_sid.h''',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
+ source=SERVER_MUTEX_SRC,
+ deps='talloc')
+
bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
- source=PARAM_UTIL_SRC)
+ source=PARAM_UTIL_SRC,
+ deps='talloc')
bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
source='param/loadparm_ctx.c',
- deps='''s3_param_h param''',
+ deps='''talloc s3_param_h param''',
vars=locals())
bld.SAMBA_GENERATOR('param/param_global_h',
bld.SAMBA3_SUBSYSTEM('param',
source=PARAM_WITHOUT_REG_SRC,
- deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h''')
+ deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h cups''')
bld.SAMBA3_PYTHON('pys3param',
source='param/pyparam.c',
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_str util_sec util_malloc''',
+ errors3 dbwrap samba3-util''',
vars=locals(),
allow_undefined_symbols=True,
private_library=True)
bld.SAMBA3_LIBRARY('util_cmdline',
source='lib/util_cmdline.c',
- deps='SECRETS3 popt',
+ deps='secrets3',
private_library=True)
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
bld.SAMBA3_SUBSYSTEM('samba3util',
source=LIB_UTIL_SRC,
- deps='ndr security NDR_SECURITY samba-util',
+ deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan',
vars=locals())
bld.SAMBA3_SUBSYSTEM('samba3core',
LIBTSOCKET
NDR_MESSAGING
LIBASYNC_REQ
- tdb-wrap3
- UTIL_TDB
UTIL_PW
SAMBA_VERSION
PTHREADPOOL
interfaces
param
- util_str
dbwrap
- util_sec
- util_malloc
- memcache
+ samba3-util
ccan
errors3''',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',
- source='''lib/smbd_shim.c''',
+ source='''lib/smbd_shim.c''',
+ deps='talloc',
private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
source=LIBNTLMSSP_SRC,
- deps='NDR_NTLMSSP NTLMSSP_COMMON',
+ deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient',
vars=locals())
bld.SAMBA3_SUBSYSTEM('auth_generic',
deps='cli-ldap-common cli_cldap LIBTSOCKET',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('SECRETS3',
+# NOTE: The secrets3 library is a low level library used by several subsystems.
+# PLEASE DO NOT make it depend on high level libraries like PDB, if you are
+# doing that your design is wrong and needs changing. -SSS
+bld.SAMBA3_LIBRARY('secrets3',
source=SECRETS_SRC,
- deps='NDR_SECRETS param samba3util dbwrap pdb',
+ deps='NDR_SECRETS param samba3util dbwrap',
+ private_library=True,
vars=locals())
bld.SAMBA3_LIBRARY('smbldap',
bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
- deps='ndr-krb5pac KRB5_WRAP',
+ deps='SERVER_MUTEX ndr-krb5pac KRB5_WRAP',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
param
samba-util
smbregistry
- string_init
talloc
util_reg''',
public_headers='../lib/smbconf/smbconf.h',
bld.SAMBA3_LIBRARY('smbd_conn',
source='smbd/conn.c',
- deps='string_init samba-util namearray',
+ deps='samba3-util samba-util',
private_library=True)
bld.SAMBA3_LIBRARY('smbd_base',
source=SMBD_SRC_BASE,
deps='''
+ talloc
tevent
- dl
- krb5
- ldap
- gssapi
- gssapi_krb5
- samba-util
- wbclient
- crypt
- nsl
- cups
- cap
- z
pdb
- param
- samba3core
libsmb
- popt_samba3
- KRBCLIENT
- AVAHI
- ndr-standard
msrpc3
- ads
- LIBADS_SERVER
- LIBADS_PRINTER
vfs
vfs_default
vfs_posixacl
- auth
+ popt_samba3
+ samba3core
+ smbd_conn
+ param_service
+ AVAHI
+ PRINTBASE
+ PROFILE
LOCKING
+ LIBADS_SERVER
LIBAFS
LIBAFS_SETTOKEN
- PROFILE
- PRINTING
- PRINTBACKEND
- NDR_XATTR
- NDR_NOTIFY
- REGFIO
- smbconf
- REG_FULL
- FNAME_UTIL
- NDR_OPEN_FILES
- libcli_lsa3
- cli_spoolss
- RPC_NDR_SRVSVC
- npa_tstream
- INIT_SAMR
- cli_smb_common
RPC_SERVER
- smbd_conn
- param_service
- smbd_shim
- NDR_DFSBLOBS
''',
private_library=True,
vars=locals())
bld.SAMBA3_SUBSYSTEM('PRINTBASE',
source=PRINTBASE_SRC,
- deps='samba-util tdb',
+ deps='samba-util tdb_compat',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
source=PRINTBACKEND_SRC,
- deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate',
+ deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate',
vars=locals())
bld.SAMBA3_LIBRARY('printing_migrate',
bld.SAMBA3_SUBSYSTEM('PRINTING',
source=PRINTING_SRC,
- deps='NDR_PRINTCAP tdb',
+ deps='NDR_PRINTCAP tdb_compat cups',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
bld.SAMBA3_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
- deps='NDR_LIBNET_JOIN net_keytab',
+ deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb',
vars=locals())
bld.SAMBA3_LIBRARY('net_keytab',
bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
source=LIB_EVENTLOG_SRC,
- deps='NDR_EVENTLOG tdb',
+ deps='NDR_EVENTLOG tdb_compat',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNMB',
bld.SAMBA3_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
- deps='samba-util tdb',
+ deps='samba-util tdb_compat',
vars=locals())
bld.SAMBA3_SUBSYSTEM('DCUTIL',
bld.SAMBA3_LIBRARY('trusts_util',
source='libsmb/trusts_util.c',
- deps='libcli_netlogon3 msrpc3',
+ deps='libcli_netlogon3 msrpc3 pdb',
vars=locals(),
private_library=True)
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
+ deps='talloc',
vars=locals())
bld.SAMBA3_LIBRARY('dbwrap',
- source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c',
+ source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c',
deps='samba-util UTIL_TDB errors',
private_library=True)
-bld.SAMBA3_LIBRARY('util_malloc',
- source='''lib/util_malloc.c''',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('string_init',
- source='''lib/string_init.c''',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('util_str',
- source='''lib/util_str.c''',
+bld.SAMBA3_LIBRARY('samba3-util',
+ source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/string_init.c lib/namearray.c''',
deps='samba-util charset',
private_library=True)
-bld.SAMBA3_LIBRARY('util_sec',
- source='''lib/util_sec.c''',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('namearray',
- source='lib/namearray.c',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('adt_tree',
- source='lib/adt_tree.c',
- deps='samba-util',
- private_library=True)
-
-bld.SAMBA3_LIBRARY('memcache',
- source='lib/memcache.c',
- deps='samba-util util_malloc',
- private_library=True)
-
bld.SAMBA3_LIBRARY('CHARSET3',
source='''lib/charcnv.c lib/fstring.c''',
public_deps='ICONV_WRAPPER charset',
- deps='samba-util util_str',
+ deps='samba-util samba3-util',
private_library=True)
bld.SAMBA3_SUBSYSTEM('errors3',
bld.SAMBA3_LIBRARY('cli_spoolss',
source=LIBCLI_SPOOLSS_SRC,
- deps='RPC_NDR_SPOOLSS param SECRETS3',
+ deps='RPC_NDR_SPOOLSS param secrets3',
private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
deps='''
talloc
tevent
- dl
pdb
- ldap
- param
- libsmb
popt_samba3
- KRBCLIENT
- ndr-standard
- msrpc3
- ads
- LIBADS_SERVER
- SRV_NDR_WBINT
- RPC_NDR_WBINT
- NDR_WBINT
- LIBAFS
- PROFILE
- SLCACHE
- DCUTIL
idmap
+ ads
+ msrpc3
nss_info
- TOKEN_UTIL
+ LIBAFS
+ LIBADS_SERVER
LIBCLI_SAMR
- libcli_lsa3
- libcli_netlogon3
+ SLCACHE
RPC_NDR_DSSETUP
- npa_tstream
- RPC_NCACN_NP
- RPC_PIPE_REGISTER
+ RPC_NDR_WBINT
+ SRV_NDR_WBINT
RPC_SAMR
RPC_LSARPC
- PAM_ERRORS
+ RPC_NCACN_NP
+ RPC_PIPE_REGISTER
WB_REQTRANS
- auth
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
PASSCHANGE
PRINTBASE
PRINTING
- cups''',
+ ''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
RPC_NDR_SVCCTL
RPC_NDR_DSSETUP
RPC_NDR_INITSHUTDOWN
- INIT_SAMR
printing_migrate
trusts_util''',
vars=locals())
source=SMBTA_UTIL_SRC,
deps='''
talloc
- SECRETS3
+ secrets3
param''',
vars=locals())
source=SMBGET_SRC,
deps='''
talloc
+ popt_samba3
smbclient''',
vars=locals())
bld.SAMBA3_BINARY('smbcacls',
source=SMBCACLS_SRC,
- deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT
- smbd_shim pdb popt_samba3 ndr-standard
- msrpc3 libcli_lsa3''',
+ deps='''
+ talloc
+ popt_samba3
+ msrpc3
+ libcli_lsa3''',
vars=locals())
bld.SAMBA3_BINARY('smbcquotas',
source=SMBCQUOTAS_SRC,
- deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT
- popt_samba3 pdb ndr-standard msrpc3
+ deps='''
+ talloc
+ popt_samba3
+ libsmb
+ msrpc3
libcli_lsa3''',
vars=locals())
bld.SAMBA3_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
- deps='''talloc tevent cap popt_samba3 samba3core param
- smbd_shim pdb wbclient LIBEVENTLOG''',
+ deps='''
+ talloc
+ param
+ LIBEVENTLOG''',
vars=locals())
bld.SAMBA3_BINARY('sharesec',
source=SHARESEC_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim popt_samba3''',
+ deps='''
+ talloc
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
source=LOCKTEST_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT libsmb smbd_shim
- asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+ deps='''
+ talloc
+ param
+ libsmb
+ LOCKING''',
vars=locals())
bld.SAMBA3_BINARY('pdbtest',
source=PDBTEST_SRC,
- deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim pdb
- popt_samba3 NDR_SAMR NDR_LSA''',
+ deps='''
+ talloc
+ pdb
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('vfstest',
source=VFSTEST_SRC,
- deps='smbd_base SMBREADLINE',
+ deps='''
+ vfs
+ popt_samba3
+ SMBREADLINE''',
vars=locals())
bld.SAMBA3_BINARY('log2pcap',
bld.SAMBA3_BINARY('locktest2',
source=LOCKTEST2_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT libsmb smbd_shim
- asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+ deps='''
+ talloc
+ param
+ libsmb
+ LOCKING''',
vars=locals())
bld.SAMBA3_BINARY('debug2html',
bld.SAMBA3_BINARY('smbfilter',
source=SMBFILTER_SRC,
- deps='''talloc tevent cap wbclient param libsmb smbd_shim KRBCLIENT asn1util LIBTSOCKET
- NDR_SAMR NDR_LSA''',
+ deps='''
+ talloc
+ param
+ LIBNMB''',
vars=locals())
bld.SAMBA3_BINARY('versiontest',
source='lib/version_test.c',
- deps='SAMBA_VERSION samba3core param',
+ deps='''
+ SAMBA_VERSION
+ param''',
vars=locals())
bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
- deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim
- samba3core LIBNTLMSSP popt_samba3 asn1util LIBTSOCKET
- pdb winbind-client LIBINIPARSER LIBADS_SERVER
- NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT libsmb''',
+ deps='''
+ talloc
+ KRB5_WRAP
+ LIBINIPARSER
+ libsmb
+ popt_samba3
+ LIBNTLMSSP gse gensec''',
vars=locals())
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 smbd_shim
- asn1util LIBTSOCKET ndr-standard msrpc3''',
+ deps='''
+ talloc
+ msrpc3''',
vars=locals())
bld.SAMBA3_BINARY('test_lp_load',
source=TEST_LP_LOAD_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim popt_samba3 LIBNTLMSSP''',
+ deps='''
+ talloc
+ param
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('dbwrap_tool',
source=DBWRAP_TOOL_SRC,
- deps='''talloc tdb_compat tevent cap param smbd_shim popt_samba3''',
+ deps='''
+ talloc
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('dbwrap_torture',
source=DBWRAP_TORTURE_SRC,
- deps='''talloc tdb_compat tevent cap param smbd_shim popt_samba3''',
+ deps='''
+ talloc
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('split_tokens',
source=SPLIT_TOKENS_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim popt_samba3
- LIBNTLMSSP''',
+ deps='''
+ talloc
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('vlp',
source=VLP_SRC,
- deps='''talloc tdb_compat PARAM_UTIL UTIL_TDB samba3core param''',
+ deps='''
+ talloc
+ param''',
vars=locals())
swat_dir = os.path.join(bld.curdir, '../swat')
git.samba.org / kai / samba.git / blobdiff