[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Nov 30 16:14:02 MST 2010
The branch, master has been updated
via 2b0905a s3-waf: convert RPC_LSARPC into a subsystem.
via c291195 s3-waf: convert RPC_SAMR into a subsystem.
via ef12971 s3-waf: convert INIT_SAMR into a subsystem.
via f5e1f5f s3-waf: convert INIT_NETLOGON into a subsystem.
via 42fe021 s3-waf: convert INIT_LSA into a subsystem.
from e8aa266 talloc: Add talloc object.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2b0905aeaecdc7fabad5661b4c726500f613be39
Author: Günther Deschner <gd at 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 <gd at samba.org>
Autobuild-Date: Wed Dec 1 00:13:58 CET 2010 on sn-devel-104
commit c2911952519089ed472d33143511d55d10752304
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 23:04:23 2010 +0100
s3-waf: convert RPC_SAMR into a subsystem.
Guenther
commit ef129716a4d0d44df5fcb5039398c6e5d9c0e589
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 22:41:41 2010 +0100
s3-waf: convert INIT_SAMR into a subsystem.
Guenther
commit f5e1f5f1259c1a02a9e839f0d9e8ca78ea48cf4a
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 22:37:37 2010 +0100
s3-waf: convert INIT_NETLOGON into a subsystem.
Guenther
commit 42fe021f560649064d058ac4d9efc28fd97d9403
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 30 22:34:54 2010 +0100
s3-waf: convert INIT_LSA into a subsystem.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/wscript_build | 18 ++++++++--
source3/wscript_build | 62 +++++++++++++++++--------------------
2 files changed, 43 insertions(+), 37 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/wscript_build b/source3/wscript_build
index 18ecf3c..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())
@@ -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())
@@ -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
More information about the samba-cvs
mailing list