[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Sun Sep 26 23:12:15 MDT 2010
The branch, master has been updated
via f2310ca waf: add more NDR subsystems for shared IDL files.
via 611c831 s4-waf: remove NDR-SRVSVC alias.
via d834671 s4-smbtorture: remove unneeded dcerpc_mgmt alias.
from 785410c s4-drs: fixed comment in getncchanges code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f2310cacde6cccbbdc80893ed2a571fcf1f81975
Author: Günther Deschner <gd at samba.org>
Date: Mon Sep 27 03:55:40 2010 +0200
waf: add more NDR subsystems for shared IDL files.
Guenther
commit 611c8310aba9b41171f1ffb17e6cc8591293cfec
Author: Günther Deschner <gd at samba.org>
Date: Mon Sep 27 07:07:24 2010 +0200
s4-waf: remove NDR-SRVSVC alias.
Thanks tridge, this was driving me nuts...
Guenther
commit d834671f68e1bc0817d8151cd6cc065851263075
Author: Günther Deschner <gd at samba.org>
Date: Mon Sep 27 06:57:36 2010 +0200
s4-smbtorture: remove unneeded dcerpc_mgmt alias.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/wscript_build | 50 +++++++++++++++++++++++++++++++++++++
source4/librpc/wscript_build | 4 +-
source4/torture/drs/wscript_build | 2 +-
source4/torture/wscript_build | 2 +-
source4/wscript_build | 2 -
5 files changed, 54 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/wscript_build b/librpc/wscript_build
index f297d56..477f6dd 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -22,6 +22,16 @@ bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
public_deps='LIBNDR'
)
+bld.SAMBA_SUBSYSTEM('NDR_DFS',
+ source='../librpc/gen_ndr/ndr_dfs.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_WINREG',
+ source='../librpc/gen_ndr/ndr_winreg.c',
+ public_deps='LIBNDR NDR_SECURITY NDR_LSA'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_EFS',
source='../librpc/gen_ndr/ndr_efs.c',
public_deps='LIBNDR NDR_SECURITY'
@@ -192,11 +202,46 @@ bld.SAMBA_SUBSYSTEM('NDR_LSA',
public_deps='LIBNDR NDR_SECURITY'
)
+bld.SAMBA_SUBSYSTEM('NDR_SVCCTL',
+ source='../librpc/gen_ndr/ndr_svcctl.c ../librpc/ndr/ndr_svcctl.c',
+ public_deps='LIBNDR NDR_SECURITY'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
+ source='../librpc/gen_ndr/ndr_srvsvc.c',
+ public_deps='LIBNDR NDR_SECURITY NDR_SVCCTL'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_NETLOGON',
+ source='../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c',
+ public_deps='LIBNDR NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG',
source='../librpc/gen_ndr/ndr_eventlog.c',
public_deps='LIBNDR NDR_SECURITY NDR_LSA'
)
+bld.SAMBA_SUBSYSTEM('NDR_NTSVCS',
+ source='../librpc/gen_ndr/ndr_ntsvcs.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_WKSSVC',
+ source='../librpc/gen_ndr/ndr_wkssvc.c',
+ public_deps='LIBNDR NDR_SECURITY'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_ECHO',
+ source='../librpc/gen_ndr/ndr_echo.c',
+ public_deps='LIBNDR'
+ )
+
+bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
+ source='../librpc/gen_ndr/ndr_initshutdown.c',
+ public_deps='LIBNDR NDR_LSA'
+ )
+
bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
source='../librpc/ndr/ndr_compression.c',
public_deps='LIBSAMBA-ERRORS LIBNDR',
@@ -271,6 +316,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
public_deps='dcerpc NDR_STANDARD'
)
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
+ source='../librpc/gen_ndr/ndr_samr_c.c',
+ public_deps='dcerpc NDR_SAMR'
+ )
+
bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
source='../librpc/gen_ndr/ndr_dfs_c.c',
public_deps='dcerpc NDR_STANDARD'
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index edbf662..fc68326 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -93,10 +93,10 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
bld.SAMBA_LIBRARY('NDR_STANDARD',
- source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_ntsvcs.c ../../librpc/gen_ndr/ndr_eventlog6.c',
+ source='../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_eventlog6.c',
vnum='0.0.1',
pc_files='../../librpc/ndr_standard.pc',
- deps='NDR_SECURITY NDR_LSA NDR_SAMR NDR_EVENTLOG',
+ 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',
public_deps='LIBNDR',
public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
header_path='gen_ndr'
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index 04e7b0e..ee72318 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_drs_init',
- deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
+ deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE',
internal_module=True
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index b576a5c..6bfb828 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
autoproto='rpc/proto.h',
subsystem='smbtorture',
init_function='torture_rpc_init',
- deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc dcerpc_mgmt RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE TORTURE_DFS',
+ deps='NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_LDB_MODULE TORTURE_DFS',
internal_module=True
)
diff --git a/source4/wscript_build b/source4/wscript_build
index 6b9fc98..110ca3e 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -17,8 +17,6 @@ bld.SAMBA_MKVERSION('version.h')
# this sets up some aliases
bld.TARGET_ALIAS('attr', 'XATTR')
bld.TARGET_ALIAS('sasl2', 'SASL')
-bld.TARGET_ALIAS('RPC_NDR_SRVSVC', 'NDR_SRVSVC')
-bld.TARGET_ALIAS('RPC_NDR_MGMT', 'dcerpc_mgmt')
# missing subsystems - need looking at
bld.SAMBA_SUBSYSTEM('NETAPI', '') # for external libnet
--
Samba Shared Repository
More information about the samba-cvs
mailing list