s4-waf: rename smbpasswd library to smbpasswdparser

this removes a conflict with the s3 smbpasswd binary

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index d639a221b498825bf8aad5592a051930088c2de2..5925165afda1aea3f288b93fa5bb4d53b69ad2f1 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -120,7 +120,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
        init_function='ldb_samba3sam_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc events ldb smbpasswd security NDR_SECURITY'
+       deps='talloc events ldb smbpasswdparser security NDR_SECURITY'
        )
 
 

diff --git a/source4/lib/samba3/wscript_build b/source4/lib/samba3/wscript_build
index 51ac747f4d82a99374c2a03795a6caaf04c8a432..98248c9e17c15d05ee219a80c7b70c14b96d618b 100644 (file)
--- a/source4/lib/samba3/wscript_build
+++ b/source4/lib/samba3/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_LIBRARY('smbpasswd',
+bld.SAMBA_LIBRARY('smbpasswdparser',
                   source='smbpasswd.c',
                   deps='samba-util',
                   private_library=True

diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index bf65b3a4f3c0624fb1ccd86b39ebf9d450c2568e..ded944a0f07bac8b09fd34c7c2820f4f7a0b69b2 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 smbpasswd 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 LIBCLI_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 d6660bea63595a24581f000a9a7bab21d5b32703..92e0be90db99d08b46823670b25da7602e9f65be 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -73,7 +73,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH',
        source='auth/ntlmssp.c auth/pac.c',
        autoproto='auth/proto.h',
        subsystem='smbtorture',
-       deps='LIBCLI_SMB gensec auth4 authkrb5 POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp',
+       deps='LIBCLI_SMB gensec auth4 authkrb5 POPT_CREDENTIALS smbpasswdparser torture com_err gensec_ntlmssp',
        internal_module=True
        )