TDB_LIB_SRC = '''
lib/dbwrap/dbwrap_open.c
- lib/dbwrap/dbwrap_tdb.c
lib/dbwrap/dbwrap_ctdb.c
+ lib/dbwrap/dbwrap_watch.c
lib/g_lock.c'''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
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
${TDB_LIB_SRC}
../lib/util/debug_s3.c
lib/dumpcore.c
- lib/interface.c lib/pidfile.c
+ lib/interface.c
lib/username.c
lib/access.c lib/smbrun.c
lib/wins_srv.c
lib/ldap_escape.c
lib/fncall.c
libads/krb5_errs.c lib/system_smbd.c lib/audit.c
- lib/file_id.c lib/idmap_cache.c'''
+ lib/tevent_wait.c
+ lib/idmap_cache.c'''
LIB_UTIL_SRC = '''
lib/system.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'''
+KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
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/cli_np_tstream.c
libsmb/reparse_symlink.c
libsmb/clisymlink.c
# registry-related objects
#
-REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
-REGSRCS_SRC = '''registry/reg_objects.c'''
-
-REG_BACKENDS_BASE_SRC = '''registry/reg_backend_db.c'''
-
REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
REG_BASE_SRC = '''registry/reg_api.c
registry/reg_dispatcher.c
registry/reg_cachehook.c
- ${REGSRCS_SRC}
+ registry/reg_objects.c
registry/reg_util_internal.c
lib/util_nttoken.c
- ${REG_BACKENDS_BASE_SRC}
+ registry/reg_backend_db.c
registry/reg_parse_internal.c
- lib/cbuf.c
+ lib/cbuf.c
lib/srprs.c
- ${REG_INIT_BASIC_SRC}'''
+ registry/reg_init_basic.c'''
REG_SMBCONF_SRC = '''
${REG_BACKENDS_SMBCONF_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'''
+ 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/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}'''
SWAT_SRC = '''${SWAT_SRC1}'''
-STATUS_SRC = '''utils/status.c utils/status_profile.c'''
+STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
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}'''
LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
libsmb/libsmb_thread_posix.c'''
-LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
- libsmb/libsmb_compat.c
- libsmb/libsmb_context.c
- libsmb/libsmb_dir.c
- libsmb/libsmb_file.c
- libsmb/libsmb_misc.c
- libsmb/libsmb_path.c
- libsmb/libsmb_printjob.c
- libsmb/libsmb_server.c
- libsmb/libsmb_stat.c
- libsmb/libsmb_xattr.c
- libsmb/libsmb_setget.c'''
-
-LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}'''
-
-LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
-
LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-CLIENT_SRC1 = '''client/client.c client/clitar.c
- client/dnsbrowse.c'''
-
-CLIENT_SRC = '''${CLIENT_SRC1}'''
+CLIENT_SRC = '''
+ client/client.c
+ client/clitar.c
+ client/dnsbrowse.c'''
LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
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/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('smbclient',
- source=LIBSMBCLIENT_SRC,
- public_deps='''
- talloc
- param
- libsmb
- KRBCLIENT
- msrpc3
- libcli_lsa3
- ''',
- public_headers='include/libsmbclient.h',
- abi_directory='libsmb/ABI',
- abi_match='smbc_*',
- vnum='0.1.0',
- pc_files='libsmb/smbclient.pc',
- 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())
bld.SAMBA3_LIBRARY('gse',
source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
- deps='KRB5_WRAP gensec param KRBCLIENT secrets3',
+ deps='krb5samba gensec param KRBCLIENT secrets3',
private_library=True)
bld.SAMBA3_LIBRARY('msrpc3',
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
+ deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
+ replace util_reg samba-util samba-security
errors3 dbwrap samba3-util''',
- vars=locals(),
allow_undefined_symbols=True,
private_library=True)
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,
- public_deps='KRB5_WRAP k5crypto LIBTSOCKET CLDAP LIBNMB',
+ public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB',
vars=locals())
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('samba3core',
param
dbwrap
samba3-util
- ccan
errors3''',
vars=locals())
bld.SAMBA3_LIBRARY('ads',
source=LIBADS_SRC,
- deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
+ deps='cli-ldap-common krb5samba ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
private_library=True,
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
- deps='SERVER_MUTEX ndr-krb5pac KRB5_WRAP',
+ deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi',
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_LIBRARY('net_keytab',
source='libnet/libnet_keytab.c',
- deps='KRB5_WRAP ads',
+ deps='krb5samba ads',
vars=locals(),
private_library=True)
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',
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
- deps='talloc',
+ 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',
- deps='samba-util UTIL_TDB errors',
- 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''',
+ 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.SAMBA_LIBRARY('xattr_tdb',
+ source='lib/xattr_tdb.c',
+ deps='NDR_XATTR dbwrap samba3-util',
+ private_library=True)
+
bld.SAMBA3_LIBRARY('CHARSET3',
source='''lib/charcnv.c lib/fstring.c''',
public_deps='ICONV_WRAPPER charset',
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
param
ndr-standard
SMBREADLINE
- smbclient
+ libsmb
+ msrpc3
RPC_NDR_SRVSVC
- cli_smb_common''',
- vars=locals())
+ cli_smb_common''')
bld.SAMBA3_BINARY('net',
source=NET_SRC,
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',
source=NTLM_AUTH_SRC,
deps='''
talloc
- KRB5_WRAP
- LIBINIPARSER
+ krb5samba
+ iniparser
libsmb
popt_samba3
LIBNTLMSSP gse gensec''',
param''',
vars=locals())
+bld.SAMBA3_PYTHON('pysmbd',
+ source='smbd/pysmbd.c',
+ deps='smbd_base pyrpc_util',
+ realname='samba/samba3/smbd.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')
bld.RECURSE('modules')
bld.RECURSE('pam_smbpass')
bld.RECURSE('passdb')