#!/usr/bin/env python
from samba_utils import *
-import samba_version
+import samba_version, samba3
+
+# enable building of public headers in the build tree
+bld.env.build_public_headers = 'include/public'
+
+# these are includes which appear in public headers, but with #ifdef conditional
+# compilation, so they are safe
+bld.env.public_headers_skip = ['lib/ldb_compat.h']
+
+# s3 public headers refer to non-public headers
+bld.env.public_headers_allow_broken = True
TDB_LIB_SRC = '''
lib/dbwrap.c lib/dbwrap_tdb.c
VERSION_SRC = '''lib/version.c'''
-WBCOMMON_SRC = '../nsswitch/wb_common.c'
-
AFS_SRC = 'lib/afs.c'
AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
-
-UTIL_SRC = '''
- ../lib/util/become_daemon.c
- ../lib/util/blocking.c
- ../lib/util/data_blob.c
- ../lib/util/fsusage.c
- ../lib/util/genrand.c
- ../lib/util/params.c
- ../lib/util/rbtree.c
- ../lib/util/rfc1738.c
- ../lib/util/select.c
- ../lib/util/signal.c
- ../lib/util/smb_threads.c
- ../lib/util/system.c
- ../lib/util/talloc_stack.c
- ../lib/util/time.c
- ../lib/util/util.c
- ../lib/util/util_file.c
- ../lib/util/util_id.c
- ../lib/util/util_net.c
- ../lib/util/util_strlist.c
- ../lib/util/xfile.c
- '''
-
-LIBTEVENT_SRC0 = ''
-
-PTHREADPOOL_SRC = ''
-
-LIBREPLACE_SRCS = ''
-
-LIB_SRC = '''${LIBSAMBAUTIL_SRC}
+LIB_SRC = '''
lib/messages.c lib/messages_local.c
- lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
+ lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
lib/interfaces.c lib/memcache.c
lib/talloc_dict.c
lib/util_sconn.c
lib/util_transfer_file.c
lib/addrchange.c
${TDB_LIB_SRC}
- lib/debug.c lib/fault.c
+ ../lib/util/debug_s3.c
+ lib/dumpcore.c
lib/interface.c lib/pidfile.c
lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
- ../libds/common/flag_mapping.c
lib/access.c lib/smbrun.c
- lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
+ lib/bitmap.c lib/dprintf.c
lib/wins_srv.c
- lib/clobber.c lib/util_sid.c
+ lib/util_sid.c
lib/util_file.c
- lib/util.c lib/util_names.c
+ lib/util.c lib/util_cmdline.c lib/util_names.c
lib/util_sock.c lib/sock_exec.c lib/util_sec.c
lib/substitute.c lib/dbwrap_util.c
lib/ms_fnmatch.c
intl/lang_tdb.c
lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
lib/sessionid_tdb.c
- lib/module.c lib/events.c ${LIBTEVENT_SRC0}
+ lib/module.c lib/events.c
lib/server_contexts.c
lib/ldap_escape.c
- lib/secdesc.c ${PTHREADPOOL_SRC}
+ lib/secdesc.c
lib/fncall.c
libads/krb5_errs.c lib/system_smbd.c lib/audit.c
lib/file_id.c lib/idmap_cache.c'''
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
-KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
+KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c libsmb/clikrb5.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
passdb/machine_sid.c'''
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
- libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
+ libsmb/namequery.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-
-LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
-
-LIBSMB_SRC0 = '''
+LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
- libsmb/ntlmssp_wrap.c
- ../libcli/auth/ntlmssp.c
- ../libcli/auth/ntlmssp_sign.c
- ../libcli/auth/ntlmssp_ndr.c
- ../libcli/auth/ntlmssp_server.c'''
-
-LIBSAMBA_SRC = '${LIBSMB_SRC0}'
-
-CLDAP_SRC = '''libads/cldap.c
- ../libcli/cldap/cldap.c
- ../lib/util/idtree.c'''
+ libsmb/ntlmssp_wrap.c'''
TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
-SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
-
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
- libsmb/clikrb5.c libsmb/clispnego.c
+ libsmb/clispnego.c
libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
libsmb/smbsock_connect.c'''
LIBMSRPC_SRC = '''
- ${SCHANNEL_SRC}
rpc_client/cli_pipe.c
librpc/crypto/gse_krb5.c
librpc/crypto/gse.c
rpc_client/rpc_transport_np.c
rpc_client/rpc_transport_sock.c
rpc_client/rpc_transport_tstream.c
- ../librpc/rpc/binding.c
- ../librpc/rpc/dcerpc_util.c
librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c'''
+ '''
#
# registry-related objects
#
-UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
- passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
- passdb/util_unixsids.c passdb/lookup_sid.c
+ lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
+ lib/util_unixsids.c passdb/lookup_sid.c
passdb/login_cache.c
passdb/account_pol.c ${PRIVILEGES_SRC}
- lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
+ lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}
+ passdb/pdb_util.c'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
-FNAME_UTIL_SRC = '''smbd/filename_util.c'''
+FNAME_UTIL_SRC = '''lib/filename_util.c'''
PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
winbindd/winbindd_ndr.c
winbindd/wb_ping.c
winbindd/wb_lookupsid.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_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_allocate_uid.c
winbindd/winbindd_allocate_gid.c
winbindd/winbindd_getpwsid.c
winbindd/winbindd_pam_logoff.c
winbindd/winbindd_pam_chauthtok.c
winbindd/winbindd_pam_auth_crap.c
- winbindd/winbindd_pam_chng_pswd_auth_crap.c
- auth/auth_util.c
- auth/user_util.c
- auth/check_samsec.c
- auth/server_info.c
- auth/server_info_sam.c
- auth/user_info.c
- auth/user_util.c
- lib/wb_reqtrans.c'''
+ winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
${TDB_VALIDATE_SRC}'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
-SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c'''
+SMBD_SRC_MAIN = '''smbd/server.c smbd/server_exit.c smbd/msg_idmap.c'''
BUILDOPT_SRC = '''smbd/build_options.c'''
smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
smbd/posix_acls.c lib/sysacls.c
smbd/process.c smbd/service.c smbd/error.c
- printing/printspoolss.c
+ printing/printspoolss.c printing/spoolssd.c
lib/sysquotas.c lib/sysquotas_linux.c
lib/sysquotas_xfs.c lib/sysquotas_4A.c
lib/sysquotas_nfs.c
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
-PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c'
-
LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
libsmb/libsmb_thread_posix.c'''
NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
utils/net_rpc_join.c utils/net_time.c utils/net_lookup.c
- utils/net_cache.c utils/net_groupmap.c utils/net_idmap.c
+ utils/net_cache.c utils/net_groupmap.c
+ utils/net_idmap.c utils/net_idmap_check.c
utils/net_status.c utils/net_rpc_printer.c utils/net_rpc_rights.c
utils/net_rpc_service.c utils/net_rpc_registry.c utils/net_usershare.c
utils/netlookup.c utils/net_sam.c utils/net_rpc_shell.c
utils/net_serverid.c
utils/net_eventlog.c
utils/net_printing.c
+ utils/net_rpc_trust.c
registry/reg_parse.c registry/reg_format.c
registry/reg_parse_internal.c registry/reg_import.c
lib/cbuf.c lib/srprs.c'''
torture/test_async_echo.c
torture/test_addrchange.c
torture/test_posix_append.c
+ torture/test_case_insensitive.c
+ torture/test_notify_online.c
torture/test_smbsock_any_connect.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
- torture/wbc_async.c
- lib/wb_reqtrans.c'''
+ torture/wbc_async.c'''
MASKTEST_SRC = '''torture/masktest.c'''
LOCKTEST_SRC = '''torture/locktest.c'''
-NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
-
PDBTEST_SRC = '''torture/pdbtest.c'''
VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c'''
NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
-NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
- libsmb/clikrb5.c libads/kerberos.c'''
-
+NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
VLP_SRC = '''printing/tests/vlp.c'''
LIBS='ICONV'
+if bld.env.toplevel_build:
+ config_h = "../include/config.h"
+else:
+ config_h = "include/config.h"
+
bld.SAMBA_GENERATOR('build_options',
- source='include/config.h script/mkbuildoptions-waf.awk',
+ source= config_h + ' script/mkbuildoptions-waf.awk',
target='smbd/build_options.c',
rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} < ${SRC[0].abspath(env)}')
t.env.SRCDIR = bld.path.abspath()
t.env.BUILDDIR = bld.path.abspath()
+if not bld.env.toplevel_build:
+ bld.SAMBA_GENERATOR('smbtorture4',
+ source='',
+ target='',
+ rule='cd ../; make -f Makefile-smbtorture4 bin/smbtorture4',
+ always=True)
bld.SETUP_BUILD_GROUPS()
-samba_version.load_version(bld.env)
+if not bld.env.toplevel_build:
+ # when using a toplevel build, these are already supplied
+ samba_version.load_version(bld.env)
+ bld.SAMBA_MKVERSION('include/version.h')
+ bld.RECURSE('../lib/replace')
+ bld.RECURSE('build')
+ bld.env.suffix3 = ''
-bld.SAMBA_MKVERSION('include/version.h')
-
-bld.RECURSE('../lib/replace')
-print "SBINDIR=%s" % bld.env.SBINDIR
-bld.RECURSE('build')
######################## SUBSYSTEMS #################################
-bld.SAMBA_SUBSYSTEM('winbind-client',
- source=WBCOMMON_SRC,
- deps='replace',
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR)
-
-bld.SAMBA_LIBRARY('netapi',
+bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
- PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
- LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
+ passdb SMBLDAP PARAM_WITHOUT_REG samba-util
+ LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
- INIT_NETLOGON INIT_SAMR''',
- public_headers='lib/netapi/netapi.h',
+ INIT_NETLOGON INIT_SAMR POPT_SAMBA3''',
+ public_headers='../source3/lib/netapi/netapi.h',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('smbclient',
+bld.SAMBA3_LIBRARY('libsmb/smbclient',
source=LIBSMBCLIENT_SRC,
- public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
- LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPC_NDR_SRVSVC''',
+ public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP
+ LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC POPT_SAMBA3''',
public_headers='include/libsmbclient.h',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('smbsharemodes',
+bld.SAMBA3_LIBRARY('smbsharemodes',
source=LIBSMBSHAREMODES_SRC,
public_deps='''talloc tdb''',
public_headers='include/smb_share_modes.h',
vnum='0',
vars=locals())
-bld.SAMBA_LIBRARY('nss_winbind',
- source='../nsswitch/winbind_nss_linux.c',
- deps='winbind-client',
- realname='libnss_winbind.so.2',
- vnum='2')
-
-bld.SAMBA_LIBRARY('nss_wins',
+bld.SAMBA3_LIBRARY('nss_wins',
source=WINBIND_WINS_NSS_SRC,
- deps='''winbind-client PARAM LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
+ deps='''winbind-client param LIBSMB LIB_NONSMBD LIBTSOCKET KRBCLIENT
cap wbclient''',
realname='libnss_wins.so.2',
vnum='2')
-if bld.CONFIG_SET('WITH_PAM_MODULES'):
- bld.SAMBA_LIBRARY('pamwinbind',
- source=PAM_WINBIND_SRC,
- deps='intl talloc wbclient winbind-client LIBINIPARSER pam',
- cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
- realname='pam_winbind.so')
-
-if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
- bld.SAMBA_LIBRARY('winbind_krb5_locator',
- source='../nsswitch/winbind_krb5_locator.c',
- deps='wbclient krb5',
- realname='winbind_krb5_locator.so')
-
-bld.SAMBA_SUBSYSTEM('LIBMSRPC',
+bld.SAMBA3_SUBSYSTEM('msrpc3',
source='${LIBMSRPC_SRC}',
deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
- RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH
- LIBTSOCKET''',
+ RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH
+ LIBTSOCKET KRB5_WRAP rpccommon''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
+bld.SAMBA3_SUBSYSTEM('LIBMSRPC_GEN',
source='',
deps='''ndr-standard NDR_DSSETUP NDR_SPOOLSS''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBGPO',
+bld.SAMBA3_SUBSYSTEM('LIBGPO',
source='${LIBGPO_SRC}',
deps='gpext',
vars=locals())
-bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
- source='../lib/util/asn1.c',
- deps='talloc',
- local_include=False)
-
-bld.SAMBA_SUBSYSTEM('AVAHI',
+bld.SAMBA3_SUBSYSTEM('AVAHI',
source=AVAHI_SRC,
deps='avahi-common avahi-client',
enabled=bld.env.with_avahi)
-bld.SAMBA_SUBSYSTEM('GROUPDB',
+bld.SAMBA3_SUBSYSTEM('GROUPDB',
source=GROUPDB_SRC)
-bld.SAMBA_SUBSYSTEM('TLDAP',
+bld.SAMBA3_SUBSYSTEM('TLDAP',
source=TLDAP_SRC,
- deps='ASN1_UTIL LIBTSOCKET')
+ deps='asn1util LIBTSOCKET')
-bld.SAMBA_SUBSYSTEM('PASSDB',
- source=PASSDB_SRC,
- deps='''GROUPDB SECRETS SMBLDAP pdb''',
- vars=locals())
+bld.SAMBA3_LIBRARY('passdb',
+ source=PASSDB_SRC,
+ deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH flag_mapping',
+ private_library=True,
+ vars=locals())
-bld.SAMBA_SUBSYSTEM('PARAM_UTIL',
+bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
source=PARAM_UTIL_SRC)
-bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
+bld.SAMBA3_SUBSYSTEM('PARAM_WITHOUT_REG',
source=PARAM_WITHOUT_REG_SRC,
deps='''PARAM_UTIL''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PARAM',
- source='',
- deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF',
- vars=locals())
+bld.SAMBA3_LIBRARY('param',
+ source='',
+ deps='PARAM_WITHOUT_REG samba-util LIB_SMBCONF',
+ private_library=True,
+ vars=locals())
-bld.SAMBA_SUBSYSTEM('REGFIO',
+bld.SAMBA3_SUBSYSTEM('REGFIO',
source=REGFIO_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_API_REGF',
+bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
source=REG_API_REGF_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_BASE',
+bld.SAMBA3_SUBSYSTEM('REG_BASE',
source=REG_BASE_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
+bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
source=REG_SMBCONF_SRC,
deps='REG_BASE',
vars=locals())
-bld.SAMBA_SUBSYSTEM('REG_FULL',
+bld.SAMBA3_SUBSYSTEM('REG_FULL',
source=REG_FULL_SRC,
deps='REG_SMBCONF',
vars=locals())
-bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
- source=POPT_LIB_SRC,
- vars=locals())
+bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3',
+ source=POPT_LIB_SRC,
+ deps='popt',
+ vars=locals())
-bld.SAMBA_SUBSYSTEM('KRBCLIENT',
+bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,
- deps='krb5 k5crypto com_err gssapi gssapi_krb5',
+ public_deps='KRB5_WRAP k5crypto',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBS',
- source=LIB_SRC,
- deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB SAMBA_VERSION',
- vars=locals())
+bld.SAMBA3_LIBRARY('samba3core',
+ source=LIB_SRC,
+ deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg passdb PTHREADPOOL',
+ private_library=True,
+ vars=locals())
-bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
+bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',
source=LIB_NONSMBD_SRC,
- deps='LIBS',
+ deps='samba3core',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
- source=LIBSMB_ERR_SRC,
- deps='errors SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
+bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
+ source='',
+ deps='errors3 passdb ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSAMBA',
- source=LIBSAMBA_SRC,
- deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
+bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
+ source=LIBNTLMSSP_SRC,
+ deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSMB',
+bld.SAMBA3_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET',
+ deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBDRSUAPI',
+bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
source=DRSUAPI_SRC,
deps='z LZXPRESS NDR_DRSUAPI NDR_DRSBLOBS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('CLDAP',
- source=CLDAP_SRC,
- deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET',
+bld.SAMBA3_SUBSYSTEM('CLDAP',
+ source='libads/cldap.c',
+ deps='cli-ldap-common LIBCLI_CLDAP LIBTSOCKET',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SECRETS',
+bld.SAMBA3_SUBSYSTEM('SECRETS3',
source=SECRETS_SRC,
deps='NDR_SECRETS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SMBLDAP',
+bld.SAMBA3_SUBSYSTEM('SMBLDAP',
source=SMBLDAP_SRC,
deps='ldap lber',
vars=locals(),
enabled=bld.env.HAVE_LDAP)
-bld.SAMBA_SUBSYSTEM('LIBADS',
- source=LIBADS_SRC,
- deps='LIBCLI_LDAP_NDR',
- vars=locals())
+bld.SAMBA3_LIBRARY('ads',
+ source=LIBADS_SRC,
+ deps='cli-ldap-common KRB5_WRAP ldap lber',
+ private_library=True,
+ vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
+bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
- deps='ndr-krb5pac',
+ deps='ndr-krb5pac KRB5_WRAP',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
+bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
source=LIBADS_PRINTER_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBAFS',
+bld.SAMBA3_SUBSYSTEM('LIBAFS',
source=AFS_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBAFS_SETTOKEN',
+bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
source=AFS_SETTOKEN_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIB_SMBCONF',
+bld.SAMBA3_SUBSYSTEM('LIB_SMBCONF',
source=LIB_SMBCONF_SRC,
deps='LIBSMBCONF REG_BASE REG_SMBCONF',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SMBD_BASE',
+bld.SAMBA3_LIBRARY('smbd_base',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
- DYNCONFIG wbclient crypt nsl cups cap resolv z PASSDB
- PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
- LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
+ samba-util wbclient crypt nsl cups cap z passdb
+ PARAM_WITHOUT_REG samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI
+ LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
- PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
+ PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO
LIB_SMBCONF REG_FULL FNAME_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
- RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR
LIBCLI_SMB_COMMON RPC_SERVER
''',
+ private_library=True,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LOCKING',
+bld.SAMBA3_SUBSYSTEM('LOCKING',
source='${LOCKING_SRC}',
deps='''tdb talloc''',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PROFILE',
+bld.SAMBA3_SUBSYSTEM('PROFILE',
source='${PROFILE_SRC}',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PRINTBASE',
+bld.SAMBA3_SUBSYSTEM('PRINTBASE',
source=PRINTBASE_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('PRINTBACKEND',
+bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
source=PRINTBACKEND_SRC,
deps='PRINTBASE NDR_NTPRINTING LIBADS_PRINTER',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PRINTING',
+bld.SAMBA3_SUBSYSTEM('PRINTING',
source=PRINTING_SRC,
+ deps='NDR_PRINTCAP',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
+bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
source=PASSWD_UTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
+bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
source=FNAME_UTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('UTIL_TDB',
- source='../lib/util/util_tdb.c',
- local_include=False,
- public_deps='tdb talloc'
- )
-
-bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
- source='../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c ../lib/util/tevent_werror.c',
- local_include=False,
- public_deps='tevent',
- public_headers='../lib/util/tevent_ntstatus.h ../lib/util/tevent_unix.h ../lib/util/tevent_werror.h',
- header_path=[ ('*', 'util') ],
- )
-
-bld.SAMBA_SUBSYSTEM('LIBNET',
+bld.SAMBA3_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
- deps='NDR_LIBNET_JOIN',
+ deps='NDR_LIBNET_JOIN KRB5_WRAP',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNET_DSSYNC',
+bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
source=LIBNET_DSSYNC_SRC,
deps='LIBNET LIBCLI_DRSUAPI',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNET_SAMSYNC',
+bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
source=LIBNET_SAMSYNC_SRC,
deps='LIBNET LIBCLI_SAMSYNC',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBEVENTLOG',
+bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
source=LIB_EVENTLOG_SRC,
deps='NDR_EVENTLOG',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNMB',
- source=LIBNMB_SRC,
- vars=locals())
+bld.SAMBA3_SUBSYSTEM('LIBNMB',
+ source=LIBNMB_SRC,
+ deps='lmhosts resolv',
+ vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBNBT',
+bld.SAMBA3_SUBSYSTEM('LIBNBT',
source='',
deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SERVICES',
+bld.SAMBA3_SUBSYSTEM('SERVICES',
source=SERVICES_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
+bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
source=PLAINTEXT_AUTH_SRC,
deps='pam PAM_ERRORS',
vars=locals())
-bld.SAMBA_SUBSYSTEM('PASSCHANGE',
+bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
source=PASSCHANGE_SRC,
deps='LIBCLI_SAMR',
vars=locals())
-bld.SAMBA_SUBSYSTEM('SAMBA_VERSION',
+bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
source=VERSION_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('SLCACHE',
+bld.SAMBA3_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
- source='../libcli/auth/spnego_parse.c',
- vars=locals())
-
-bld.SAMBA_SUBSYSTEM('DCUTIL',
+bld.SAMBA3_SUBSYSTEM('DCUTIL',
source=DCUTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('ndr-util',
+bld.SAMBA3_SUBSYSTEM('ndr-util',
source=LIBNDR_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('tdb-wrap',
+bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('CHARSET',
- source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/iconv.c''',
- public_deps='iconv',
- deps='DYNCONFIG')
-
-bld.SAMBA_SUBSYSTEM('samba-util',
- source=UTIL_SRC,
- deps='talloc CHARSET LIBCRYPTO',
- vars=locals())
-#FIXME
-bld.SAMBA_SUBSYSTEM('ndr-standard',
- source='',
- deps='''
- NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
- NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
- NDR_ECHO security NDR_DNS
- ''',
- vars=locals())
-
-#FIXME
-bld.SAMBA_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
+bld.SAMBA3_SUBSYSTEM('CHARSET3',
+ source='''lib/util_str.c lib/charcnv.c lib/fstring.c''',
+ public_deps='ICONV_WRAPPER CHARSET',
+ deps='samba-util')
-bld.SAMBA_SUBSYSTEM('ldb',
+bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c')
-bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
- source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
- deps='ndr',
- vars=locals())
-
-bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
- source='../librpc/gen_ndr/ndr_dcerpc.c',
- vars=locals())
-
-bld.SAMBA_SUBSYSTEM('errors',
- source='../libcli/util/doserr.c libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c')
+bld.SAMBA3_SUBSYSTEM('errors3',
+ source='libsmb/nterr.c libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
+ deps='LIBCLI_ERRORS')
-bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
- source='../libcli/nbt/nbtname.c',
- deps='talloc',
- autoproto='nbtname.h')
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
deps='RPC_NDR_SAMR')
-bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_LSA3',
source=LIBCLI_LSA_SRC,
deps='RPC_NDR_LSA INIT_LSA')
-bld.SAMBA_SUBSYSTEM('LIBRPCCLI_NETLOGON',
+bld.SAMBA3_SUBSYSTEM('LIBRPCCLI_NETLOGON',
source=LIBRPCCLI_NETLOGON_SRC,
deps='RPC_NDR_NETLOGON')
-bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_SPOOLSS',
source=LIBCLI_SPOOLSS_SRC,
deps='RPC_NDR_SPOOLSS')
-bld.SAMBA_SUBSYSTEM('LIBCLI_WINREG',
+bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
source=LIBCLI_WINREG_SRC,
deps='RPC_NDR_WINREG')
-bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
+bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('INIT_LSA',
+bld.SAMBA3_SUBSYSTEM('INIT_LSA',
source='rpc_client/init_lsa.c')
-bld.SAMBA_SUBSYSTEM('INIT_NETLOGON',
+bld.SAMBA3_SUBSYSTEM('INIT_NETLOGON',
source='rpc_client/init_netlogon.c')
-bld.SAMBA_SUBSYSTEM('INIT_SAMR',
+bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
source='rpc_client/init_samr.c')
########################## BINARIES #################################
-bld.SAMBA_BINARY('smbd/smbd',
+bld.SAMBA3_BINARY('smbd/smbd',
source='${SMBD_SRC_MAIN}',
- deps='''SMBD_BASE''',
+ deps='smbd_base EPMD',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('nmbd/nmbd',
+bld.SAMBA3_BINARY('nmbd/nmbd',
source=NMBD_SRC,
- deps='''talloc tdb tevent z cap resolv wbclient dl
- PASSDB PARAM ldap LIB_NONSMBD LIBSMB
- POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
+ deps='''talloc tdb tevent z cap wbclient dl
+ passdb param ldap LIB_NONSMBD LIBSMB
+ POPT_SAMBA3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''',
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('winbindd/winbindd',
+bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb tevent cap dl z
- wbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
- POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
- SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS
+ wbclient passdb ldap param LIB_NONSMBD LIBSMB
+ POPT_SAMBA3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER
+ SRV_NDR_WBINT RPC_NDR_WBINT NDR_WBINT LIBAFS
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
- RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
+ RPC_NDR_DSSETUP npa_tstream INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
- PAM_ERRORS
+ PAM_ERRORS WB_REQTRANS AUTH_COMMON
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('web/swat',
+bld.SAMBA3_BINARY('web/swat',
source=SWAT_SRC,
- deps='''talloc tevent cap LIBS LIBSMB wbclient PARAM
- LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups
- LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
+ deps='''talloc tevent cap samba3core LIBSMB wbclient param
+ LIB_NONSMBD passdb POPT_SAMBA3 KRBCLIENT cups
+ LIBMSRPC_GEN msrpc3 LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
-bld.SAMBA_BINARY('rpcclient/rpcclient',
+bld.SAMBA3_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
- deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
- PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
- LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
+ deps='''talloc tdb cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD
+ PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3
+ ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON
INIT_SAMR
''',
vars=locals())
-bld.SAMBA_BINARY('client/smbclient',
+bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
source=CLIENT_SRC,
- deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
- PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN
- LIBMSRPC SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA''',
+ deps='''talloc tdb cap POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD
+ PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN
+ msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA
+ LIBCLI_SMB_COMMON''',
vars=locals())
-bld.SAMBA_BINARY('net',
+bld.SAMBA3_BINARY('net',
source=NET_SRC,
- deps='''talloc tdb netapi addns cap resolv intl POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
- PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
- LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
+ deps='''talloc tdb netapi addns cap intl POPT_SAMBA3 passdb LIBSMB LIB_NONSMBD
+ PARAM_WITHOUT_REG wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER
+ LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
REGFIO NDR_NTPRINTING RPC_NDR_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP
RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR
''',
vars=locals())
-bld.SAMBA_BINARY('profiles',
+bld.SAMBA3_BINARY('profiles',
source=PROFILES_SRC,
- deps='''talloc tdb cap tevent POPT_SAMBA PARAM LIBS LIBSMB_ERR LIB_NONSMBD REGFIO''',
+ deps='''talloc tdb cap tevent POPT_SAMBA3 param samba3core LIBSMB_ERR LIB_NONSMBD REGFIO''',
vars=locals())
-bld.SAMBA_BINARY('smbspool',
+bld.SAMBA3_BINARY('smbspool',
source=CUPS_SRC,
- deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS
- KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+ deps='''talloc tdb tevent cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core
+ KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('testparm',
+bld.SAMBA3_BINARY('testparm',
source=TESTPARM_SRC,
deps='''talloc tevent ldap cap
- wbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
- LIBSMB_ERR POPT_SAMBA''',
+ wbclient asn1util LIBTSOCKET passdb param LIB_NONSMBD
+ LIBSMB_ERR POPT_SAMBA3''',
vars=locals())
-bld.SAMBA_BINARY('smbta-util',
+bld.SAMBA3_BINARY('smbta-util',
source=SMBTA_UTIL_SRC,
- deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
+ deps='''talloc tdb tevent cap param POPT_SAMBA3 LIB_NONSMBD
LIBSMB_ERR''',
vars=locals())
-bld.SAMBA_BINARY('smbstatus',
+bld.SAMBA3_BINARY('smbstatus',
source=STATUS_SRC,
- deps='''talloc tdb tevent cap PARAM POPT_SAMBA LIB_NONSMBD
+ deps='''talloc tdb tevent cap param POPT_SAMBA3 LIB_NONSMBD
LIBSMB_ERR LOCKING PROFILE FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('smbcontrol',
+bld.SAMBA3_BINARY('smbcontrol',
source=SMBCONTROL_SRC,
- deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA PRINTBASE''',
+ deps='''talloc tdb tevent cap param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3 PRINTBASE''',
vars=locals())
-bld.SAMBA_BINARY('smbtree',
+bld.SAMBA3_BINARY('smbtree',
source=SMBTREE_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
- LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PROFILE
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD
+ LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE
RPC_NDR_SRVSVC''',
vars=locals())
-bld.SAMBA_BINARY('smbpasswd',
+bld.SAMBA3_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
- LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD
+ LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
vars=locals())
-bld.SAMBA_BINARY('pdbedit',
+bld.SAMBA3_BINARY('pdbedit',
source=PDBEDIT_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD
- LIBSAMBA LIBSMB_ERR POPT_SAMBA PASSDB SMBLDAP GROUPDB
- PASSWD_UTIL LIBCLI_LDAP_NDR''',
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD
+ LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP
+ PASSWD_UTIL cli-ldap-common''',
vars=locals())
-bld.SAMBA_BINARY('smbget',
+bld.SAMBA3_BINARY('smbget',
source=SMBGET_SRC,
- deps='''talloc tdb smbclient POPT_SAMBA''',
+ deps='''talloc tdb libsmb/smbclient POPT_SAMBA3''',
vars=locals())
-bld.SAMBA_BINARY('nmblookup',
+bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
source=NMBLOOKUP_SRC,
- deps='''talloc tdb tevent cap resolv PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR LIBNMB''',
+ deps='''talloc tdb tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR LIBNMB''',
vars=locals())
-bld.SAMBA_BINARY('smbtorture',
+bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source=SMBTORTURE_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM LIBSMB KRBCLIENT TLDAP
- LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''',
+ deps='''talloc tdb tevent cap wbclient param LIBSMB KRBCLIENT TLDAP
+ LIB_NONSMBD POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
vars=locals())
-bld.SAMBA_BINARY('smbconftort',
+bld.SAMBA3_BINARY('smbconftort',
source=SMBCONFTORT_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''',
vars=locals())
-bld.SAMBA_BINARY('masktest',
+bld.SAMBA3_BINARY('replacetort',
+ source='../lib/replace/test/main.c',
+ deps='replace replace-test',
+ install=False)
+
+bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
source=MASKTEST_SRC,
- deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+ deps='''talloc tdb cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
+ asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('msgtest',
+bld.SAMBA3_BINARY('msgtest',
source=MSGTEST_SRC,
- deps='''talloc tdb tevent cap resolv PARAM LIBSMB_ERR LIB_NONSMBD''',
+ deps='''talloc tdb tevent cap param LIBSMB_ERR LIB_NONSMBD''',
vars=locals())
-bld.SAMBA_BINARY('smbcacls',
+bld.SAMBA3_BINARY('smbcacls',
source=SMBCACLS_SRC,
- deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT
- LIB_NONSMBD PASSDB GROUPDB POPT_SAMBA SMBLDAP LIBMSRPC_GEN
- LIBMSRPC LIBCLI_LSA''',
+ deps='''talloc tdb cap wbclient param LIBSMB KRBCLIENT
+ LIB_NONSMBD passdb POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN
+ msrpc3 LIBCLI_LSA3''',
vars=locals())
-bld.SAMBA_BINARY('smbcquotas',
+bld.SAMBA3_BINARY('smbcquotas',
source=SMBCQUOTAS_SRC,
- deps='''talloc tdb cap resolv wbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT
- POPT_SAMBA PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC
- LIBCLI_LSA''',
+ deps='''talloc tdb cap wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
+ POPT_SAMBA3 passdb SMBLDAP LIBMSRPC_GEN msrpc3
+ LIBCLI_LSA3''',
vars=locals())
-bld.SAMBA_BINARY('eventlogadm',
+bld.SAMBA3_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
- deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
- LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG''',
+ deps='''talloc tevent cap POPT_SAMBA3 samba3core param
+ LIB_NONSMBD LIBSMB_ERR passdb wbclient LIBEVENTLOG''',
vars=locals())
-bld.SAMBA_BINARY('sharesec',
+bld.SAMBA3_BINARY('sharesec',
source=SHARESEC_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM LIB_NONSMBD LIBSMB_ERR POPT_SAMBA''',
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD LIBSMB_ERR POPT_SAMBA3''',
vars=locals())
-bld.SAMBA_BINARY('locktest',
+bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
source=LOCKTEST_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
- vars=locals())
-
-bld.SAMBA_BINARY('nsstest',
- source=NSSTEST_SRC,
- deps='dl',
+ deps='''talloc tdb tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
+ asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('pdbtest',
+bld.SAMBA3_BINARY('pdbtest',
source=PDBTEST_SRC,
- deps='''talloc tdb cap resolv wbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB
- SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSA''',
+ deps='''talloc tdb cap wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb
+ SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('vfstest',
+bld.SAMBA3_BINARY('vfstest',
source=VFSTEST_SRC,
- deps='''SMBD_BASE SMBREADLINE''',
+ deps='smbd_base SMBREADLINE',
vars=locals())
-bld.SAMBA_BINARY('smbiconv',
+bld.SAMBA3_BINARY('smbiconv',
source=SMBICONV_SRC,
- deps='''talloc tdb tevent cap PARAM LIB_NONSMBD POPT_SAMBA LIBSMB_ERR''',
+ deps='''talloc tdb tevent cap param LIB_NONSMBD POPT_SAMBA3 LIBSMB_ERR''',
vars=locals())
-bld.SAMBA_BINARY('log2pcap',
+bld.SAMBA3_BINARY('log2pcap',
source=LOG2PCAP_SRC,
deps='''talloc popt''',
vars=locals())
-bld.SAMBA_BINARY('locktest2',
+bld.SAMBA3_BINARY('locktest2',
source=LOCKTEST2_SRC,
- deps='''talloc tdb tevent cap resolv wbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+ deps='''talloc tdb tevent cap wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
+ asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
-bld.SAMBA_BINARY('debug2html',
+bld.SAMBA3_BINARY('debug2html',
source=DEBUG2HTML_SRC,
deps='''talloc popt''',
vars=locals())
-bld.SAMBA_BINARY('smbfilter',
+bld.SAMBA3_BINARY('smbfilter',
source=SMBFILTER_SRC,
- deps='''talloc tevent cap resolv wbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
+ deps='''talloc tevent cap wbclient param LIBSMB LIB_NONSMBD KRBCLIENT asn1util LIBTSOCKET
NDR_SAMR NDR_LSA''',
vars=locals())
-bld.SAMBA_BINARY('versiontest',
+bld.SAMBA3_BINARY('versiontest',
source='lib/version_test.c',
deps='SAMBA_VERSION',
vars=locals())
-bld.SAMBA_BINARY('wbinfo',
+bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
- ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
- LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
+ asn1util LIBTSOCKET passdb ldap param LIB_NONSMBD
+ LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''',
vars=locals())
-bld.SAMBA_BINARY('ntlm_auth',
+bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
- deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient PARAM LIB_NONSMBD
- LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
- PASSDB GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
- NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
+ deps='''tdb talloc cap KRB5_WRAP k5crypto wbclient param LIB_NONSMBD
+ samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET
+ passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
+ NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())
-bld.SAMBA_BINARY('timelimit',
+bld.SAMBA3_BINARY('timelimit',
source='script/tests/timelimit.c',
vars=locals())
-bld.SAMBA_BINARY('rpc_open_tcp',
+bld.SAMBA3_BINARY('rpc_open_tcp',
source=RPC_OPEN_TCP_SRC,
- deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT PARAM LIBS LIBSMB LIB_NONSMBD
- LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN LIBMSRPC''',
+ deps='''talloc tdb tevent cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD
+ LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''',
vars=locals())
-bld.SAMBA_BINARY('test_lp_load',
+bld.SAMBA3_BINARY('test_lp_load',
source=TEST_LP_LOAD_SRC,
- deps='''talloc tdb tevent cap wbclient PARAM LIB_NONSMBD POPT_SAMBA LIBSAMBA''',
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''',
vars=locals())
-bld.SAMBA_BINARY('dbwrap_tool',
+bld.SAMBA3_BINARY('dbwrap_tool',
source=DBWRAP_TOOL_SRC,
- deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR''',
+ deps='''talloc tdb tevent cap param LIB_NONSMBD LIBSMB_ERR''',
vars=locals())
-bld.SAMBA_BINARY('dbwrap_torture',
+bld.SAMBA3_BINARY('dbwrap_torture',
source=DBWRAP_TORTURE_SRC,
- deps='''talloc tdb tevent cap PARAM LIB_NONSMBD LIBSMB_ERR
- POPT_SAMBA''',
+ deps='''talloc tdb tevent cap param LIB_NONSMBD LIBSMB_ERR
+ POPT_SAMBA3''',
vars=locals())
-bld.SAMBA_BINARY('split_tokens',
+bld.SAMBA3_BINARY('split_tokens',
source=SPLIT_TOKENS_SRC,
- deps='''talloc tdb tevent cap wbclient PARAM LIB_NONSMBD POPT_SAMBA
- LIBSAMBA''',
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3
+ LIBNTLMSSP''',
vars=locals())
-bld.SAMBA_BINARY('vlp',
+bld.SAMBA3_BINARY('vlp',
source=VLP_SRC,
deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
vars=locals())
-swat_files=recursive_dirlist('../swat', '../swat', '*')
+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')
+# additional compatibility rules.
+# these rules allow us to have a common set of waf rules for toplevel and source3
+# builds. Effectively these are build rule aliases
+
+if not bld.env.toplevel_build:
+ bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
+ bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
+ bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
+ bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='DYNCONFIG')
+ bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
+ bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
+ bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
+
+
########################## INCLUDES #################################
+bld.RECURSE('../lib/util/charset')
bld.RECURSE('../auth')
+bld.RECURSE('../auth/kerberos')
bld.RECURSE('../lib/addns')
bld.RECURSE('../lib/async_req')
bld.RECURSE('../libcli/auth')
bld.RECURSE('../libcli/drsuapi')
bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../libcli/cldap')
bld.RECURSE('../libcli/named_pipe_auth')
bld.RECURSE('../libcli/netlogon')
bld.RECURSE('../libcli/samsync')
bld.RECURSE('../libcli/security')
bld.RECURSE('../libcli/smb')
+bld.RECURSE('../libcli/util')
bld.RECURSE('../libcli/smbreadline')
+bld.RECURSE('../libcli/nbt')
+bld.RECURSE('../libcli/registry')
bld.RECURSE('../lib/crypto')
bld.RECURSE('../lib/iniparser/src')
bld.RECURSE('../lib/nss_wrapper')
bld.RECURSE('../librpc')
bld.RECURSE('../lib/smbconf')
bld.RECURSE('../lib/socket_wrapper')
+bld.RECURSE('../lib/uid_wrapper')
bld.RECURSE('../lib/talloc')
bld.RECURSE('../lib/tdb')
+bld.RECURSE('../lib/util')
bld.RECURSE('../lib/tevent')
bld.RECURSE('../lib/tsocket')
bld.RECURSE('../lib/zlib')
+bld.RECURSE('../libds/common')
+bld.RECURSE('../nsswitch')
bld.RECURSE('../nsswitch/libwbclient')
bld.RECURSE('auth')
bld.RECURSE('libgpo/gpext')
+bld.RECURSE('lib/pthreadpool')
bld.RECURSE('librpc')
bld.RECURSE('librpc/idl')
bld.RECURSE('modules')
bld.RECURSE('rpc_server')
bld.RECURSE('winbindd')
+
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
+
+bld.SYMBOL_CHECK()
git.samba.org / samba.git / blobdiff