from samba_utils import *
import samba_version
-TDB_LIB_SRC = '''../lib/util/util_tdb.c
+TDB_LIB_SRC = '''
lib/dbwrap.c lib/dbwrap_tdb.c
lib/dbwrap_ctdb.c
lib/g_lock.c
DRSUAPI_SRC = '''${COMPRESSION_SRC}'''
-LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
- ../librpc/ndr/ndr.c
- ../librpc/ndr/ndr_misc.c
- ../librpc/gen_ndr/ndr_misc.c
- ../librpc/ndr/ndr_string.c
- ../librpc/ndr/uuid.c
- librpc/ndr/util.c'''
+LIBNDR_SRC = '''librpc/ndr/util.c'''
LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c'
+LIBRPCCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
+
+LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c
+ rpc_client/cli_winreg_int.c'''
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
lib/util_sconn.c
lib/serverid.c
lib/util_transfer_file.c
+ lib/addrchange.c
${TDB_LIB_SRC}
- ${VERSION_SRC} lib/debug.c lib/fault.c
+ lib/debug.c lib/fault.c
lib/interface.c lib/pidfile.c
lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
lib/ms_fnmatch.c lib/errmap_unix.c
lib/tallocmsg.c lib/dmallocmsg.c
libsmb/clisigning.c libsmb/smb_signing.c
- lib/pam_errors.c intl/lang_tdb.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}
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
passdb/machine_sid.c'''
-LIBNBT_SRC = '''../libcli/netlogon.c'''
-
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
libads/dns.c libads/sitename_cache.c'''
-NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
-DOSERR_SRC = '../libcli/util/doserr.c'
+NTERR_SRC = '''libsmb/smberr.c'''
ERRORMAP_SRC = 'libsmb/errormap.c'
DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-LIBSMB_ERR_SRC = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
+LIBSMB_ERR_SRC = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
LIBSMB_SRC0 = '''
libsmb/ntlmssp.c
LIBSAMBA_SRC = '${LIBSMB_SRC0}'
-LIBCLI_LDAP_MESSAGE_SRC = '''../libcli/ldap/ldap_message.c'''
-LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c lib/ldb_compat.c'''
-
CLDAP_SRC = '''libads/cldap.c
../libcli/cldap/cldap.c
../lib/util/idtree.c'''
libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
libsmb/clioplock.c libsmb/clirap2.c
- libsmb/smb_seal.c libsmb/async_smb.c'''
+ libsmb/smb_seal.c libsmb/async_smb.c
+ libsmb/cli_np_tstream.c
+ libsmb/smbsock_connect.c'''
LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
registry/reg_util_token.c
registry/reg_api_util.c'''
-REG_EVENTLOG_SRC = '''registry/reg_eventlog.c'''
-
REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
SERVICES_SRC = '''services/svc_spoolss.c
services/svc_rcinit.c
- services/services_db.c
+ services/svc_winreg_glue.c
services/svc_netlogon.c
services/svc_winreg.c
services/svc_wins.c'''
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
- rpc_server/rpc_handles.c'''
-
-RPC_SERVICE = '''rpc_server/rpc_server.c'''
-
-RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
- rpc_server/dcesrv_gssapi.c
- rpc_server/dcesrv_spnego.c'''
-
-RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
- ${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
-
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
-
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
auth/server_info_sam.c
auth/user_info.c
auth/user_util.c
- ../nsswitch/libwbclient/wb_reqtrans.c'''
+ lib/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${RPC_NCACN_NP}
- ${TDB_VALIDATE_SRC}
- ../librpc/gen_ndr/srv_lsa.c
- ../librpc/gen_ndr/srv_samr.c
- rpc_server/srv_pipe_register.c'''
+ ${TDB_VALIDATE_SRC}'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
${MANGLE_SRC}'''
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
- ${RPC_SERVER_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}'''
SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
web/swat.c web/neg_lang.c'''
-SWAT_SRC = '''${SWAT_SRC1}
- ${PASSCHANGE_SRC}'''
+SWAT_SRC = '''${SWAT_SRC1}'''
STATUS_SRC = '''utils/status.c utils/status_profile.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}'''
+SMBPASSWD_SRC = '''utils/smbpasswd.c'''
PDBEDIT_SRC = '''utils/pdbedit.c'''
CLIENT_SRC = '''${CLIENT_SRC1}'''
-LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
- ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c
- lib/smbconf/smbconf_init.c'''
+LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
+ libnet/libnet_dssync_passdb.c
libnet/libnet_dssync_keytab.c'''
LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
torture/denytest.c torture/mangle_test.c
torture/nbench.c
torture/test_async_echo.c
- torture/test_posix_append.c'''
+ torture/test_addrchange.c
+ torture/test_posix_append.c
+ torture/test_smbsock_any_connect.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
- ../nsswitch/libwbclient/wbc_async.c
- ../nsswitch/libwbclient/wb_reqtrans.c'''
+ torture/wbc_async.c
+ lib/wb_reqtrans.c'''
MASKTEST_SRC = '''torture/masktest.c'''
SMBFILTER_SRC = '''utils/smbfilter.c'''
-WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
- ${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC}'''
+WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
-WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
-
-WINBIND_KRB5_LOCATOR_SRC1 = '../nsswitch/winbind_krb5_locator.c'
-WINBIND_KRB5_LOCATOR_SRC = '''${WINBIND_KRB5_LOCATOR_SRC1} ${LIBREPLACE_SRC}'''
-
-POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c \
- ../lib/popt/popthelp.c ../lib/popt/poptparse.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'''
-VLP_SRC = '''printing/tests/vlp.c
- ../lib/util/util_tdb.c
- ${LIBSAMBAUTIL_SRC}'''
+VLP_SRC = '''printing/tests/vlp.c'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
bld.SAMBA_MKVERSION('include/version.h')
bld.RECURSE('../lib/replace')
-bld.RECURSE('../libcli/smbreadline')
print "SBINDIR=%s" % bld.env.SBINDIR
bld.RECURSE('build')
-bld.RECURSE('../librpc')
-bld.RECURSE('librpc/idl')
-bld.RECURSE('librpc')
-bld.RECURSE('../libcli/security')
-
######################## SUBSYSTEMS #################################
-bld.SAMBA_SUBSYSTEM('WBCOMMON',
- source=WBCOMMON_SRC)
-
-bld.SAMBA_LIBRARY('wbclient',
- source='''../nsswitch/libwbclient/wbc_guid.c
- ../nsswitch/libwbclient/wbc_idmap.c
- ../nsswitch/libwbclient/wbclient.c
- ../nsswitch/libwbclient/wbc_pam.c
- ../nsswitch/libwbclient/wbc_pwd.c
- ../nsswitch/libwbclient/wbc_sid.c
- ../nsswitch/libwbclient/wbc_util.c''',
- public_headers='../nsswitch/libwbclient/wbclient.h',
- private_library=True,
- public_deps='talloc WBCOMMON')
+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',
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
- RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
- RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN
+ RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
+ LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+ RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
INIT_NETLOGON INIT_SAMR''',
public_headers='lib/netapi/netapi.h',
- private_library=True,
+ vnum='0',
vars=locals())
bld.SAMBA_LIBRARY('smbclient',
source=LIBSMBCLIENT_SRC,
public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
- LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPCCLI_SRVSVC''',
+ LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPC_NDR_SRVSVC''',
public_headers='include/libsmbclient.h',
- private_library=True,
+ vnum='0',
vars=locals())
bld.SAMBA_LIBRARY('smbsharemodes',
source=LIBSMBSHAREMODES_SRC,
public_deps='''talloc tdb''',
public_headers='include/smb_share_modes.h',
- private_library=True,
+ vnum='0',
vars=locals())
bld.SAMBA_LIBRARY('nss_winbind',
source='../nsswitch/winbind_nss_linux.c',
- deps='WBCOMMON',
+ deps='winbind-client',
realname='libnss_winbind.so.2',
vnum='2')
+bld.SAMBA_LIBRARY('nss_wins',
+ source=WINBIND_WINS_NSS_SRC,
+ 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 WBCOMMON LIBINIPARSER pam',
+ 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',
source='${LIBMSRPC_SRC}',
- deps='''ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
- RPCCLI_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''',
+ deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
+ RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH''',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
deps='talloc',
local_include=False)
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
- source=LIBCLI_LDAP_MESSAGE_SRC)
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
- source=LIBCLI_LDAP_NDR_SRC)
-
bld.SAMBA_SUBSYSTEM('AVAHI',
source=AVAHI_SRC,
deps='avahi-common avahi-client',
bld.SAMBA_SUBSYSTEM('PARAM',
source='',
- deps='PARAM_WITHOUT_REG DYNCONFIG LIBSMBCONF',
+ deps='PARAM_WITHOUT_REG DYNCONFIG LIB_SMBCONF',
vars=locals())
bld.SAMBA_SUBSYSTEM('REGFIO',
bld.SAMBA_SUBSYSTEM('REG_FULL',
source=REG_FULL_SRC,
- deps='REG_SMBCONF REG_EVENTLOG',
- vars=locals())
-
-bld.SAMBA_SUBSYSTEM('REG_EVENTLOG',
- source=REG_EVENTLOG_SRC,
+ deps='REG_SMBCONF',
vars=locals())
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET',
+ 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.SAMBA_SUBSYSTEM('LIB_NONSMBD',
bld.SAMBA_SUBSYSTEM('LIBSMB_ERR',
source=LIBSMB_ERR_SRC,
- deps='SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
+ deps='errors SECRETS ldap lber MSRPC_PARSE LIBCLI_AUTH',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSAMBA',
source=AFS_SETTOKEN_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
- source=LIBSMBCONF_SRC,
- deps='REG_BASE REG_SMBCONF',
+bld.SAMBA_SUBSYSTEM('LIB_SMBCONF',
+ source=LIB_SMBCONF_SRC,
+ deps='LIBSMBCONF REG_BASE REG_SMBCONF',
vars=locals())
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
- LIBSMBCONF REG_FULL FNAME_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
- RPCCLI_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
- LIBCLI_SMB_COMMON
+ 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_SMB_COMMON RPC_SERVER
''',
vars=locals())
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('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBNBT',
- source=LIBNBT_SRC,
- deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NDR_NETLOGON',
+ source='',
+ deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NETLOGON LIBCLI_NDR_NETLOGON',
vars=locals())
bld.SAMBA_SUBSYSTEM('SERVICES',
bld.SAMBA_SUBSYSTEM('PLAINTEXT_AUTH',
source=PLAINTEXT_AUTH_SRC,
- deps='pam',
+ deps='pam PAM_ERRORS',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('PASSCHANGE',
+ source=PASSCHANGE_SRC,
+ deps='LIBCLI_SAMR',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('SAMBA_VERSION',
+ source=VERSION_SRC,
vars=locals())
bld.SAMBA_SUBSYSTEM('SLCACHE',
source=DCUTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('ndr',
+bld.SAMBA_SUBSYSTEM('ndr-util',
source=LIBNDR_SRC,
vars=locals())
#FIXME
bld.SAMBA_SUBSYSTEM('dcerpc', '')
-bld.SAMBA_SUBSYSTEM('LZXPRESS',
- deps='replace',
- source='../lib/compression/lzxpress.c')
+bld.SAMBA_SUBSYSTEM('ldb',
+ source='lib/ldb_compat.c')
bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''',
deps='talloc',
autoproto='nbtname.h')
-bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
- source='../libcli/ndr_netlogon.c',
- public_deps='ndr NDR_SECURITY')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
- source='../librpc/gen_ndr/cli_winreg.c',
- public_deps='RPC_NDR_WINREG')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
- source='../librpc/gen_ndr/cli_echo.c',
- public_deps='RPC_NDR_ECHO')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SAMR',
- source='../librpc/gen_ndr/cli_samr.c',
- public_deps='RPC_NDR_SAMR')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_LSA',
- source='../librpc/gen_ndr/cli_lsa.c',
- public_deps='RPC_NDR_LSA')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_NETLOGON',
- source='../librpc/gen_ndr/cli_netlogon.c',
- public_deps='RPC_NDR_NETLOGON')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SRVSVC',
- source='../librpc/gen_ndr/cli_srvsvc.c',
- public_deps='RPC_NDR_SRVSVC')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_INITSHUTDOWN',
- source='../librpc/gen_ndr/cli_initshutdown.c',
- public_deps='RPC_NDR_INITSHUTDOWN')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_WKSSVC',
- source='../librpc/gen_ndr/cli_wkssvc.c',
- public_deps='RPC_NDR_WKSSVC')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
- source='../librpc/gen_ndr/cli_svcctl.c',
- public_deps='RPC_NDR_SVCCTL')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP',
- source='../librpc/gen_ndr/cli_dssetup.c',
- public_deps='RPC_NDR_DSSETUP')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DFS',
- source='../librpc/gen_ndr/cli_dfs.c',
- public_deps='RPC_NDR_DFS')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_DRSUAPI',
- source='../librpc/gen_ndr/cli_drsuapi.c',
- public_deps='RPC_NDR_DRSUAPI')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_NTSVCS',
- source='../librpc/gen_ndr/cli_ntsvcs.c',
- public_deps='RPC_NDR_NTSVCS')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_EVENTLOG',
- source='../librpc/gen_ndr/cli_eventlog.c',
- public_deps='RPC_NDR_EVENTLOG')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_EPMAPPER',
- source='../librpc/gen_ndr/cli_epmapper.c',
- public_deps='RPC_NDR_EPMAPPER')
-
-bld.SAMBA_SUBSYSTEM('RPCCLI_SPOOLSS',
- source='../librpc/gen_ndr/cli_spoolss.c',
- public_deps='RPC_NDR_SPOOLSS')
-
bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
- deps='RPCCLI_SAMR')
+ deps='RPC_NDR_SAMR')
bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
source=LIBCLI_LSA_SRC,
- deps='RPCCLI_LSA INIT_LSA')
+ deps='RPC_NDR_LSA INIT_LSA')
-bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
- source=LIBCLI_NETLOGON_SRC,
- deps='RPCCLI_NETLOGON')
+bld.SAMBA_SUBSYSTEM('LIBRPCCLI_NETLOGON',
+ source=LIBRPCCLI_NETLOGON_SRC,
+ deps='RPC_NDR_NETLOGON')
bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
source=LIBCLI_SPOOLSS_SRC,
- deps='RPCCLI_SPOOLSS')
+ deps='RPC_NDR_SPOOLSS')
+
+bld.SAMBA_SUBSYSTEM('LIBCLI_WINREG',
+ source=LIBCLI_WINREG_SRC,
+ deps='RPC_NDR_WINREG')
bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_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 RPCCLI_NDR_WBINT LIBAFS
+ SRV_NDR_WBINT RPC_NDR_WBINT LIBAFS
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
- RPCCLI_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
- RPC_SAMR RPC_LSARPC
+ LIBCLI_SAMR LIBCLI_LSA LIBRPCCLI_NETLOGON
+ RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
+ RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
+ PAM_ERRORS
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
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
- LIBCLI_SAMR INIT_LSA''',
+ LIBCLI_SAMR INIT_LSA PASSCHANGE''',
enabled=bld.env.build_swat,
install_path='${SBINDIR}',
vars=locals())
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 RPCCLI_WINREG RPCCLI_ECHO
+ LIBADS SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
- RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
- RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA 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())
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 RPCCLI_SRVSVC INIT_LSA''',
+ LIBMSRPC SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA''',
vars=locals())
bld.SAMBA_BINARY('net',
PARAM_WITHOUT_REG wbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBGPO LIBADS LIBADS_SERVER LIBADS_PRINTER
LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
- REGFIO NDR_NTPRINTING RPCCLI_WINREG
+ REGFIO NDR_NTPRINTING RPC_NDR_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
- RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
- RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR
+ LIBCLI_SAMR LIBCLI_LSA 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())
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
- RPCCLI_SRVSVC''',
+ RPC_NDR_SRVSVC''',
vars=locals())
bld.SAMBA_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
- LIBCLI_SAMR INIT_LSA''',
+ LIBCLI_SAMR INIT_LSA PASSCHANGE''',
vars=locals())
bld.SAMBA_BINARY('pdbedit',
bld.SAMBA_BINARY('smbtorture',
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 RPCCLI_ECHO''',
+ LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPC_NDR_ECHO''',
vars=locals())
bld.SAMBA_BINARY('smbconftort',
bld.SAMBA_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
deps='''talloc tevent cap POPT_SAMBA LIBS PARAM
- LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG REG_EVENTLOG''',
+ LIB_NONSMBD LIBSMB_ERR PASSDB wbclient LIBEVENTLOG''',
vars=locals())
bld.SAMBA_BINARY('sharesec',
vars=locals())
bld.SAMBA_BINARY('versiontest',
- source='lib/version_test.c ${VERSION_SRC}',
+ source='lib/version_test.c',
+ deps='SAMBA_VERSION',
vars=locals())
bld.SAMBA_BINARY('wbinfo',
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 WBCOMMON LIBINIPARSER LIBADS_SERVER
+ PASSDB GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE''',
vars=locals())
bld.SAMBA_BINARY('vlp',
source=VLP_SRC,
- deps='''talloc tdb PARAM_UTIL''',
+ deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
vars=locals())
swat_files=recursive_dirlist('../swat', '../swat', '*')
########################## INCLUDES #################################
-bld.RECURSE('../lib/socket_wrapper')
-bld.RECURSE('../lib/talloc')
-bld.RECURSE('../lib/tdb')
-bld.RECURSE('../lib/nss_wrapper')
-bld.RECURSE('../lib/tevent')
-bld.RECURSE('../lib/popt')
-bld.RECURSE('../lib/zlib')
-bld.RECURSE('../lib/tsocket')
-bld.RECURSE('../lib/iniparser/src')
-bld.RECURSE('../lib/crypto')
+bld.RECURSE('../lib/addns')
bld.RECURSE('../lib/async_req')
bld.RECURSE('../libcli/auth')
bld.RECURSE('../libcli/drsuapi')
-bld.RECURSE('../libcli/samsync')
+bld.RECURSE('../libcli/ldap')
bld.RECURSE('../libcli/named_pipe_auth')
+bld.RECURSE('../libcli/netlogon')
+bld.RECURSE('../libcli/samsync')
+bld.RECURSE('../libcli/security')
bld.RECURSE('../libcli/smb')
-bld.RECURSE('modules')
+bld.RECURSE('../libcli/smbreadline')
+bld.RECURSE('../lib/crypto')
+bld.RECURSE('../lib/iniparser/src')
+bld.RECURSE('../lib/nss_wrapper')
+bld.RECURSE('../lib/popt')
+bld.RECURSE('../librpc')
+bld.RECURSE('../lib/smbconf')
+bld.RECURSE('../lib/socket_wrapper')
+bld.RECURSE('../lib/talloc')
+bld.RECURSE('../lib/tdb')
+bld.RECURSE('../lib/tevent')
+bld.RECURSE('../lib/tsocket')
+bld.RECURSE('../lib/zlib')
+bld.RECURSE('../nsswitch/libwbclient')
bld.RECURSE('auth')
-bld.RECURSE('passdb')
-bld.RECURSE('winbindd')
bld.RECURSE('libgpo/gpext')
+bld.RECURSE('librpc')
+bld.RECURSE('librpc/idl')
+bld.RECURSE('modules')
bld.RECURSE('pam_smbpass')
+bld.RECURSE('passdb')
bld.RECURSE('rpc_server')
-bld.RECURSE('libaddns')
+bld.RECURSE('winbindd')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()