lib/ldap_escape.c
lib/fncall.c
libads/krb5_errs.c lib/system_smbd.c lib/audit.c
+ lib/tevent_wait.c
lib/idmap_cache.c'''
LIB_UTIL_SRC = '''
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c libsmb/conncache.c
- libads/dns.c libads/sitename_cache.c'''
+
+ libads/sitename_cache.c'''
LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
libsmb/async_smb.c
- libsmb/clisigning.c
- libsmb/smb2cli_session.c
libsmb/smb2cli_tcon.c
- libsmb/smb2cli_create.c
- libsmb/smb2cli_close.c
- libsmb/smb2cli_flush.c
- libsmb/smb2cli_read.c
- libsmb/smb2cli_write.c
- libsmb/smb2cli_query_directory.c
- libsmb/smb2cli_ioctl.c
- libsmb/smb2cli_query_info.c
- libsmb/smb2cli_set_info.c
libsmb/cli_np_tstream.c
libsmb/reparse_symlink.c
libsmb/clisymlink.c
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'''
+ passdb/pdb_secrets.c
+ passdb/pdb_unixid.c'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
PROFILE_SRC = '''profile/profile.c'''
PROFILES_SRC = '''utils/profiles.c'''
-OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
- smbd/oplock_onefs.c'''
+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'''
smbd/process.c smbd/service.c smbd/error.c
printing/printspoolss.c printing/spoolssd.c
lib/sysquotas.c lib/sysquotas_linux.c
- lib/sysquotas_xfs.c lib/sysquotas_4A.c
+ lib/sysquotas_xfs.c lib/sysquotas_4A.c lib/sysquotas_4B.c
lib/sysquotas_nfs.c
lib/background.c
smbd/fake_file.c
smbd/smb2_getinfo.c
smbd/smb2_setinfo.c
smbd/smb2_break.c
+ smbd/smbXsrv_version.c
+ smbd/smbXsrv_session.c
+ smbd/smbXsrv_tcon.c
+ smbd/smbXsrv_open.c
smbd/server_exit.c
${MANGLE_SRC}'''
rpcclient/cmd_shutdown.c rpcclient/cmd_test.c
rpcclient/cmd_wkssvc.c rpcclient/cmd_ntsvcs.c
rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c
- rpcclient/cmd_winreg.c'''
+ rpcclient/cmd_winreg.c rpcclient/cmd_fss.c'''
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
utils/net_util.c utils/net_rpc_sh_acct.c utils/net_rpc_audit.c
utils/net_dns.c utils/net_ads_gpo.c
utils/net_conf.c utils/net_join.c utils/net_user.c
- utils/net_group.c utils/net_file.c utils/net_registry.c
+ utils/net_group.c utils/net_file.c utils/net_registry.c utils/net_connections.c
utils/net_registry_check.c
utils/net_dom.c utils/net_share.c
utils/net_g_lock.c
torture/test_authinfo_structs.c
torture/test_smbsock_any_connect.c
torture/test_cleanup.c
- torture/test_ctdbconn.c
- torture/test_msg.c
- torture/test_notify.c
- lib/tevent_barrier.c
- torture/test_dbwrap_watch.c
- torture/test_idmap_tdb_common.c
+ torture/test_ctdbconn.c
+ torture/test_msg.c
+ torture/test_notify.c
+ lib/tevent_barrier.c
+ torture/test_dbwrap_watch.c
+ torture/test_idmap_tdb_common.c
torture/t_strappend.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
INIT_SAMR
''',
public_headers='../source3/lib/netapi/netapi.h',
- pc_files=[],
+ pc_files='libnet/netapi.pc',
vnum='0',
vars=locals())
bld.SAMBA3_LIBRARY('smbsharemodes',
source=LIBSMBSHAREMODES_SRC,
public_deps='''talloc tdb_compat''',
- deps='''ccan''',
+ deps='''ccan-hash''',
public_headers='include/smb_share_modes.h',
- pc_files=[],
+ pc_files='libsmb/smbsharemodes.pc',
vnum='0',
vars=locals())
source=TLDAP_SRC,
deps='asn1util LIBTSOCKET')
+static_pdb_modules = ['tdbsam', 'ldap', 'smbpasswd', 'wbc_sam']
+static_pdb_match = filter(lambda x: bld.SAMBA3_IS_STATIC_MODULE('pdb_%s' % x), static_pdb_modules)
+private_pdb_match = []
+if bld.SAMBA3_IS_STATIC_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED():
+ static_pdb_match.append('samba_dsdb')
+ private_pdb_match.append('!idmap_init')
+ private_pdb_match.append('!idmap_sids_to_xids')
+ private_pdb_match.append('!idmap_xids_to_sids')
+
+private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
+
bld.SAMBA3_LIBRARY('pdb',
source=PASSDB_SRC,
deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
- private_library=True,
+ private_library=False,
+ pc_files=[],
+ public_headers_install=True,
public_headers='''
include/passdb.h
passdb/machine_sid.h
passdb/lookup_sid.h''',
+ abi_match=private_pdb_match + ['*'],
+ abi_directory='passdb/ABI',
+ vnum='0',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
vars=locals())
bld.SAMBA_GENERATOR('param/param_global_h',
- source= 'param/loadparm.c ../script/mkparamdefs.pl',
+ source= '../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c',
target='param/param_global.h',
- rule='${PERL} ${SRC[1].abspath(env)} ${SRC[0].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
+ rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
bld.SAMBA3_SUBSYSTEM('param',
source=PARAM_WITHOUT_REG_SRC,
bld.SAMBA3_LIBRARY('smbregistry',
source=REG_BASE_SRC,
deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
- replace util_reg samba-util security
+ replace util_reg samba-util samba-security
errors3 dbwrap samba3-util''',
allow_undefined_symbols=True,
private_library=True)
bld.SAMBA3_SUBSYSTEM('samba3util',
source=LIB_UTIL_SRC,
- deps='ndr security NDR_SECURITY samba-util util_tdb ccan',
+ deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('pidfile',
- source='lib/pidfile.c',
- # only pidfile.c assumes that CONFIGFILE is set
- cflags = ['-DCONFIGFILE="%s"' % bld.env['CONFIGFILE']])
-
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
deps='''
- pidfile
samba3util
LIBTSOCKET
NDR_MESSAGING
param
dbwrap
samba3-util
- ccan
errors3''',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
source=LIBADS_PRINTER_SRC,
- deps='samba-util',
+ deps='samba-util krb5samba',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBAFS',
LIBAFS
LIBAFS_SETTOKEN
RPC_SERVER
+ NDR_SMBXSRV
+ LIBASYS
+ ccan-hash
+ NDR_SMB_ACL
''',
private_library=True,
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNMB',
source=LIBNMB_SRC,
- deps='lmhosts resolv',
+ deps='addns lmhosts resolv',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SERVICES',
source=PASSCHANGE_SRC,
deps='''LIBCLI_SAMR
INIT_LSA
- msrpc3''',
+ msrpc3
+ krb5samba''',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
deps='talloc samba3-util',
vars=locals())
-bld.SAMBA3_LIBRARY('dbwrap',
- source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c lib/dbwrap/dbwrap_tdb.c',
- deps='samba-util util_tdb errors tdb tdb-wrap',
- private_library=True)
-
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 lib/file_id.c''',
+ source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/memcache.c lib/namearray.c lib/file_id.c''',
deps='samba-util charset',
private_library=True)
bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
- deps='samba-util',
+ deps='samba-util krb5samba',
vars=locals())
bld.SAMBA3_SUBSYSTEM('INIT_LSA',
RPC_NDR_NTSVCS
RPC_NDR_EVENTLOG
INIT_SAMR
+ RPC_NDR_FSRVP
''',
vars=locals())
-bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
+bld.SAMBA3_BINARY('client/smbclient',
source=CLIENT_SRC,
deps='''
talloc
smbclient''',
vars=locals())
-bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
+bld.SAMBA3_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
deps='''
talloc
TLDAP
RPC_NDR_ECHO
WB_REQTRANS
+ LOCKING
+ NDR_OPEN_FILES
idmap
''',
vars=locals())
talloc
popt_samba3
msrpc3
- libcli_lsa3''',
+ libcli_lsa3
+ krb5samba''',
vars=locals())
bld.SAMBA3_BINARY('smbcquotas',
deps='''
talloc
pdb
- popt_samba3''',
+ popt_samba3
+ AUTH_COMMON
+ auth''',
vars=locals())
bld.SAMBA3_BINARY('vfstest',
bld.SAMBA3_PYTHON('pysmbd',
source='smbd/pysmbd.c',
- deps='smbd_base',
+ deps='smbd_base pyrpc_util',
realname='samba/samba3/smbd.so'
)
+bld.SAMBA3_PYTHON('pylibsmb',
+ source='libsmb/pylibsmb.c',
+ deps='smbclient samba-credentials',
+ realname='samba/samba3/libsmb_samba_internal.so'
+ )
+
swat_dir = os.path.join(bld.curdir, '../swat')
swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
bld.RECURSE('auth')
bld.RECURSE('libgpo/gpext')
bld.RECURSE('lib/pthreadpool')
+bld.RECURSE('lib/asys')
bld.RECURSE('librpc')
bld.RECURSE('librpc/idl')
bld.RECURSE('libsmb')