TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-SMBLDAP_SRC = '''lib/smbldap.c lib/smbldap_util.c'''
+SMBLDAP_SRC = '''lib/smbldap.c'''
VERSION_SRC = '''lib/version.c'''
LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c rpc_client/util_lsarpc.c'''
+LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-LIBRPCCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
+LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
lib/substitute.c lib/substitute_generic.c
lib/ms_fnmatch.c
lib/tallocmsg.c lib/dmallocmsg.c
- libsmb/smb_signing.c
intl/lang_tdb.c
lib/conn_tdb.c lib/gencache.c
lib/sessionid_tdb.c
PARAM_UTIL_SRC = '''param/util.c'''
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c
+PARAM_WITHOUT_REG_SRC = '''param/loadparm.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'''
libsmb/clioplock.c libsmb/clirap2.c
libsmb/async_smb.c
libsmb/clisigning.c
- libsmb/smb2cli_base.c
- libsmb/smb2cli_negprot.c
libsmb/smb2cli_session.c
libsmb/smb2cli_tcon.c
libsmb/smb2cli_create.c
registry/reg_util_internal.c
lib/util_nttoken.c
${REG_BACKENDS_BASE_SRC}
+ registry/reg_parse_internal.c
+ lib/cbuf.c
+ lib/srprs.c
${REG_INIT_BASIC_SRC}'''
REG_SMBCONF_SRC = '''
SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
-DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
+DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_group.c
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
-SMBD_SRC_MAIN = '''smbd/server.c smbd/msg_idmap.c'''
+SMBD_SRC_MAIN = '''smbd/server.c'''
BUILDOPT_SRC = '''smbd/build_options.c'''
SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
-LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c'
+LIBNET_SRC = 'libnet/libnet_join.c'
LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
utils/net_rpc_trust.c
utils/net_rpc_conf.c
registry/reg_parse.c registry/reg_format.c
- registry/reg_parse_internal.c registry/reg_import.c
- lib/cbuf.c lib/srprs.c'''
+ registry/reg_import.c
+ '''
NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
torture/test_notify_online.c
torture/test_smb2.c
torture/test_authinfo_structs.c
- torture/test_smbsock_any_connect.c'''
+ torture/test_smbsock_any_connect.c
+ torture/t_strappend.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
torture/wbc_async.c'''
VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c'''
-SMBICONV_SRC = '''torture/smbiconv.c'''
-
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
LOCKTEST2_SRC = '''torture/locktest2.c'''
pdb param samba-util
LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF
- LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON
+ LIBCLI_SAMR libcli_lsa3 libcli_netlogon3
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
- INIT_NETLOGON INIT_SAMR popt_samba3''',
+ INIT_SAMR popt_samba3''',
public_headers='../source3/lib/netapi/netapi.h',
pc_files=[],
vnum='0',
deps='''ndr-standard NDR_DSSETUP NDR_SPOOLSS''',
vars=locals())
-bld.SAMBA3_LIBRARY('libgpo',
+bld.SAMBA3_LIBRARY('gpo',
source='${LIBGPO_SRC}',
deps='talloc ads TOKEN_UTIL gpext',
vars=locals(),
bld.SAMBA3_LIBRARY('pdb',
source=PASSDB_SRC,
- deps='SECRETS3 SMBLDAP GROUPDB wbclient LIBCLI_AUTH flag_mapping',
+ deps='SECRETS3 GROUPDB wbclient LIBCLI_AUTH flag_mapping',
private_library=True,
public_headers='''
include/passdb.h
passdb/machine_sid.h
passdb/lookup_sid.h''',
- pc_files=[],
- vnum='0',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
- deps='LIBTSOCKET 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_sec util_malloc memcache ccan errors3 samba-modules uid_wrapper',
+ deps='LIBTSOCKET 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_sec util_malloc memcache ccan errors3 samba-modules',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',
deps='NDR_SECRETS param samba3core pdb',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('SMBLDAP',
+bld.SAMBA3_LIBRARY('smbldap',
source=SMBLDAP_SRC,
- deps='ldap lber',
+ deps='ldap lber samba-util param',
vars=locals(),
- enabled=bld.env.HAVE_LDAP)
+ enabled=bld.env.HAVE_LDAP,
+ private_library=True,
+ public_headers='include/smbldap.h include/smb_ldap.h')
bld.SAMBA3_LIBRARY('ads',
source=LIBADS_SRC,
- deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL',
+ deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
private_library=True,
vars=locals())
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
smbconf REG_FULL FNAME_UTIL
- LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss
- RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR
+ NDR_OPEN_FILES
+ LIBCLI_SAMR libcli_lsa3 libcli_netlogon3 cli_spoolss
+ RPC_NDR_SRVSVC npa_tstream INIT_SAMR
cli_smb_common RPC_SERVER smbd_conn param_service
- smbd_shim uid_wrapper NDR_DFSBLOBS
+ smbd_shim NDR_DFSBLOBS
''',
private_library=True,
vars=locals())
bld.SAMBA3_SUBSYSTEM('LOCKING',
source='${LOCKING_SRC}',
- deps='''tdb_compat talloc''',
+ deps='''tdb_compat talloc NDR_OPEN_FILES''',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PROFILE',
bld.SAMBA3_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
- deps='NDR_LIBNET_JOIN KRB5_WRAP',
+ deps='NDR_LIBNET_JOIN KRB5_WRAP net_keytab',
vars=locals())
+bld.SAMBA3_LIBRARY('net_keytab',
+ source='libnet/libnet_keytab.c',
+ deps='KRB5_WRAP ads',
+ vars=locals(),
+ private_library=True)
+
+
bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
source=LIBNET_DSSYNC_SRC,
deps='LIBNET LIBCLI_DRSUAPI tdb-wrap3',
bld.SAMBA3_SUBSYSTEM('LIBNBT',
source='',
- deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
+ deps='NDR_SVCCTL ndr_nbt LIBCLI_NETLOGON',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SERVICES',
bld.SAMBA3_SUBSYSTEM('DCUTIL',
source=DCUTIL_SRC,
- deps='ads LIBRPCCLI_NETLOGON msrpc3 libcli_lsa3 INIT_NETLOGON',
+ deps='ads msrpc3 libcli_lsa3',
vars=locals())
+bld.SAMBA3_LIBRARY('trusts_util',
+ source='libsmb/trusts_util.c',
+ deps='ads libcli_netlogon3 msrpc3',
+ vars=locals(),
+ private_library=True)
+
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
deps='tdb-wrap',
bld.SAMBA3_LIBRARY('libcli_lsa3',
source=LIBCLI_LSA_SRC,
- deps='RPC_NDR_LSA INIT_LSA',
+ deps='RPC_NDR_LSA INIT_LSA UTIL_LSARPC',
private_library=True)
-bld.SAMBA3_SUBSYSTEM('LIBRPCCLI_NETLOGON',
- source=LIBRPCCLI_NETLOGON_SRC,
- deps='RPC_NDR_NETLOGON')
+bld.SAMBA3_LIBRARY('libcli_netlogon3',
+ source=LIBCLI_NETLOGON_SRC,
+ deps='RPC_NDR_NETLOGON INIT_NETLOGON cliauth param',
+ private_library=True)
bld.SAMBA3_LIBRARY('cli_spoolss',
source=LIBCLI_SPOOLSS_SRC,
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 npa_tstream INIT_NETLOGON
+ LIBCLI_SAMR libcli_lsa3 libcli_netlogon3
+ RPC_NDR_DSSETUP npa_tstream
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
PAM_ERRORS WB_REQTRANS auth
''',
source=RPCCLIENT_SRC,
deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3
- ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
+ ads SMBREADLINE trusts_util RPC_NDR_WINREG RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL
- LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss
+ LIBCLI_SAMR libcli_lsa3 libcli_netlogon3 cli_spoolss
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
- RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON
+ RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG
INIT_SAMR
''',
vars=locals())
-bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
+bld.SAMBA3_BINARY('client/smbclient',
source=CLIENT_SRC,
deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN
bld.SAMBA3_BINARY('net',
source=NET_SRC,
deps='''talloc tdb_compat netapi addns cap intl popt_samba3 pdb libsmb smbd_shim
- param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 libgpo ads LIBADS_SERVER LIBADS_PRINTER
+ param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 gpo ads LIBADS_SERVER LIBADS_PRINTER
LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
REGFIO NDR_NTPRINTING RPC_NDR_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
- LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss
+ LIBCLI_SAMR libcli_lsa3 libcli_netlogon3 cli_spoolss
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP
- RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR
- printing_migrate
+ RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_SAMR
+ printing_migrate trusts_util
''',
vars=locals())
deps='smbd_base SMBREADLINE',
vars=locals())
-bld.SAMBA3_BINARY('smbiconv',
- source=SMBICONV_SRC,
- deps='''talloc tdb_compat tevent cap param smbd_shim popt_samba3 LIBSMB_ERR''',
- vars=locals())
-
bld.SAMBA3_BINARY('log2pcap',
source=LOG2PCAP_SRC,
deps='''talloc popt''',
git.samba.org / kai / samba.git / blobdiff