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/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
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'''
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
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
# 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}
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
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'''
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_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/test_dbwrap_watch.c
+ torture/test_idmap_tdb_common.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'''
source=LIBNETAPI_SRC,
public_deps='''
talloc
- popt
+ util_cmdline
msrpc3
ads
NDR_LIBNETAPI
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''',
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.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
- source=SERVER_MUTEX_SRC)
+ 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',
bld.SAMBA3_LIBRARY('smbregistry',
source=REG_BASE_SRC,
- deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc
+ 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''',
- vars=locals(),
+ errors3 dbwrap samba3-util''',
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',
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',
+ deps='ndr security NDR_SECURITY samba-util util_tdb ccan',
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
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',
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',
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',
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 cups',
+ deps='NDR_PRINTCAP tdb_compat cups',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
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('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_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
+ 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',
- 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 lib/file_id.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.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',
- deps='samba-util util_str',
+ deps='samba-util samba3-util',
private_library=True)
bld.SAMBA3_SUBSYSTEM('errors3',
source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
- deps='errors gssapi')
+ deps='errors')
bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
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,
source=SMBGET_SRC,
deps='''
talloc
- popt
+ popt_samba3
smbclient''',
vars=locals())
TLDAP
RPC_NDR_ECHO
WB_REQTRANS
+ idmap
''',
vars=locals())
source=NTLM_AUTH_SRC,
deps='''
talloc
- KRB5_WRAP
- LIBINIPARSER
- SLCACHE
+ krb5samba
+ iniparser
libsmb
popt_samba3
- LIBADS_SERVER''',
+ LIBNTLMSSP gse gensec''',
vars=locals())
bld.SAMBA3_BINARY('timelimit',
param''',
vars=locals())
+bld.SAMBA3_PYTHON('pysmbd',
+ source='smbd/pysmbd.c',
+ deps='smbd_base',
+ 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('lib/pthreadpool')
bld.RECURSE('librpc')
bld.RECURSE('librpc/idl')
+bld.RECURSE('libsmb')
bld.RECURSE('modules')
bld.RECURSE('pam_smbpass')
bld.RECURSE('passdb')