From fc6bfe24fd54b50cfa42853090b86f777a2247bf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 23 Oct 2010 16:19:23 -0700 Subject: [PATCH] s4: Rename SMBPASSWD to smbpasswd. Rename DSDB_MODULE to dsdb_module. --- source4/dsdb/samdb/ldb_modules/wscript_build | 14 +++++++------- source4/lib/samba3/wscript_build | 2 +- source4/libnet/wscript_build | 4 ++-- source4/torture/wscript_build | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 3acb16365a6..16be427d232 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -1,10 +1,10 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('DSDB_MODULE', - source=[], - deps='DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA DSDB_MODULE_HELPER_RIDALLOC', - private_library=True, - grouping_library=True) +bld.SAMBA_LIBRARY('dsdb_module', + source=[], + deps='DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA DSDB_MODULE_HELPER_RIDALLOC', + private_library=True, + grouping_library=True) bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', source='util.c acl_util.c schema_util.c', @@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam', subsystem='ldb', init_function='LDB_MODULE(samba3sam)', internal_module=False, - deps='talloc libevents ldb SMBPASSWD libsecurity NDR_SECURITY' + deps='talloc libevents ldb smbpasswd libsecurity NDR_SECURITY' ) @@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid', subsystem='ldb', init_function='LDB_MODULE(samba3sid)', internal_module=False, - deps='talloc libevents ldb SMBPASSWD libsecurity NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS' + deps='talloc libevents ldb libsecurity NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS' ) diff --git a/source4/lib/samba3/wscript_build b/source4/lib/samba3/wscript_build index d727cbb3b0e..882974a2571 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('smbpasswd', source='smbpasswd.c', deps='CHARSET libsamba-util', private_library=True diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index a5ccb57ba9e..1449ed579c8 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -3,8 +3,8 @@ bld.SAMBA_LIBRARY('libsamba-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 LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', - private_library=True + 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 LIBNDR smbpasswd PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', + private_library=True ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 30ac7e6e3bf..7b7ed580015 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 auth KERBEROS POPT_CREDENTIALS SMBPASSWD torture com_err gensec_ntlmssp', + deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp', internal_module=True ) -- 2.34.1