libcli/ldap pull LIBCLI_LDAP_MESSAGE and LIBCLI_LDAP_NDR into a library

This reduces symbol duplication

Andrew Bartlett

5 files changed, 14 insertions, 22 deletions

diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index feab6510b94..63a2de17fea 100644
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -1,17 +1,9 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
-	source='ldap_message.c',
-	public_deps='errors talloc ldb',
-	public_headers='ldap_message.h ldap_errors.h',
-	deps='samba-util asn1util'
+bld.SAMBA_LIBRARY('cli-ldap-common',
+                  source='ldap_message.c ldap_ndr.c',
+                  public_deps='errors talloc ldb',
+                  public_headers='ldap_message.h ldap_errors.h',
+                  deps='samba-util asn1util NDR_SECURITY tevent',
+                  private_library=True
 	)
-
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
-	source='ldap_ndr.c',
-	public_deps='errors talloc',
-	public_headers='ldap_ndr.h',
-	deps='samba-util ldb NDR_SECURITY tevent'
-	)
-
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 2c0416f6815..79b143507f1 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -28,7 +28,7 @@ bld.SAMBA3_MODULE('pdb_ldap',
 bld.SAMBA3_MODULE('pdb_ads',
                  subsystem='pdb',
                  source=PDB_ADS_SRC,
-                 deps='LIBCLI_LDAP_NDR TLDAP',
+                 deps='cli-ldap-common TLDAP',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ads'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 12b79447e09..300f5b38638 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -808,7 +808,7 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
                     source='libads/cldap.c',
-                    deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET',
+                    deps='cli-ldap-common LIBCLI_CLDAP LIBTSOCKET',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SECRETS3',
@@ -824,7 +824,7 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
 
 bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
-                   deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber',
+                   deps='cli-ldap-common krb5 gssapi gssapi_krb5 ldap lber',
                    private_library=True,
                    vars=locals(),
                    enabled=bld.env.HAVE_ADS)
@@ -1136,7 +1136,7 @@ bld.SAMBA3_BINARY('pdbedit',
                  source=PDBEDIT_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
                  LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP
-                 PASSWD_UTIL LIBCLI_LDAP_NDR''',
+                 PASSWD_UTIL cli-ldap-common''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbget',
@@ -1262,7 +1262,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
                  deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD
                  samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET
                  passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
-                 NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
+                 NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('timelimit',
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 364edf14b2b..83d7433c3f2 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samdb',
 	autoproto='samdb/samdb_proto.h',
 	public_deps='krb5',
 	vnum='0.0.1',
-	deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR samba-util com_err authkrb5 credentials ldbwrap',
+	deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap',
 	)
 
 
@@ -16,7 +16,7 @@ bld.SAMBA_LIBRARY('samdb-common',
 	source='common/util.c common/util_groups.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c',
 	autoproto='common/proto.h',
 	private_library=True,
-	deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket LIBCLI_LDAP_NDR flag_mapping'
+	deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket cli-ldap-common flag_mapping'
 	)
 
 
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index a7b3717543c..99b6c4e1f37 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('cli-ldap',
                   autoproto='ldap_proto.h',
                   public_deps='errors tevent LIBPACKET',
                   public_headers='libcli_ldap.h:ldap-util.h',
-                  deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR ndr LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE',
+                  deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common',
                   private_library=True
                   )