../librpc/gen_ndr/cli_dfs.c
../librpc/gen_ndr/ndr_dfs_c.c'''
-LIBCLI_ECHO_SRC = '''
- ../librpc/gen_ndr/cli_echo.c
- ../librpc/gen_ndr/ndr_echo_c.c'''
-
LIBCLI_INITSHUTDOWN_SRC = '''
../librpc/gen_ndr/cli_initshutdown.c
../librpc/gen_ndr/ndr_initshutdown_c.c'''
LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
${LIBNDR_GEN_SRC0}
../librpc/gen_ndr/ndr_dfs.c
- ../librpc/gen_ndr/ndr_echo.c
../librpc/gen_ndr/ndr_winreg.c
../librpc/gen_ndr/ndr_initshutdown.c
../librpc/gen_ndr/ndr_srvsvc.c
lib/module.c lib/events.c ${LIBTEVENT_SRC0}
lib/server_contexts.c
lib/ldap_escape.c
- lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
- ../libcli/security/sddl.c
- ../libcli/security/secacl.c ${PTHREADPOOL_SRC}
+ lib/secdesc.c ${PTHREADPOOL_SRC}
lib/fncall.c
libads/krb5_errs.c lib/system_smbd.c lib/audit.c
- lib/file_id.c lib/idmap_cache.c
- ../libcli/security/dom_sid.c ../libcli/security/security_descriptor.c'''
+ lib/file_id.c lib/idmap_cache.c'''
LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c'''
LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c param/loadparm_server_role.c
lib/sharesec.c lib/ldap_debug_handler.c'''
-PARAM_REG_ADD_SRC = '''${REG_SMBCONF_SRC} ${LIBSMBCONF_SRC} ${PRIVILEGES_BASIC_SRC}'''
-PARAM_SRC = '''${PARAM_REG_ADD_SRC}'''
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
${REG_BACKENDS_BASE_SRC}
${REG_INIT_BASIC_SRC}'''
-REG_SMBCONF_SRC = '''${REG_BASE_SRC}
+REG_SMBCONF_SRC = '''
${REG_BACKENDS_SMBCONF_SRC}
${REG_INIT_SMBCONF_SRC}
registry/reg_util_token.c
registry/reg_api_util.c'''
-REG_FULL_SRC = '''${REG_SMBCONF_SRC}
+REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
registry/reg_eventlog.c
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-RPC_STATIC = ''
-
-RPC_LSARPC_SRC = '''rpc_server/srv_lsa_nt.c
- ../librpc/gen_ndr/srv_lsa.c'''
-
-RPC_NETLOGON_SRC = '''rpc_server/srv_netlog_nt.c
- ../librpc/gen_ndr/srv_netlogon.c'''
-
-RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
- rpc_server/srv_samr_util.c
- rpc_server/srv_samr_chgpasswd.c
- ../librpc/gen_ndr/srv_samr.c'''
-
-RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
-
-RPC_WINREG_SRC = '''rpc_server/srv_winreg_nt.c
- ../librpc/gen_ndr/srv_winreg.c'''
-
-RPC_DSSETUP_SRC = ''' rpc_server/srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
-
-RPC_SRVSVC_SRC = '''rpc_server/srv_srvsvc_nt.c
- ../librpc/gen_ndr/srv_srvsvc.c'''
-
-RPC_WKSSVC_SRC = '''../librpc/gen_ndr/srv_wkssvc.c
- rpc_server/srv_wkssvc_nt.c'''
-
-RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
- ../librpc/gen_ndr/srv_svcctl.c'''
-
-RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
- ../librpc/gen_ndr/srv_ntsvcs.c'''
-
-RPC_NETDFS_SRC = '''../librpc/gen_ndr/srv_dfs.c
- rpc_server/srv_dfs_nt.c'''
-
-RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
- rpc_server/srv_spoolss_util.c
- ../librpc/gen_ndr/srv_spoolss.c'''
-
-RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
- ../librpc/gen_ndr/srv_eventlog.c'''
-
NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
../librpc/gen_ndr/ndr_named_pipe_auth.c'''
-RPC_NCACN_NP = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np.c
+RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c
rpc_server/rpc_handles.c'''
RPC_SERVICE = '''rpc_server/rpc_server.c'''
RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
-RPC_RPCECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
-
-RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}'''
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
-PRIVILEGES_BASIC_SRC = '''../libcli/security/privileges.c'''
-
PRIVILEGES_SRC = '''lib/privileges.c'''
PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.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
passdb/login_cache.c
auth/server_info_sam.c
auth/user_info.c
auth/user_util.c
- rpc_server/srv_samr_chgpasswd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
+ ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
${TDB_VALIDATE_SRC}
${LIBCLI_DSSETUP_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
- rpc_client/init_netlogon.c'''
+ rpc_client/init_netlogon.c
+ rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
+ rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
+ rpc_server/srv_samr_util.c
+ rpc_server/srv_samr_chgpasswd.c
+ rpc_server/srv_pipe_register.c'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
- ${REG_FULL_SRC}
${BUILDOPT_SRC}
- ${LIBSMBCONF_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
- ${RPC_CLIENT_SCHANNEL_SRC}
rpc_client/init_netlogon.c
- rpc_client/init_samr.c
- ${PRIVILEGES_BASIC_SRC}'''
+ rpc_client/init_samr.c'''
PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
printing/print_cups.c printing/print_generic.c
SMBGET_SRC = '''utils/smbget.c'''
-DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
-
RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
rpcclient/cmd_samr.c rpcclient/cmd_spoolss.c
rpcclient/cmd_netlogon.c rpcclient/cmd_srvsvc.c
${LIBCLI_NTSVCS_SRC}
${LIBCLI_DRSUAPI_SRC}
${LIBCLI_DFS_SRC}
- ${LIBCLI_ECHO_SRC}
${LIBCLI_DSSETUP_SRC}
${LIBCLI_WKSSVC_SRC}
${LIBCLI_SRVSVC_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
- ${RPC_CLIENT_SCHANNEL_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
lib/netapi/netlogon.c'''
LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
- ${LIBSMBCONF_SRC}
- ${REG_SMBCONF_SRC}
- ${PRIVILEGES_BASIC_SRC}
auth/token_util.c
${LIBCLI_INITSHUTDOWN_SRC}
${LIBCLI_WKSSVC_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
- ${RPC_CLIENT_SCHANNEL_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
- ${RPC_CLIENT_SCHANNEL_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c
registry/reg_parse.c registry/reg_format.c
SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
torture/denytest.c torture/mangle_test.c
torture/nbench.c
+ torture/test_async_echo.c
torture/test_posix_append.c'''
SMBTORTURE_SRC = '''${SMBTORTURE_SRC1} ${TLDAP_SRC}
LIBS='ICONV'
bld.SAMBA_GENERATOR('build_options',
- source='include/config.h script/mkbuildoptions.awk',
+ source='include/config.h script/mkbuildoptions-waf.awk',
target='smbd/build_options.c',
rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} < ${SRC[0].abspath(env)}')
bld.RECURSE('../librpc')
bld.RECURSE('librpc/idl')
bld.RECURSE('librpc')
+bld.RECURSE('../libcli/security')
bld.SAMBA_MKVERSION('include/version.h')
-for prefix in bld.env.MODULE_PREFIXES:
-
- if prefix == 'auth': continue
- if prefix == 'pdb': continue
- if prefix == 'idmap': continue
- if prefix == 'charset': continue
- if prefix == 'perfcount': continue
- if prefix == 'gpext': continue
- if prefix == 'vfs': continue
- if prefix == 'nss_info': continue
-
- static_key = "%s_STATIC" % prefix.upper()
- shared_key = "%s_SHARED" % prefix.upper()
-
- for module in bld.env[static_key]:
- bld.SAMBA_SUBSYSTEM(module,
- source="${%s_SRC}" % module,
- vars=locals())
-
- # Set up subsystems for the shared modules
- for module in bld.env[shared_key]:
- bld.SAMBA_MODULE(module,
- source="${%s_SRC}" % module,
- vars=locals())
-
######################## SUBSYSTEMS #################################
bld.SAMBA_SUBSYSTEM('WBCOMMON',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
- LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI''',
+ LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
+ RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF''',
public_headers='lib/netapi/netapi.h',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
source='${LIBNDR_GEN_SRC}',
- deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA',
+ deps='''LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA
+ NDR_ECHO''',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBGPO',
source='${LIBGPO_SRC}',
- deps='GPEXT',
+ deps='gpext',
vars=locals())
bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
bld.SAMBA_SUBSYSTEM('PASSDB',
source=PASSDB_SRC,
- deps='''GROUPDB TLDAP SECRETS SMBLDAP PDB''',
+ deps='''GROUPDB TLDAP SECRETS SMBLDAP pdb''',
vars=locals())
bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
source=PARAM_WITHOUT_REG_SRC)
bld.SAMBA_SUBSYSTEM('PARAM',
- source=PARAM_SRC,
- deps='PARAM_WITHOUT_REG DYNCONFIG',
+ source='',
+ deps='PARAM_WITHOUT_REG DYNCONFIG LIBSMBCONF',
vars=locals())
bld.SAMBA_SUBSYSTEM('REGFIO',
source=REG_API_REGF_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('REG_BASE',
+ source=REG_BASE_SRC,
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_SMBCONF',
+ source=REG_SMBCONF_SRC,
+ deps='REG_BASE',
+ vars=locals())
+
+bld.SAMBA_SUBSYSTEM('REG_FULL',
+ source=REG_FULL_SRC,
+ deps='REG_SMBCONF',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
source=POPT_LIB_SRC,
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY CHARSET NDR_MESSAGING',
+ deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY charset NDR_MESSAGING',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
source=AFS_SETTOKEN_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
+ source=LIBSMBCONF_SRC,
+ deps='REG_BASE REG_SMBCONF',
+ vars=locals())
+
bld.SAMBA_SUBSYSTEM('SMBD_BASE',
source=SMBD_SRC_BASE,
deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
- VFS RPC_MODULES AUTH LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG
- REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER
- RPCCLI_WINREG''',
+ vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
+ PRINTING PRINTBACKEND NDR_XATTR REGFIO SOCKET_WRAPPER
+ LIBSMBCONF REG_FULL
+ ''',
vars=locals())
-if not bld.env.developer:
- bld.SAMBA_SUBSYSTEM('RPC_RPCECHO',
- source='')
-
-bld.SAMBA_SUBSYSTEM('RPC_MODULES',
- source='',
- deps='''RPC_LSARPC RPC_SAMR RPC_WINREG RPC_INITSHUTDOWN
- RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS
- RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS
- RPC_EVENTLOG RPC_RPCECHO''')
-
bld.SAMBA_SUBSYSTEM('LOCKING',
source='${LOCKING_SRC}',
deps='''tdb talloc''',
source=PASSWD_UTIL_SRC,
vars=locals())
-bld.SAMBA_SUBSYSTEM('DISPLAY_SEC',
- source=DISPLAY_SEC_SRC,
- vars=locals())
-
bld.SAMBA_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
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('RPC_CLIENT_SCHANNEL',
+ source=RPC_CLIENT_SCHANNEL_SRC,
+ vars=locals())
+
+
########################## BINARIES #################################
bld.SAMBA_BINARY('smbd/smbd',
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
- LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP NSS_INFO
+ LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
source=RPCCLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
- LIBADS SMBREADLINE DISPLAY_SEC DCUTIL RPCCLI_WINREG''',
+ LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
+ RPC_CLIENT_SCHANNEL''',
vars=locals())
bld.SAMBA_BINARY('smbclient',
source=CLIENT_SRC,
deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
- LIBMSRPC SMBREADLINE DISPLAY_SEC SOCKET_WRAPPER''',
+ LIBMSRPC SMBREADLINE SOCKET_WRAPPER''',
vars=locals())
bld.SAMBA_BINARY('net',
deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
PARAM_WITHOUT_REG libwbclient 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 DISPLAY_SEC DCUTIL
- REGFIO NDR_NTPRINTING RPCCLI_WINREG''',
+ LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
+ REGFIO NDR_NTPRINTING RPCCLI_WINREG
+ RPC_CLIENT_SCHANNEL''',
vars=locals())
bld.SAMBA_BINARY('profiles',
bld.SAMBA_BINARY('smbtorture',
source=SMBTORTURE_SRC,
deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT
- LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+ LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_LSA LIBMSRPC LIBMSRPC_GEN RPCCLI_ECHO''',
vars=locals())
bld.SAMBA_BINARY('smbconftort',
bld.RECURSE('winbindd')
bld.RECURSE('libgpo/gpext')
bld.RECURSE('pam_smbpass')
+bld.RECURSE('rpc_server')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()