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'
lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
lib/id_cache.c
lib/talloc_dict.c
- lib/util_sconn.c
lib/serverid.c
lib/util_transfer_file.c
lib/addrchange.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 = '''
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'''
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'
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-module samba-internal-module',
+ 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
+ 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
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('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_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_LIBRARY('libcli_netlogon3',