diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-21 15:05:28 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-22 02:51:10 +0100 |
| commit | a12239b131135e6ff0224d98be6feb4d3158410f (patch) | |
| tree | 21dc09543f8e200857e92503b48b6564de9830c8 | |
| parent | 84b235fbb2889c8031851de5678c17bc538e1e55 (diff) | |
| download | samba-a12239b131135e6ff0224d98be6feb4d3158410f.tar.gz samba-a12239b131135e6ff0224d98be6feb4d3158410f.tar.bz2 samba-a12239b131135e6ff0224d98be6feb4d3158410f.zip | |
s4-waf: rename smbpasswd library to smbpasswdparser
this removes a conflict with the s3 smbpasswd binary
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/wscript_build | 2 | ||||
| -rw-r--r-- | source4/libnet/wscript_build | 2 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index d639a221b4..5925165afd 100644 --- 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 51ac747f4d..98248c9e17 100644 --- 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 bf65b3a4f3..ded944a0f0 100644 --- 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 d6660bea63..92e0be90db 100644 --- 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 ) |