bld.SAMBA3_SUBSYSTEM('TLDAP',
source='''lib/tldap.c
lib/tldap_util.c
- lib/util_tsock.c''',
- deps='asn1util LIBTSOCKET')
+ lib/tldap_gensec_bind.c
+ ''',
+ deps='asn1util LIBTSOCKET samba3util')
# libpdb.so should not expose internal symbols that are only usable
# to the statically linked modules that are merged into libpdb.
# when modules are not linked statically. In the latter case
# symbols will not be present in the libpdb anyway so no hurt is
# done to the version script.
-static_pdb_match = ['tdbsam', 'smbpasswd', 'wbc_sam']
private_pdb_match = []
-
-# AD DC module when linked statically will pull in few source4/winbind
-# dependencies which are not used outside AD DC module
-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')
-# ldap module is actually three modules merged together: ldapsam, ipa, and nds
-static_pdb_match = static_pdb_match + ['ldap', 'ipa', 'nds']
ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info',
'!ldapsam_*', '!groupmap_attr_list*', '!get_userattr_list',
'!dominfo_attr_list', '!get_attr_key2string',
'!sidmap_attr_list', '!attrib_map_*', '!idpool_attr_list',
'!get_attr_list']
private_pdb_match.append('!pdb_nds_*')
-private_pdb_match.append('!pdb_init_ldapsam')
private_pdb_match.append('!pdb_ldapsam_init*')
+private_pdb_match.append('!pdb_*_init')
private_pdb_match = private_pdb_match + ldapsam_pdb_match
-private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
-
bld.SAMBA3_LIBRARY('samba-passdb',
source='',
deps='pdb',
passdb/lookup_sid.h''',
abi_match=private_pdb_match,
abi_directory='passdb/ABI',
- vnum='0.24.1')
+ vnum='0.25.0')
bld.SAMBA3_SUBSYSTEM('pdb',
source='''passdb/pdb_get_set.c
lib/sharesec.c
lib/ldap_debug_handler.c
lib/util_names.c''',
- deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local.h param_global.h cups''')
+ deps='''samba-util
+ PARAM_UTIL
+ ldap
+ lber
+ LOADPARM_CTX
+ samba3core
+ smbconf
+ param_local.h
+ param_global.h
+ cups''')
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source='libads/kerberos.c libads/ads_status.c',
- public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
-
-bld.SAMBA3_LIBRARY('sys_rw',
- source='lib/sys_rw.c lib/sys_rw_data.c',
- deps='replace iov_buf',
- private_library=True)
+ public_deps='krb5samba asn1util k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
bld.SAMBA3_SUBSYSTEM('samba3util',
source='''lib/system.c
lib/recvfile.c
lib/time.c
lib/util_sid.c
+ lib/util_specialsids.c
lib/util_file.c
lib/util.c
+ lib/util_path.c
+ lib/util_procid.c
lib/util_sock.c
+ lib/util_tsock.c
lib/util_transfer_file.c
+ lib/sys_popen.c
lib/sock_exec.c''',
- deps='ndr samba-security NDR_SECURITY samba-util util_tdb sys_rw iov_buf')
+ deps='ndr LIBTSOCKET samba-security NDR_SECURITY samba-util util_tdb sys_rw iov_buf')
-if bld.CONFIG_GET("CTDB_CFLAGS") and bld.CONFIG_GET("CTDB_INCLUDE"):
+if bld.env.with_ctdb:
SAMBA_CLUSTER_SUPPORT_SOURCES='''
lib/cluster_support.c
lib/dbwrap/dbwrap_ctdb.c
lib/messages_ctdbd.c
lib/ctdbd_conn.c
- lib/ctdb_conn.c
- torture/test_ctdbconn.c
'''
SAMBA_CLUSTER_SUPPORT_DEPS='''
talloc
bld.SAMBA3_LIBRARY('samba-cluster-support',
source=SAMBA_CLUSTER_SUPPORT_SOURCES,
deps=SAMBA_CLUSTER_SUPPORT_DEPS,
- cflags=bld.CONFIG_GET("CTDB_CFLAGS"),
- includes=bld.CONFIG_GET("CTDB_INCLUDE"),
allow_undefined_symbols=True,
private_library=True)
bld.SAMBA3_LIBRARY('messages_dgm',
source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
- deps='talloc UNIX_MSG POLL_FUNCS_TEVENT samba-debug',
+ deps='''talloc samba-debug PTHREADPOOL msghdr genrand''',
private_library=True)
bld.SAMBA3_LIBRARY('messages_util',
lib/id_cache.c
lib/talloc_dict.c
lib/serverid.c
+ lib/server_id_watch.c
+ lib/server_id_db_util.c
lib/addrchange.c
../lib/util/debug_s3.c
lib/dumpcore.c
lib/dmallocmsg.c
intl/lang_tdb.c
lib/gencache.c
- lib/events.c
+ lib/util_event.c
lib/server_contexts.c
lib/server_prefork.c
lib/server_prefork_util.c
lib/tevent_wait.c
lib/idmap_cache.c
lib/util_ea.c
- lib/background.c''',
+ lib/background.c
+ lib/cleanupdb.c''',
deps='''
samba3util
LIBTSOCKET
UTIL_PW
SAMBA_VERSION
PTHREADPOOL
- UNIX_MSG
- POLL_FUNCS_TEVENT
interfaces
param
dbwrap
deps='talloc',
private_library=True)
-bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
- source='''libsmb/ntlmssp.c
- libsmb/ntlmssp_wrap.c''',
- deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient')
-
bld.SAMBA3_SUBSYSTEM('auth_generic',
source='libsmb/auth_generic.c',
- deps='LIBNTLMSSP gse gensec')
+ deps='gse gensec')
bld.SAMBA3_LIBRARY('libsmb',
source='''libsmb/clientgen.c
libsmb/smbsock_connect.c
libsmb/cli_smb2_fnum.c''',
deps='''
- LIBNTLMSSP
auth_generic
CLDAP
LIBNMB
SPNEGO_PARSE
LIBTSOCKET
KRBCLIENT
+ NDR_IOCTL
cli_smb_common
util_cmdline
tevent''',
deps='samba3-util samba-util')
NOTIFY_SOURCES=''
+NOTIFY_DEPS=''
if bld.CONFIG_SET("HAVE_INOTIFY"):
NOTIFY_SOURCES += ' smbd/notify_inotify.c'
+if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
+ NOTIFY_SOURCES += ' smbd/notify_fam.c'
+ NOTIFY_DEPS += ' ' + bld.CONFIG_GET('SAMBA_FAM_LIBS')
+
bld.SAMBA3_LIBRARY('smbd_base',
source='''
smbd/server_reload.c
smbd/smb2_ioctl_named_pipe.c
smbd/smb2_ioctl_network_fs.c
smbd/smb2_keepalive.c
- smbd/smb2_find.c
+ smbd/smb2_query_directory.c
smbd/smb2_notify.c
smbd/smb2_getinfo.c
smbd/smb2_setinfo.c
smbd/smb2_break.c
smbd/smbXsrv_version.c
+ smbd/smbXsrv_client.c
smbd/smbXsrv_session.c
smbd/smbXsrv_tcon.c
smbd/smbXsrv_open.c
smbd/oplock_irix.c
smbd/oplock_linux.c
smbd/notify.c
- smbd/notify_internal.c
+ smbd/notify_msg.c
smbd/build_options.c''' + NOTIFY_SOURCES,
deps='''
talloc
RPC_SERVICE
NDR_SMBXSRV
LEASES_DB
- LIBASYS
sysquotas
NDR_SMB_ACL
netapi
NDR_IOCTL
- ''' + bld.env['dmapi_lib'],
+ notifyd
+ ''' +
+ bld.env['dmapi_lib'] +
+ bld.env['legacy_quota_libs'] +
+ NOTIFY_DEPS,
private_library=True)
bld.SAMBA3_SUBSYSTEM('LOCKING',
libsmb/namequery.c
libsmb/conncache.c
libads/sitename_cache.c''',
- deps='addns lmhosts resolv')
+ deps='LIBTSOCKET samba3util addns lmhosts resolv')
bld.SAMBA3_SUBSYSTEM('SERVICES',
source='''services/svc_spoolss.c
source='lib/util_tdb.c',
deps='talloc samba3-util')
-bld.SAMBA3_LIBRARY('msghdr',
- source='lib/msghdr.c',
- deps='replace iov_buf',
- 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/namearray.c lib/file_id.c''',
deps='samba-util charset',
bld.SAMBA3_SUBSYSTEM('errors3',
source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
- deps='errors')
+ deps='samba-errors')
bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
source='rpc_client/cli_samr.c',
########################## BINARIES #################################
bld.SAMBA3_BINARY('smbd/smbd',
- source='smbd/server.c',
- deps='smbd_base EPMD LSASD',
+ source='smbd/server.c smbd/smbd_cleanupd.c',
+ deps='smbd_base EPMD LSASD FSSD MDSSD',
install_path='${SBINDIR}')
bld.SAMBA3_BINARY('nmbd/nmbd',
winbindd/winbindd_msrpc.c
winbindd/winbindd_rpc.c
winbindd/winbindd_reconnect.c
+ winbindd/winbindd_reconnect_ads.c
winbindd/winbindd_ads.c
winbindd/winbindd_samr.c
winbindd/winbindd_dual.c
winbindd/wb_lookupsid.c
winbindd/wb_lookupsids.c
winbindd/wb_lookupname.c
- winbindd/wb_uid2sid.c
- winbindd/wb_gid2sid.c
winbindd/wb_sids2xids.c
+ winbindd/wb_xids2sids.c
winbindd/wb_queryuser.c
winbindd/wb_lookupuseraliases.c
winbindd/wb_lookupusergroups.c
winbindd/winbindd_lookupsid.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_xids_to_sids.c
winbindd/winbindd_allocate_uid.c
winbindd/winbindd_allocate_gid.c
winbindd/winbindd_getpwsid.c
enabled=bld.env.build_winbind,
install_path='${SBINDIR}')
-bld.SAMBA3_BINARY('rpcclient/rpcclient',
- source='''rpcclient/rpcclient.c
- rpcclient/cmd_lsarpc.c
- rpcclient/cmd_samr.c
- rpcclient/cmd_spoolss.c
- rpcclient/cmd_netlogon.c
- rpcclient/cmd_srvsvc.c
- rpcclient/cmd_dfs.c
- rpcclient/cmd_epmapper.c
- rpcclient/cmd_dssetup.c
- rpcclient/cmd_echo.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_fss.c
- rpcclient/cmd_witness.c
- rpcclient/cmd_clusapi.c''',
- deps='''
- talloc
- popt_samba3
- pdb
- libsmb
- param
- ndr-standard
- msrpc3
- SMBREADLINE
- trusts_util
- RPC_NDR_WINREG
- RPC_NDR_ECHO
- RPC_CLIENT_SCHANNEL
- DCUTIL
- 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_SAMR
- RPC_NDR_FSRVP
- RPC_NDR_WITNESS
- RPC_NDR_CLUSAPI
- ''')
-
bld.SAMBA3_BINARY('client/smbclient',
source='''client/client.c
client/clitar.c
msrpc3
RPC_NDR_SRVSVC
cli_smb_common
- ''' + bld.env['archive_lib'])
+ archive
+ ''')
bld.SAMBA3_BINARY('net',
source='''utils/net.c
utils/net_rpc_trust.c
utils/net_rpc_conf.c
utils/net_afs.c
+ utils/net_notify.c
registry/reg_parse.c
registry/reg_format.c
registry/reg_import.c
libsmb
samba3core''')
+bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
+ source='client/smbspool_krb5_wrapper.c',
+ deps='''
+ DYNCONFIG
+ cups
+ ''',
+ install_path='${LIBEXECDIR}/samba',
+ enabled=bld.CONFIG_SET('HAVE_CUPS'))
+
bld.SAMBA3_BINARY('testparm',
source='utils/testparm.c',
deps='''
param
popt_samba3''')
-bld.SAMBA3_BINARY('smbta-util',
- source='utils/smbta-util.c',
- deps='''
- talloc
- secrets3
- param''')
-
-smbstatus_source = 'utils/status.c smbd/notify_internal.c'
+smbstatus_source = 'utils/status.c smbd/notify_msg.c'
if bld.CONFIG_GET("WITH_PROFILE"):
smbstatus_source += ' utils/status_profile.c'
torture/test_messaging_read.c
torture/test_messaging_fd_passing.c
torture/test_oplock_cancel.c
- torture/t_strappend.c
+ torture/test_pthreadpool_tevent.c
torture/bench_pthreadpool.c
torture/wbc_async.c''',
deps='''
LOCKING
NDR_OPEN_FILES
idmap
+ IDMAP_TDB_COMMON
samba-cluster-support
''',
cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
install=False)
bld.SAMBA3_BINARY('smbcacls',
- source='utils/smbcacls.c',
+ source='utils/smbcacls.c lib/util_sd.c',
deps='''
talloc
popt_samba3
LIBEVENTLOG''')
bld.SAMBA3_BINARY('sharesec',
- source='utils/sharesec.c',
+ source='utils/sharesec.c lib/util_sd.c',
deps='''
talloc
+ msrpc3
+ libcli_lsa3
popt_samba3''')
bld.SAMBA3_BINARY('pdbtest',
tiniparser
libsmb
popt_samba3
- LIBNTLMSSP gse gensec''')
+ gse gensec''')
bld.SAMBA3_BINARY('timelimit',
source='script/tests/timelimit.c',
bld.SAMBA3_PYTHON('pysmbd',
source='smbd/pysmbd.c',
- deps='smbd_base pyrpc_util',
+ deps='smbd_base pyrpc_util pytalloc-util',
realname='samba/samba3/smbd.so'
)
bld.SAMBA3_PYTHON('pylibsmb',
source='libsmb/pylibsmb.c',
- deps='smbclient samba-credentials',
+ deps='smbclient samba-credentials pycredentials',
realname='samba/samba3/libsmb_samba_internal.so'
)
deps='ncurses menu panel form registry param popt_samba3 smbregistry',
enabled=bld.env.build_regedit)
+bld.SAMBA3_BINARY('spotlight2sparql',
+ source='''
+ rpc_server/mdssvc/sparql_parser_test.c
+ rpc_server/mdssvc/sparql_parser.c
+ rpc_server/mdssvc/sparql_lexer.c
+ rpc_server/mdssvc/sparql_mapping.c''',
+ deps='samba3-util talloc ' + bld.env['libtracker'],
+ enabled=bld.env.with_spotlight,
+ install=False)
+
########################## INCLUDES #################################
bld.RECURSE('auth')
bld.RECURSE('libgpo/gpext')
bld.RECURSE('lib/pthreadpool')
-bld.RECURSE('lib/asys')
-bld.RECURSE('lib/poll_funcs')
-bld.RECURSE('lib/unix_msg')
bld.RECURSE('librpc')
bld.RECURSE('librpc/idl')
bld.RECURSE('libsmb')
bld.RECURSE('modules')
-bld.RECURSE('pam_smbpass')
bld.RECURSE('param')
bld.RECURSE('passdb')
bld.RECURSE('rpc_server')
bld.RECURSE('../examples/VFS')
bld.RECURSE('lib/netapi/tests')
bld.RECURSE('lib/netapi/examples')
+bld.RECURSE('smbd/notifyd')
+bld.RECURSE('rpcclient')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
git.samba.org / samba.git / blobdiff