cli_cldap: Lowercase name.

diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build
index 9dd94c6691008b7b16f5d8cbce8f2e61b4a8224d..c6257b2ae0cf8fac064147374b6e4fb5d405f053 100644 (file)
--- a/libcli/cldap/wscript_build
+++ b/libcli/cldap/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_LIBRARY('LIBCLI_CLDAP',
+bld.SAMBA_LIBRARY('cli_cldap',
                   source='cldap.c',
                   public_deps='cli-ldap',
                   deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON',

diff --git a/source3/wscript_build b/source3/wscript_build
index 0a66d8054957794bc28ddd37b42c8303a51a7d05..992b0f13369c6570c1e73fff5bd70a5a8146eded 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -831,7 +831,7 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
 
 bld.SAMBA3_SUBSYSTEM('CLDAP',
                     source='libads/cldap.c',
-                    deps='cli-ldap-common LIBCLI_CLDAP LIBTSOCKET',
+                    deps='cli-ldap-common cli_cldap LIBTSOCKET',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SECRETS3',

diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build
index f105c0ed332516b77f00bd14ca243ef073e9ac25..6ffdb4a6bd59b58453119b4e198083b5e6526d0c 100644 (file)
--- a/source4/cldap_server/wscript_build
+++ b/source4/cldap_server/wscript_build
@@ -12,6 +12,6 @@ bld.SAMBA_MODULE('service_cldap',
 bld.SAMBA_SUBSYSTEM('CLDAPD',
        source='netlogon.c rootdse.c',
        autoproto='proto.h',
-       deps='LIBCLI_CLDAP ldbsamba'
+       deps='cli_cldap ldbsamba'
        )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index ce4eeadccee14eaf5435bb7fac2c578ccae1421c..7f3941fdf1f836ea4ad71e7a91ee8464f0fb614c 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -63,7 +63,7 @@ bld.SAMBA_SUBSYSTEM('LP_RESOLVE',
 bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
        source='finddcs_nbt.c finddcs_cldap.c',
        autoproto='finddcs_proto.h',
-       public_deps='cli-nbt MESSAGING RPC_NDR_IRPC LIBCLI_CLDAP'
+       public_deps='cli-nbt MESSAGING RPC_NDR_IRPC cli_cldap'
        )
 
 

diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index ded944a0f07bac8b09fd34c7c2820f4f7a0b69b2..eb3e079cefa14e36b1b5dedc5d4e5a017497cf8a 100644 (file)
--- a/source4/libnet/wscript_build
+++ b/source4/libnet/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_LIBRARY('samba-net',
        source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c',
        autoproto='libnet_proto.h',
-       public_deps='credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err',
+       public_deps='credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err',
        private_library=True
        )
 

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index fbae17ee61f095e186c7dbd89dc672f111aea604..b3826d6b3847efe78cf8579c53d2aaeeda3f8ef0 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -102,7 +102,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX',
 bld.SAMBA_MODULE('TORTURE_LDAP',
        source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c',
        subsystem='smbtorture',
-       deps='cli-ldap LIBCLI_CLDAP samdb POPT_CREDENTIALS torture ldbsamba',
+       deps='cli-ldap cli_cldap samdb POPT_CREDENTIALS torture ldbsamba',
        internal_module=True,
        autoproto='ldap/proto.h',
        init_function='torture_ldap_init'