[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  6700458 s4:librpc: let dcerpc-samr library use RPC_NDR_SAMR subsystem
       via  a308cdc s4:build: add RPC_NDR_ATSVC subsystem
       via  ac4497e s3-waf: make use of LIBCLI_CLDAP subsystem
      from  56f02e8 s3: Fix filtering in pdb_ads_search_users

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 67004581e6e19383e5b5961021ee4c047ca1609c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 22 09:37:28 2011 +0100

    s4:librpc: let dcerpc-samr library use RPC_NDR_SAMR subsystem
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Feb 22 21:51:43 CET 2011 on sn-devel-104

commit a308cdc371c13e2d340bd26eecd56084632e4ead
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 22 09:37:07 2011 +0100

    s4:build: add RPC_NDR_ATSVC subsystem
    
    metze

commit ac4497edae2800c3fc7c40f0e538b936f1965a75
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 22 09:19:49 2011 +0100

    s3-waf: make use of LIBCLI_CLDAP subsystem
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 librpc/wscript_build         |   14 ++++++++++++--
 source3/wscript_build        |    9 +++------
 source4/librpc/wscript_build |    8 ++++----
 3 files changed, 19 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index abbda8c..1c41af3 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -15,6 +15,11 @@ bld.SAMBA_SUBSYSTEM('NDR_AUTH',
                     public_deps='ndr NDR_SECURITY ndr-krb5pac'
                     )
 
+bld.SAMBA_SUBSYSTEM('NDR_ATSVC',
+	source='gen_ndr/ndr_atsvc.c',
+	public_deps='ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
 	source='gen_ndr/ndr_named_pipe_auth.c',
 	public_deps='ndr NDR_AUTH'
@@ -290,12 +295,12 @@ bld.SAMBA_LIBRARY('ndr-krb5pac',
                     )
 
 bld.SAMBA_LIBRARY('ndr-standard',
-	source='gen_ndr/ndr_atsvc.c gen_ndr/ndr_eventlog6.c',
+	source='gen_ndr/ndr_eventlog6.c',
 	vnum='0.0.1',
 	pc_files='ndr_standard.pc',
 	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 security NDR_DNS''',
+	NDR_ECHO security NDR_DNS NDR_ATSVC''',
 	public_deps='ndr',
 	public_headers='gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/lsa.h gen_ndr/netlogon.h gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h',
 	header_path='gen_ndr'
@@ -343,6 +348,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
 	public_deps='NDR_ROT dcerpc'
 	)
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
+	source='gen_ndr/ndr_atsvc_c.c',
+	public_deps='dcerpc NDR_ATSVC'
+	)
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
 	source='gen_ndr/ndr_audiosrv_c.c',
 	public_deps='NDR_AUDIOSRV dcerpc'
diff --git a/source3/wscript_build b/source3/wscript_build
index 0d82cb4..73cc20d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -168,10 +168,6 @@ LIBSMB_SRC0 = '''
 
 LIBSAMBA_SRC = '${LIBSMB_SRC0}'
 
-CLDAP_SRC = '''libads/cldap.c
-        ../libcli/cldap/cldap.c
-        ../lib/util/idtree.c'''
-
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
 SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
@@ -845,8 +841,8 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
-                    source=CLDAP_SRC,
-                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET',
+                    source='libads/cldap.c',
+                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SECRETS3',
@@ -1389,6 +1385,7 @@ bld.RECURSE('../lib/async_req')
 bld.RECURSE('../libcli/auth')
 bld.RECURSE('../libcli/drsuapi')
 bld.RECURSE('../libcli/ldap')
+bld.RECURSE('../libcli/cldap')
 bld.RECURSE('../libcli/named_pipe_auth')
 bld.RECURSE('../libcli/netlogon')
 bld.RECURSE('../libcli/samsync')
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 4e75434..c9c4a22 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -126,20 +126,20 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
 
 
 bld.SAMBA_LIBRARY('dcerpc-samr',
-	source='../../librpc/gen_ndr/ndr_samr_c.c',
+	source='',
 	pc_files='dcerpc_samr.pc',
 	vnum='0.0.1',
-	public_deps='dcerpc ndr-standard',
+	public_deps='dcerpc ndr-standard RPC_NDR_SAMR',
 	public_headers='../../librpc/gen_ndr/ndr_samr_c.h',
 	header_path='gen_ndr'
 	)
 
 
 bld.SAMBA_LIBRARY('dcerpc-atsvc',
-	source='../../librpc/gen_ndr/ndr_atsvc_c.c',
+	source='',
 	pc_files='dcerpc_atsvc.pc',
 	vnum='0.0.1',
-	public_deps='dcerpc ndr-standard',
+	public_deps='dcerpc ndr-standard RPC_NDR_ATSVC',
 	public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h',
 	header_path='gen_ndr'
 	)


-- 
Samba Shared Repository