From 4217734a51adbcdf3dcf45599e119247958802af Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 7 Nov 2010 02:05:51 +0100 Subject: credentials: Lowercase library name, Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun Nov 7 01:48:44 UTC 2010 on sn-devel-104 --- source4/auth/credentials/wscript_build | 20 ++++++++++---------- source4/auth/gensec/wscript_build | 10 +++++----- source4/auth/ntlm/wscript_build | 2 +- source4/auth/ntlmssp/wscript_build | 2 +- source4/auth/wscript_build | 6 +++--- source4/dsdb/samdb/ldb_modules/wscript_build | 2 +- source4/dsdb/wscript_build | 2 +- source4/kdc/wscript_build | 18 +++++++++--------- source4/ldap_server/wscript_build | 2 +- source4/lib/cmdline/wscript_build | 4 ++-- source4/lib/ldb-samba/wscript_build | 2 +- source4/libcli/wscript_build | 4 ++-- source4/libnet/wscript_build | 2 +- source4/librpc/wscript_build | 2 +- source4/ntvfs/posix/wscript_build | 2 +- source4/ntvfs/wscript_build | 2 +- source4/smb_server/smb/wscript_build | 2 +- source4/smbd/wscript_build | 4 ++-- source4/torture/drs/wscript_build | 2 +- 19 files changed, 45 insertions(+), 45 deletions(-) diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build index b116e44315..6fb1a68098 100644 --- a/source4/auth/credentials/wscript_build +++ b/source4/auth/credentials/wscript_build @@ -1,16 +1,16 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('CREDENTIALS', - source='credentials.c', - autoproto='credentials_proto.h', - public_headers='credentials.h', - deps='LIBCRYPTO errors events LIBCLI_AUTH security CREDENTIALS_SECRETS CREDENTIALS_KRB5', - private_library=True - ) +bld.SAMBA_LIBRARY('credentials', + source='credentials.c', + autoproto='credentials_proto.h', + public_headers='credentials.h', + deps='LIBCRYPTO errors events LIBCLI_AUTH security CREDENTIALS_SECRETS CREDENTIALS_KRB5', + private_library=True + ) bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5', source='credentials_krb5.c', - deps='KERBEROS_UTIL gssapi CREDENTIALS', + deps='KERBEROS_UTIL gssapi credentials', public_deps='com_err authkrb5', ) @@ -21,11 +21,11 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_SECRETS', bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM', source='credentials_ntlm.c', - deps='CREDENTIALS') + deps='credentials') bld.SAMBA_PYTHON('pycredentials', source='pycredentials.c', - public_deps='CREDENTIALS cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS', + public_deps='credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS', realname='samba/credentials.so' ) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index dff6dc6fab..e0a518e1ee 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -14,7 +14,7 @@ bld.SAMBA_MODULE('gensec_krb5', source='gensec_krb5.c', subsystem='gensec', init_function='gensec_krb5_init', - deps='CREDENTIALS authkrb5 auth_session com_err', + deps='credentials authkrb5 auth_session com_err', internal_module=False, ) @@ -23,7 +23,7 @@ bld.SAMBA_MODULE('gensec_gssapi', source='gensec_gssapi.c', subsystem='gensec', init_function='gensec_gssapi_init', - deps='gssapi CREDENTIALS authkrb5 com_err' + deps='gssapi credentials authkrb5 com_err' ) @@ -31,7 +31,7 @@ bld.SAMBA_MODULE('cyrus_sasl', source='cyrus_sasl.c', subsystem='gensec', init_function='gensec_sasl_init', - deps='CREDENTIALS sasl2', + deps='credentials sasl2', enabled=bld.CONFIG_SET('HAVE_SASL') ) @@ -41,14 +41,14 @@ bld.SAMBA_MODULE('gensec_spnego', autoproto='spnego_proto.h', subsystem='gensec', init_function='gensec_spnego_init', - deps='ASN1_UTIL CREDENTIALS' + deps='ASN1_UTIL credentials' ) bld.SAMBA_MODULE('gensec_schannel', source='schannel.c ../../../libcli/auth/schannel_sign.c', subsystem='gensec', - deps='COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS ndr auth_session', + deps='COMMON_SCHANNELDB NDR_SCHANNEL credentials ndr auth_session', internal_module=True, autoproto='schannel_proto.h', init_function='gensec_schannel_init' diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index 4538ba4a3a..3dc9b97054 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -57,7 +57,7 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS', bld.SAMBA_LIBRARY('auth', source='auth.c auth_util.c auth_simple.c', autoproto='auth_proto.h', - deps='samba-util security samdb CREDENTIALS UTIL_TEVENT', + deps='samba-util security samdb credentials UTIL_TEVENT', private_library=True ) diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build index 07ab11c85b..0f18183e65 100644 --- a/source4/auth/ntlmssp/wscript_build +++ b/source4/auth/ntlmssp/wscript_build @@ -10,7 +10,7 @@ bld.SAMBA_MODULE('gensec_ntlmssp', autoproto='proto.h', subsystem='gensec', init_function='gensec_ntlmssp_init', - deps='MSRPC_PARSE CREDENTIALS NDR_NTLMSSP', + deps='MSRPC_PARSE credentials NDR_NTLMSSP', internal_module=True ) diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index 178d67a14c..700a4a9ae4 100644 --- a/source4/auth/wscript_build +++ b/source4/auth/wscript_build @@ -9,7 +9,7 @@ bld.RECURSE('credentials') bld.SAMBA_SUBSYSTEM('auth_session', source='session.c', autoproto='session_proto.h', - public_deps='CREDENTIALS', + public_deps='credentials', public_headers='session.h', header_path='samba', deps='samdb auth_sam' @@ -18,14 +18,14 @@ bld.SAMBA_SUBSYSTEM('auth_session', bld.SAMBA_SUBSYSTEM('samba_server_gensec', source='samba_server_gensec.c', - public_deps='CREDENTIALS gensec auth' + public_deps='credentials gensec auth' ) bld.SAMBA_SUBSYSTEM('auth_system_session', source='system_session.c', autoproto='system_session_proto.h', - public_deps='CREDENTIALS', + public_deps='credentials', deps='auth_session', ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 0d092c2f49..360f4a45b6 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -240,7 +240,7 @@ bld.SAMBA_MODULE('ldb_update_keytab', init_function='ldb_update_keytab_module_init', module_init_name='ldb_init_module', internal_module=False, - deps='talloc events CREDENTIALS ldb com_err KERBEROS_UTIL' + deps='talloc events credentials ldb com_err KERBEROS_UTIL' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 2622e75a72..573b36129d 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -7,7 +7,7 @@ bld.SAMBA_LIBRARY('samdb', autoproto='samdb/samdb_proto.h', private_library=True, public_deps='krb5', - 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 LIBCLI_LDAP_NDR samba-util com_err authkrb5 credentials ldbwrap', ) diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index a934087e90..28552752de 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -11,7 +11,7 @@ bld.SAMBA_MODULE('KDC', bld.SAMBA_SUBSYSTEM('HDB_SAMBA4', source='hdb-samba4.c', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db-glue samba-hostconfig com_err', + deps='ldb auth_sam auth_sam_reply credentials hdb db-glue samba-hostconfig com_err', includes='../heimdal/kdc', local_include=False ) @@ -21,7 +21,7 @@ bld.SAMBA_SUBSYSTEM('WDC_SAMBA4', source='wdc-samba4.c', local_include_first=False, includes='../heimdal/kdc', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb PAC_GLUE samba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply credentials hdb PAC_GLUE samba-hostconfig com_err' ) @@ -29,20 +29,20 @@ bld.SAMBA_SUBSYSTEM('PAC_GLUE', source='pac-glue.c', local_include_first=False, includes='../heimdal/kdc', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb samba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply credentials hdb samba-hostconfig com_err' ) bld.SAMBA_LIBRARY('pac', - source=[], - deps='PAC_GLUE', - private_library=True, - grouping_library=True) + source=[], + deps='PAC_GLUE', + private_library=True, + grouping_library=True) bld.SAMBA_LIBRARY('db-glue', source='db-glue.c', local_include=False, - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb samba-hostconfig com_err', + deps='ldb auth_sam auth_sam_reply credentials hdb samba-hostconfig com_err', private_library=True ) @@ -50,7 +50,7 @@ bld.SAMBA_LIBRARY('db-glue', bld.SAMBA_SUBSYSTEM('MIT_SAMBA', source='mit_samba.c', local_include=False, - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db-glue PAC_GLUE samba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply credentials hdb db-glue PAC_GLUE samba-hostconfig com_err' ) diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build index 75edb17517..f089c5e2a5 100644 --- a/source4/ldap_server/wscript_build +++ b/source4/ldap_server/wscript_build @@ -6,6 +6,6 @@ bld.SAMBA_MODULE('LDAP', autoproto='proto.h', subsystem='service', init_function='server_service_ldap_init', - deps='CREDENTIALS cli-ldap samdb process_model gensec samba-hostconfig samba_server_gensec' + deps='credentials cli-ldap samdb process_model gensec samba-hostconfig samba_server_gensec' ) diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build index f35e0604c7..c55c808703 100644 --- a/source4/lib/cmdline/wscript_build +++ b/source4/lib/cmdline/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('cmdline-credentials', source='credentials.c', autoproto='credentials.h', - public_deps='CREDENTIALS popt', + public_deps='credentials popt', private_library=True) bld.SAMBA_SUBSYSTEM('POPT_SAMBA', @@ -17,7 +17,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA', bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS', source='popt_credentials.c', autoproto='popt_credentials.h', - public_deps='CREDENTIALS CREDENTIALS_SECRETS cmdline-credentials popt', + public_deps='credentials CREDENTIALS_SECRETS cmdline-credentials popt', deps='samba-util' ) diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index 115d2bf501..f7bd81c097 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -38,6 +38,6 @@ bld.SAMBA_MODULE('ldb_ildap', source='ldb_ildap.c', init_function='ldb_ildap_init', module_init_name='ldb_init_module', - deps='talloc cli-ldap CREDENTIALS auth_system_session', + deps='talloc cli-ldap credentials auth_system_session', internal_module=False, subsystem='ldb') diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 01bd64cfc9..a691c876d0 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -37,8 +37,8 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE', bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE', source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c', autoproto='smb_composite/proto.h', - deps='LIBCLI_SMB2', - public_deps='LIBCLI_COMPOSITE CREDENTIALS gensec LIBCLI_RESOLVE' + deps='LIBCLI_SMB2', + public_deps='LIBCLI_COMPOSITE credentials gensec LIBCLI_RESOLVE' ) diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index 7417afe06a..bf65b3a4f3 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 smbpasswd PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', private_library=True ) diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 39e4999780..e7f5267d81 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -193,7 +193,7 @@ bld.SAMBA_LIBRARY('dcerpc', pc_files='dcerpc.pc', deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', autoproto='rpc/dcerpc_proto.h', - public_deps='CREDENTIALS tevent talloc', + public_deps='credentials tevent talloc', public_headers='../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h', header_path='gen_ndr', vnum='0.0.1' diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index b2f71fff6c..5945ed95de 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -41,7 +41,7 @@ bld.SAMBA_MODULE('ntvfs_posix', bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='ndr ldb samdb CREDENTIALS pyparam_util wrap_xattr attr', + deps='ndr ldb samdb credentials pyparam_util wrap_xattr attr', realname='samba/xattr_native.so' ) diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index e181334fcc..d020465f1b 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -52,7 +52,7 @@ bld.SAMBA_MODULE('ntvfs_ipc', autoproto='ipc/proto.h', subsystem='ntvfs', init_function='ntvfs_ipc_init', - deps='NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi CREDENTIALS DCERPC_SHARE' + deps='NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials DCERPC_SHARE' ) diff --git a/source4/smb_server/smb/wscript_build b/source4/smb_server/smb/wscript_build index 7a3dd5ec20..37c933aceb 100644 --- a/source4/smb_server/smb/wscript_build +++ b/source4/smb_server/smb/wscript_build @@ -3,6 +3,6 @@ bld.SAMBA_SUBSYSTEM('SMB_PROTOCOL', source='receive.c negprot.c nttrans.c reply.c request.c search.c service.c sesssetup.c srvtime.c trans2.c signing.c', autoproto='smb_proto.h', - public_deps='ntvfs LIBPACKET CREDENTIALS samba_server_gensec' + public_deps='ntvfs LIBPACKET credentials samba_server_gensec' ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 40dab4a48b..3a590499d5 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -3,14 +3,14 @@ bld.SAMBA_LIBRARY('service', source='service.c service_stream.c service_named_pipe.c service_task.c', autoproto='service_proto.h', - deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi CREDENTIALS LIBTSOCKET LIBSAMBA_TSOCKET process_model', + deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model', private_library=True ) bld.SAMBA_SUBSYSTEM('PIDFILE', source='pidfile.c', - deps='talloc', + deps='talloc', autoproto='pidfile.h' ) diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build index 9d4d321633..90b6b2f5f0 100644 --- a/source4/torture/drs/wscript_build +++ b/source4/torture/drs/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS', autoproto='proto.h', subsystem='smbtorture', init_function='torture_drs_init', - deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS CREDENTIALS samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', + deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', internal_module=True ) -- cgit