The branch, v3-6-test has been updated via 695f070 s3-waf: convert RPC_LSARPC into a subsystem. via 3b0181c s3-waf: convert RPC_SAMR into a subsystem. via da46020 s3-waf: convert INIT_SAMR into a subsystem. via ec297bd s3-waf: convert INIT_NETLOGON into a subsystem. via 29cb25e s3-waf: convert INIT_LSA into a subsystem. via cc9e7c9 s3-waf: fix LIBNBT deps. via 03e298e s3-waf: convert IDMAP_AD into a subsystem. via c6b82f8 s3-waf: convert IDMAP_HASH into a subsystem. via b0e3255 s3-waf: convert IDMAP_ADEX into a subsystem. from 22fc5f2 s3: Fix a typo
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 695f070ccd6517cd0fc944e2a3d7dc8cc8a9dc30 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 23:06:53 2010 +0100 s3-waf: convert RPC_LSARPC into a subsystem. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Wed Dec 1 00:13:58 CET 2010 on sn-devel-104 (cherry picked from commit 2b0905aeaecdc7fabad5661b4c726500f613be39) commit 3b0181cb60f2addcbab1115b1f27f2388fb49b56 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 23:04:23 2010 +0100 s3-waf: convert RPC_SAMR into a subsystem. Guenther (cherry picked from commit c2911952519089ed472d33143511d55d10752304) commit da46020dac8a163d4ce6789e410864fe38b667ca Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 22:41:41 2010 +0100 s3-waf: convert INIT_SAMR into a subsystem. Guenther (cherry picked from commit ef129716a4d0d44df5fcb5039398c6e5d9c0e589) commit ec297bd22dc53b1c5ba90ae248c5382c3e2d7710 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 22:37:37 2010 +0100 s3-waf: convert INIT_NETLOGON into a subsystem. Guenther (cherry picked from commit f5e1f5f1259c1a02a9e839f0d9e8ca78ea48cf4a) commit 29cb25eb0c739659983ac223e2eebd7aa86b2dd0 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 22:34:54 2010 +0100 s3-waf: convert INIT_LSA into a subsystem. Guenther (cherry picked from commit 42fe021f560649064d058ac4d9efc28fd97d9403) commit cc9e7c991f2d860e613f109d075733ab17905474 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 21:50:56 2010 +0100 s3-waf: fix LIBNBT deps. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Tue Nov 30 22:39:05 CET 2010 on sn-devel-104 (cherry picked from commit 783264e97c5230063abc601bc7f90c752141a9d6) commit 03e298ec7098837a28dc327b7c101c0b550a0e62 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 21:46:31 2010 +0100 s3-waf: convert IDMAP_AD into a subsystem. Guenther (cherry picked from commit c5559bb7ea6ea95ef333f1deb0bedfec10be39b7) commit c6b82f8af0c562ddffe8f8eae5bd1fc079bbdb12 Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 21:44:25 2010 +0100 s3-waf: convert IDMAP_HASH into a subsystem. Guenther (cherry picked from commit 3a91e407cb4034442150559980ba87db55ba6739) commit b0e325507424708919dc8a6c3fa860288ffa3b0e Author: Günther Deschner <g...@samba.org> Date: Tue Nov 30 21:42:17 2010 +0100 s3-waf: convert IDMAP_ADEX into a subsystem. Guenther (cherry picked from commit e702b54cf83cde07512e1fea151b589fc07638c6) ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/wscript_build | 18 ++++++++-- source3/winbindd/wscript_build | 36 ++++++++++++++++---- source3/wscript_build | 66 ++++++++++++++++++-------------------- 3 files changed, 73 insertions(+), 47 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build index 59c19d5..0e0d1c6 100644 --- a/source3/rpc_server/wscript_build +++ b/source3/rpc_server/wscript_build @@ -1,8 +1,8 @@ #!/usr/bin/env python -RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c''' +RPC_LSARPC_SRC = '''srv_lsa_nt.c''' RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c''' -RPC_SAMR_SRC = '''srv_samr_nt.c ../../librpc/gen_ndr/srv_samr.c +RPC_SAMR_SRC = '''srv_samr_nt.c srv_samr_util.c srv_samr_chgpasswd.c''' RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c ../../librpc/gen_ndr/srv_initshutdown.c''' @@ -22,16 +22,26 @@ bld.SAMBA_SUBSYSTEM('rpc', source='srv_pipe_register.c', vars=locals()) +bld.SAMBA_SUBSYSTEM('RPC_SAMR', + source=RPC_SAMR_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('RPC_LSARPC', + source=RPC_LSARPC_SRC, + vars=locals()) + bld.SAMBA_MODULE('rpc_lsarpc', subsystem='rpc', - source=RPC_LSARPC_SRC, + source='../../librpc/gen_ndr/srv_lsa.c', + deps='RPC_LSARPC', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_LSARPC'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_LSARPC')) bld.SAMBA_MODULE('rpc_samr', subsystem='rpc', - source=RPC_SAMR_SRC, + source='../../librpc/gen_ndr/srv_samr.c', + deps='RPC_SAMR', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SAMR'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SAMR')) diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build index da0c189..4ad898c 100644 --- a/source3/winbindd/wscript_build +++ b/source3/winbindd/wscript_build @@ -26,9 +26,22 @@ bld.SAMBA_SUBSYSTEM('idmap', source=IDMAP_SRC, vars=locals()) +bld.SAMBA_SUBSYSTEM('IDMAP_ADEX', + source=IDMAP_ADEX_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('IDMAP_HASH', + source=IDMAP_HASH_SRC, + vars=locals()) + +bld.SAMBA_SUBSYSTEM('IDMAP_AD', + source=IDMAP_AD_SRC, + vars=locals()) + bld.SAMBA_MODULE('idmap_ad', subsystem='idmap', - source=IDMAP_AD_SRC, + source='', + deps='IDMAP_AD', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) @@ -77,14 +90,16 @@ bld.SAMBA_MODULE('idmap_tdb2', bld.SAMBA_MODULE('idmap_hash', subsystem='idmap', - source=IDMAP_HASH_SRC, + source='', + deps='IDMAP_HASH', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH')) bld.SAMBA_MODULE('idmap_adex', subsystem='idmap', - source=IDMAP_ADEX_SRC, + source='', + deps='IDMAP_ADEX', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX')) @@ -113,35 +128,40 @@ bld.SAMBA_MODULE('nss_info_template', bld.SAMBA_MODULE('nss_info_adex', subsystem='nss_info', - source=IDMAP_ADEX_SRC, + source='', + deps='IDMAP_ADEX', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX')) bld.SAMBA_MODULE('nss_info_hash', subsystem='nss_info', - source=IDMAP_HASH_SRC, + source='', + deps='IDMAP_HASH', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH')) bld.SAMBA_MODULE('nss_info_rfc2307', subsystem='nss_info', - source=IDMAP_AD_SRC, + source='', + deps='IDMAP_AD', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) bld.SAMBA_MODULE('nss_info_sfu20', subsystem='nss_info', - source=IDMAP_AD_SRC, + source='', + deps='IDMAP_AD', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) bld.SAMBA_MODULE('nss_info_sfu', subsystem='nss_info', - source=IDMAP_AD_SRC, + source='', + deps='IDMAP_AD', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD')) diff --git a/source3/wscript_build b/source3/wscript_build index 7e8af30..876b4be 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -44,8 +44,7 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c rpc_client/init_spoolss.c''' -LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c - rpc_client/init_lsa.c''' +LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c''' LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c' @@ -416,11 +415,8 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c WINBINDD_SRC = '''${WINBINDD_SRC1} ${RPC_NCACN_NP} ${TDB_VALIDATE_SRC} - 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 + ../librpc/gen_ndr/srv_lsa.c + ../librpc/gen_ndr/srv_samr.c rpc_server/srv_pipe_register.c''' MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c''' @@ -476,9 +472,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c SMBD_SRC_BASE = '''${SMBD_SRC_SRV} ${RPC_SERVER_SRC} ${OPLOCK_SRC} ${NOTIFY_SRC} - ${BUILDOPT_SRC} - rpc_client/init_netlogon.c - rpc_client/init_samr.c''' + ${BUILDOPT_SRC}''' PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c printing/print_cups.c printing/print_generic.c @@ -513,8 +507,7 @@ 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} - rpc_client/init_lsa.c''' + ${PASSCHANGE_SRC}''' STATUS_SRC = '''utils/status.c utils/status_profile.c''' @@ -530,8 +523,7 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c''' PASSWD_UTIL_SRC = 'utils/passwd_util.c' -SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC} - rpc_client/init_lsa.c''' +SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSCHANGE_SRC}''' PDBEDIT_SRC = '''utils/pdbedit.c''' @@ -547,9 +539,7 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c rpcclient/cmd_winreg.c''' -RPCCLIENT_SRC = '''${RPCCLIENT_SRC1} - rpc_client/init_netlogon.c - rpc_client/init_samr.c''' +RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}''' PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c ${WBCOMMON_SRC} ${LIBREPLACE_SRC}' @@ -593,17 +583,14 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c lib/netapi/shutdown.c lib/netapi/netlogon.c''' -LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} - rpc_client/init_netlogon.c - rpc_client/init_samr.c''' +LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}''' # FIXME: bigballofmud CLIENT_SRC1 = '''client/client.c client/clitar.c client/dnsbrowse.c''' -CLIENT_SRC = '''${CLIENT_SRC1} - rpc_client/init_lsa.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 @@ -643,8 +630,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c utils/net_serverid.c utils/net_eventlog.c utils/net_printing.c - rpc_client/init_netlogon.c - rpc_client/init_samr.c registry/reg_parse.c registry/reg_format.c registry/reg_parse_internal.c registry/reg_import.c lib/cbuf.c lib/srprs.c''' @@ -786,7 +771,8 @@ bld.SAMBA_LIBRARY('libnetapi', 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''', + RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_INITSHUTDOWN + INIT_NETLOGON INIT_SAMR''', public_headers='lib/netapi/netapi.h', private_library=True, vars=locals()) @@ -925,7 +911,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMB', bld.SAMBA_SUBSYSTEM('LIBDRSUAPI', source=DRSUAPI_SRC, - deps='z LZXPRESS NDR_SVCCTL NDR_NBT NDR_DRSUAPI NDR_DRSBLOBS', + deps='z LZXPRESS NDR_DRSUAPI NDR_DRSBLOBS', vars=locals()) bld.SAMBA_SUBSYSTEM('CLDAP', @@ -980,7 +966,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO LIBSMBCONF REG_FULL FNAME_UTIL LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS - RPCCLI_SRVSVC NPA_TSTREAM + RPCCLI_SRVSVC NPA_TSTREAM INIT_NETLOGON INIT_SAMR ''', vars=locals()) @@ -1040,7 +1026,7 @@ bld.SAMBA_SUBSYSTEM('LIBNMB', bld.SAMBA_SUBSYSTEM('LIBNBT', source=LIBNBT_SRC, - deps='NDR_NBT_BUF LIBCLI_NDR_NETLOGON', + deps='NDR_SVCCTL NDR_NBT NDR_NBT_BUF LIBCLI_NDR_NETLOGON', vars=locals()) bld.SAMBA_SUBSYSTEM('SERVICES', @@ -1175,7 +1161,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR', bld.SAMBA_SUBSYSTEM('LIBCLI_LSA', source=LIBCLI_LSA_SRC, - deps='RPCCLI_LSA') + deps='RPCCLI_LSA INIT_LSA') bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', source=LIBCLI_NETLOGON_SRC, @@ -1193,6 +1179,14 @@ bld.SAMBA_SUBSYSTEM('NPA_TSTREAM', source=NPA_TSTREAM_SRC, deps='NDR_NAMED_PIPE_AUTH') +bld.SAMBA_SUBSYSTEM('INIT_LSA', + source='rpc_client/init_lsa.c') + +bld.SAMBA_SUBSYSTEM('INIT_NETLOGON', + source='rpc_client/init_netlogon.c') + +bld.SAMBA_SUBSYSTEM('INIT_SAMR', + source='rpc_client/init_samr.c') ########################## BINARIES ################################# @@ -1219,7 +1213,8 @@ bld.SAMBA_BINARY('winbindd/winbindd', LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info TOKEN_UTIL LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON - RPCCLI_DSSETUP NPA_TSTREAM + RPCCLI_DSSETUP NPA_TSTREAM INIT_NETLOGON + RPC_SAMR RPC_LSARPC ''', enabled=bld.env.build_winbind, install_path='${SBINDIR}', @@ -1230,7 +1225,7 @@ bld.SAMBA_BINARY('web/swat', deps='''talloc tevent cap LIBS LIBSMB libwbclient PARAM LIB_NONSMBD resolv PASSDB POPT_SAMBA KRBCLIENT cups LIBMSRPC_GEN LIBMSRPC LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL - LIBCLI_SAMR''', + LIBCLI_SAMR INIT_LSA''', enabled=bld.env.build_swat, install_path='${SBINDIR}', vars=locals()) @@ -1243,7 +1238,8 @@ bld.SAMBA_BINARY('rpcclient/rpcclient', 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 + RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG INIT_NETLOGON + INIT_SAMR ''', vars=locals()) @@ -1251,7 +1247,7 @@ 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 libsmbclient RPCCLI_SRVSVC''', + LIBMSRPC SMBREADLINE libsmbclient RPCCLI_SRVSVC INIT_LSA''', vars=locals()) bld.SAMBA_BINARY('net', @@ -1264,7 +1260,7 @@ bld.SAMBA_BINARY('net', 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 + RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI INIT_NETLOGON INIT_SAMR ''', vars=locals()) @@ -1314,7 +1310,7 @@ bld.SAMBA_BINARY('smbpasswd', source=SMBPASSWD_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB LIBSMB_ERR POPT_SAMBA KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC PASSWD_UTIL - LIBCLI_SAMR''', + LIBCLI_SAMR INIT_LSA''', vars=locals()) bld.SAMBA_BINARY('pdbedit', -- Samba Shared Repository