DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
${COMPRESSION_SRC}'''
-LIBNDR_NTLMSSP_SRC = '''../librpc/gen_ndr/ndr_ntlmssp.c
- ../librpc/ndr/ndr_ntlmssp.c'''
-
LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/ndr.c
../librpc/ndr/ndr_misc.c
../librpc/ndr/uuid.c
librpc/ndr/util.c'''
-LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c'''
-
-LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c
- ../librpc/ndr/ndr_netlogon.c'''
-
-LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
- ../librpc/ndr/ndr_schannel.c'''
-
-LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
- ../librpc/ndr/ndr_spoolss_buf.c'''
-
-LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
- ../librpc/ndr/ndr_ntprinting.c'''
-
-LIBNDR_XATTR_SRC = '''../librpc/gen_ndr/ndr_xattr.c
- ../librpc/ndr/ndr_xattr.c'''
-
LIBCLI_SPOOLSS_SRC = '''
../librpc/gen_ndr/cli_spoolss.c
../librpc/gen_ndr/ndr_spoolss_c.c
../librpc/gen_ndr/cli_eventlog.c
../librpc/gen_ndr/ndr_eventlog_c.c'''
-LIBCLI_WINREG_SRC = '''
- ../librpc/gen_ndr/cli_winreg.c
- ../librpc/gen_ndr/ndr_winreg_c.c'''
-
LIBCLI_NTSVCS_SRC = '''
../librpc/gen_ndr/cli_ntsvcs.c
../librpc/gen_ndr/ndr_ntsvcs_c.c'''
../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'''
../librpc/gen_ndr/cli_epmapper.c
../librpc/gen_ndr/ndr_epmapper_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
- ${LIBNDR_NETLOGON_SRC}
- ../librpc/gen_ndr/ndr_dssetup.c
- ../librpc/gen_ndr/ndr_epmapper.c
- ../librpc/gen_ndr/ndr_ntsvcs.c
- ${LIBNDR_SPOOLSS_SRC}'''
-
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
-SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
-NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''
- ${LIBREPLACE_SRC}
- ${SOCKET_WRAPPER_SRC}
- ${NSS_WRAPPER_SRC}'''
+LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
../lib/util/xfile.c ../lib/util/util_strlist.c
../lib/util/genrand.c ../lib/util/util_net.c
../lib/util/become_daemon.c ../lib/util/system.c
../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
+ ../lib/util/tevent_werror.c
../lib/util/smb_threads.c ../lib/util/util_id.c
- ../lib/util/blocking.c ../lib/util/rfc1738.c '''
+ ../lib/util/blocking.c ../lib/util/rfc1738.c
+ ../lib/util/select.c'''
LIBTEVENT_SRC0 = ''
LIBREPLACE_SRCS = ''
-SOCKET_WRAPPER_SRCS = ''
-
-NSS_WRAPPER_SRCS = ''
-
ZLIB_SRCS = ''
LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
- lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+ lib/messages.c lib/messages_local.c
lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
lib/interfaces.c lib/memcache.c
lib/talloc_dict.c
lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
../libds/common/flag_mapping.c
- lib/util_pw.c lib/access.c lib/smbrun.c
+ lib/access.c lib/smbrun.c
lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
lib/wins_srv.c
lib/util_str.c lib/clobber.c lib/util_sid.c
lib/util.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 lib/select.c lib/errmap_unix.c
+ lib/ms_fnmatch.c lib/errmap_unix.c
lib/tallocmsg.c lib/dmallocmsg.c
libsmb/clisigning.c libsmb/smb_signing.c
lib/iconv.c lib/pam_errors.c intl/lang_tdb.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}'''
-READLINE_SRC = '''lib/readline.c'''
-
POPT_LIB_SRC = '''lib/popt_common.c'''
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'''
LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c libaddns/dnssock.c
libaddns/dnsgss.c libaddns/dnsmarshall.c'''
-LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
+LIBADDNS_SRC = '''${LIBADDNS_SRC0}'''
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
- ../librpc/ndr/ndr_krb5pac.c
- ../librpc/gen_ndr/ndr_krb5pac.c'''
+LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c'''
LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
- passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
+ passdb/machine_sid.c'''
LIBNBT_SRC = '''../libcli/nbt/nbtname.c
../libcli/netlogon.c
libsmb/ntlmssp_wrap.c
../libcli/auth/ntlmssp.c
../libcli/auth/ntlmssp_sign.c
- ${LIBNDR_NTLMSSP_SRC}
../libcli/auth/ntlmssp_ndr.c
../libcli/auth/ntlmssp_server.c'''
SCHANNEL_SRC = '''../libcli/auth/credentials.c
../libcli/auth/schannel_sign.c
- ../libcli/auth/schannel_state_tdb.c
- ${LIBNDR_SCHANNEL_SRC}'''
+ ../libcli/auth/schannel_state_tdb.c'''
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clikrb5.c libsmb/clispnego.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
- registry/reg_perfcount.c
- librpc/gen_ndr/ndr_perfcount.c'''
+ registry/reg_perfcount.c'''
SERVICES_SRC = '''services/svc_spoolss.c
services/svc_rcinit.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
DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
-#FIXME: set NSS_INFO_STATIC during configuration
-NSS_INFO_STATIC = ''
-NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
-NSS_INFO_SRC = 'winbindd/nss_info.c'
-
WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_group.c
winbindd/winbindd_util.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}
- ${NSS_INFO_SRC}
- ${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_WINREG_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}
- ${LIBNDR_XATTR_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_WINREG_SRC}
${LIBCLI_NETLOGON_SRC}
- ${RPC_CLIENT_SCHANNEL_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
lib/netapi/cm.c
- librpc/gen_ndr/ndr_libnetapi.c
lib/netapi/libnetapi.c
lib/netapi/joindomain.c
lib/netapi/serverinfo.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'''
utils/net_eventlog.c
utils/net_printing.c
${LIBCLI_SPOOLSS_SRC}
- ${LIBCLI_WINREG_SRC}
${LIBCLI_DRSUAPI_SRC}
${LIBCLI_INITSHUTDOWN_SRC}
${LIBCLI_DSSETUP_SRC}
${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}
LOCKTEST_SRC = '''torture/locktest.c ${FNAME_UTIL_SRC}'''
-NSSTEST_SRC = '''torture/nsstest.c ${LIBSAMBAUTIL_SRC}'''
+NSSTEST_SRC = '''../nsswitch/nsstest.c ${LIBSAMBAUTIL_SRC}'''
PDBTEST_SRC = '''torture/pdbtest.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c ${PARAM_SRC}
${LIB_NONSMBD_SRC} ${LIBSMB_ERR_SRC} ${LIBNMB_SRC}'''
-PAM_SMBPASS_SRC_0 = '''pam_smbpass/pam_smb_auth.c pam_smbpass/pam_smb_passwd.c
- pam_smbpass/pam_smb_acct.c pam_smbpass/support.c ../lib/util/asn1.c'''
-PAM_SMBPASS_SRC = '''${PAM_SMBPASS_SRC_0} ${PARAM_SRC} ${LIB_NONSMBD_SRC} ${PASSDB_SRC} ${GROUPDB_SRC} \
- ${SMBLDAP_SRC} ${LIBSAMBA_SRC} \
- ${LIBTSOCKET_SRC}'''
-
WBINFO_SRC = '''../nsswitch/wbinfo.c'''
WINBIND_NSS_SRC = '''${WBCOMMON_SRC} ${LIBREPLACE_SRC}'''
NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
../libcli/auth/spnego_parse.c libsmb/clikrb5.c libads/kerberos.c
libsmb/samlogon_cache.c
- ${LIBNMB_SRC}
- ${LIBNDR_NETLOGON_SRC}'''
+ ${LIBNMB_SRC}'''
VLP_SRC = '''printing/tests/vlp.c
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.SETUP_BUILD_GROUPS()
+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.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
-
- 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())
+bld.RECURSE('../libcli/security')
######################## SUBSYSTEMS #################################
../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_LIBRARY('libnetapi',
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''',
+ LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
+ RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF''',
public_headers='lib/netapi/netapi.h',
+ private_library=True,
vars=locals())
bld.SAMBA_LIBRARY('libsmbclient',
public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
LIBMSRPC_GEN LIBMSRPC''',
public_headers='include/libsmbclient.h',
+ private_library=True,
vars=locals())
bld.SAMBA_LIBRARY('libsmbsharemodes',
source=LIBSMBSHAREMODES_SRC,
public_deps='''talloc tdb''',
public_headers='include/smb_share_modes.h',
+ private_library=True,
vars=locals())
bld.SAMBA_LIBRARY('libaddns',
source=LIBADDNS_SRC,
- deps='SOCKET_WRAPPER',
public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5',
+ private_library=True,
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
- deps='LIBNDR NDR_SECURITY NDR_DCERPC',
+ deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_SCHANNEL',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
- source='${LIBNDR_GEN_SRC}',
- deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_EVENTLOG NDR_LSA',
+ source='',
+ deps='''NDR_STANDARD NDR_DSSETUP NDR_SPOOLSS''',
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',
+ deps='iconv LIBCRYPTO LIBNDR security NDR_SECURITY charset NDR_MESSAGING',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
bld.SAMBA_SUBSYSTEM('LIBSAMBA',
source=LIBSAMBA_SRC,
- deps='LIBSMB_ERR',
+ deps='LIBSMB_ERR NDR_NTLMSSP',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBSMB',
bld.SAMBA_SUBSYSTEM('SECRETS',
source=SECRETS_SRC,
+ deps='NDR_SECRETS',
vars=locals())
bld.SAMBA_SUBSYSTEM('SMBLDAP',
bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
+ deps='NDR_KRB5PAC',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
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
+ 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''',
+ vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
+ PRINTING PRINTBACKEND NDR_XATTR REGFIO
+ LIBSMBCONF REG_FULL
+ ''',
vars=locals())
-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='${PROFILE_SRC}',
vars=locals())
-bld.SAMBA_SUBSYSTEM('READLINE',
- source=READLINE_SRC,
- vars=locals())
-
bld.SAMBA_SUBSYSTEM('PRINTBASE',
source=PRINTBASE_SRC,
vars=locals())
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',
#FIXME
bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
- source=LIBNDR_SRC,
+ 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 libsecurity NDR_DNS
+ ''',
+ public_deps='LIBNDR',
vars=locals())
#FIXME
source='../librpc/gen_ndr/ndr_dcerpc.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
- source='../libcli/util/doserr.c libsmb/nterr.c')
+bld.SAMBA_SUBSYSTEM('libsamba-errors',
+ source='../libcli/util/doserr.c libsmb/nterr.c')
bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
- source='../libcli/nbt/nbtname.c',
- deps='talloc',
- autoproto='nbtname.h')
+ source='../libcli/nbt/nbtname.c',
+ deps='talloc',
+ autoproto='nbtname.h')
bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
- source='../libcli/ndr_netlogon.c',
- public_deps='LIBNDR NDR_SECURITY')
+ source='../libcli/ndr_netlogon.c',
+ public_deps='LIBNDR 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('RPC_CLIENT_SCHANNEL',
+ source=RPC_CLIENT_SCHANNEL_SRC,
+ vars=locals())
+
########################## BINARIES #################################
bld.SAMBA_BINARY('nmbd/nmbd',
source=NMBD_SRC,
deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
- NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
+ PASSDB PARAM ldap LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
install_path='${SBINDIR}',
vars=locals())
bld.SAMBA_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
- deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
+ deps='''talloc tdb tevent cap dl ZLIB
libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
- NSS_INFO_TEMPLATE SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
- LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL IDMAP
+ SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
+ 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 READLINE DISPLAY_SEC DCUTIL''',
+ 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 READLINE DISPLAY_SEC''',
+ LIBMSRPC SMBREADLINE''',
vars=locals())
bld.SAMBA_BINARY('net',
source=NET_SRC,
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 READLINE PASSWD_UTIL LIBNET
- LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC DCUTIL
- REGFIO NDR_NTPRINTING''',
+ LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
+ LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
+ REGFIO NDR_NTPRINTING RPCCLI_WINREG
+ RPC_CLIENT_SCHANNEL''',
vars=locals())
bld.SAMBA_BINARY('profiles',
bld.SAMBA_BINARY('testparm',
source=TESTPARM_SRC,
- deps='''talloc tevent ldap cap NSS_WRAPPER
+ deps='''talloc tevent ldap cap
libwbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
LIBSMB_ERR POPT_SAMBA''',
vars=locals())
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.SAMBA_BINARY('nsstest',
source=NSSTEST_SRC,
- deps='NSS_WRAPPER',
+ deps='',
vars=locals())
bld.SAMBA_BINARY('pdbtest',
bld.SAMBA_BINARY('vfstest',
source=VFSTEST_SRC,
- deps='''SMBD_BASE READLINE''',
+ deps='''SMBD_BASE SMBREADLINE''',
vars=locals())
bld.SAMBA_BINARY('smbiconv',
bld.SAMBA_BINARY('wbinfo',
source=WBINFO_SRC,
deps='''talloc libwbclient tevent cap
- NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
+ ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
vars=locals())
deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD
LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET
PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER
- NDR_SAMR NDR_LSA LIBCLI_LDAP_NDR''',
+ NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR''',
vars=locals())
bld.SAMBA_BINARY('timelimit',
LIBSAMBA''',
vars=locals())
+bld.SAMBA_BINARY('vlp',
+ source=VLP_SRC,
+ deps='''talloc tdb''',
+ vars=locals())
+
swat_files=recursive_dirlist('../swat', '../swat', '*')
bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
bld.RECURSE('passdb')
bld.RECURSE('winbindd')
bld.RECURSE('libgpo/gpext')
+bld.RECURSE('pam_smbpass')
+bld.RECURSE('rpc_server')
bld.ENFORCE_GROUP_ORDERING()
bld.CHECK_PROJECT_RULES()
git.samba.org / kai / samba.git / blobdiff