From 292fe7497134a9cc8f05844951547a2e8d14a4ac Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 18 Aug 2011 20:43:00 +0200 Subject: credentials: Rename library to samba-credentials to avoid name clashes. Autobuild-User: Jelmer Vernooij Autobuild-Date: Thu Aug 18 22:16:38 CEST 2011 on sn-devel-104 --- source4/auth/credentials/wscript_build | 8 ++++---- 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 | 10 +++++----- source4/ldap_server/wscript_build | 2 +- source4/lib/cmdline/wscript_build | 4 ++-- 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 | 2 +- source4/torture/drs/wscript_build | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) (limited to 'source4') diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build index 99de466be3..c708e7e574 100644 --- a/source4/auth/credentials/wscript_build +++ b/source4/auth/credentials/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('credentials', +bld.SAMBA_LIBRARY('samba-credentials', source='credentials.c', autoproto='credentials_proto.h', public_headers='credentials.h', @@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('credentials', bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5', source='credentials_krb5.c', - deps='KERBEROS_UTIL gssapi credentials', + deps='KERBEROS_UTIL gssapi samba-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='samba-credentials') bld.SAMBA_PYTHON('pycredentials', source='pycredentials.c', - public_deps='credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS', + public_deps='samba-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 94244191eb..be325027a3 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -13,7 +13,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='samba-credentials authkrb5 auth_session com_err', internal_module=False, ) @@ -22,7 +22,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 samba-credentials authkrb5 com_err' ) @@ -30,7 +30,7 @@ bld.SAMBA_MODULE('cyrus_sasl', source='cyrus_sasl.c', subsystem='gensec', init_function='gensec_sasl_init', - deps='credentials sasl2', + deps='samba-credentials sasl2', enabled=bld.CONFIG_SET('HAVE_SASL') ) @@ -40,14 +40,14 @@ bld.SAMBA_MODULE('gensec_spnego', autoproto='spnego_proto.h', subsystem='gensec', init_function='gensec_spnego_init', - deps='asn1util credentials SPNEGO_PARSE' + deps='asn1util samba-credentials SPNEGO_PARSE' ) bld.SAMBA_MODULE('gensec_schannel', source='schannel.c', subsystem='gensec', - deps='COMMON_SCHANNEL NDR_SCHANNEL credentials ndr auth_session', + deps='COMMON_SCHANNEL NDR_SCHANNEL samba-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 b8634c8944..48f28f5775 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -51,7 +51,7 @@ bld.SAMBA_MODULE('auth4_unix', bld.SAMBA_LIBRARY('auth4', source='auth.c auth_util.c auth_simple.c', autoproto='auth_proto.h', - deps='samba-util security samdb credentials tevent-util LIBWBCLIENT_OLD auth_unix_token', + deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token', private_library=True ) diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build index 9c25aa10ed..adbb1fa957 100644 --- a/source4/auth/ntlmssp/wscript_build +++ b/source4/auth/ntlmssp/wscript_build @@ -6,7 +6,7 @@ bld.SAMBA_MODULE('gensec_ntlmssp', autoproto='proto.h', subsystem='gensec', init_function='gensec_ntlmssp_init', - deps='credentials NTLMSSP_COMMON', + deps='samba-credentials NTLMSSP_COMMON', internal_module=True ) diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index f7535c4145..91ec1ebca1 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='samba-credentials', public_headers='session.h', header_path='samba', deps='samdb auth4_sam' @@ -24,14 +24,14 @@ bld.SAMBA_SUBSYSTEM('auth_unix_token', bld.SAMBA_SUBSYSTEM('samba_server_gensec', source='samba_server_gensec.c', - public_deps='credentials gensec auth4' + public_deps='samba-credentials gensec auth4' ) bld.SAMBA_SUBSYSTEM('auth_system_session', source='system_session.c', autoproto='system_session_proto.h', - public_deps='credentials', + public_deps='samba-credentials', deps='auth_session', ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 3212039ff9..87e915d12b 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -220,7 +220,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 credentials ldb com_err KERBEROS_UTIL DSDB_MODULE_HELPERS' + deps='talloc samba-credentials ldb com_err KERBEROS_UTIL DSDB_MODULE_HELPERS' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index fe00059c4b..1180410e18 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samdb', autoproto='samdb/samdb_proto.h', public_deps='krb5', vnum='0.0.1', - deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap errors', + deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 samba-credentials ldbwrap errors', ) diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index 2d633ad6a7..aec1cb28d9 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -11,7 +11,7 @@ bld.SAMBA_MODULE('service_kdc', bld.SAMBA_SUBSYSTEM('HDB_SAMBA4', source='hdb-samba4.c', - deps='ldb auth4_sam auth_sam_reply credentials hdb db-glue samba-hostconfig com_err', + deps='ldb auth4_sam auth_sam_reply samba-credentials hdb db-glue samba-hostconfig com_err', includes='../heimdal/kdc', ) @@ -19,14 +19,14 @@ bld.SAMBA_SUBSYSTEM('HDB_SAMBA4', bld.SAMBA_SUBSYSTEM('WDC_SAMBA4', source='wdc-samba4.c', includes='../heimdal/kdc', - deps='ldb auth4_sam auth_sam_reply credentials hdb PAC_GLUE samba-hostconfig com_err' + deps='ldb auth4_sam auth_sam_reply samba-credentials hdb PAC_GLUE samba-hostconfig com_err' ) bld.SAMBA_SUBSYSTEM('PAC_GLUE', source='pac-glue.c', includes='../heimdal/kdc', - deps='ldb auth4_sam auth_sam_reply credentials hdb samba-hostconfig com_err' + deps='ldb auth4_sam auth_sam_reply samba-credentials hdb samba-hostconfig com_err' ) bld.SAMBA_LIBRARY('pac', @@ -38,7 +38,7 @@ bld.SAMBA_LIBRARY('pac', bld.SAMBA_LIBRARY('db-glue', source='db-glue.c', - deps='ldb auth4_sam auth_sam_reply credentials hdb samba-hostconfig com_err kdc-policy', + deps='ldb auth4_sam auth_sam_reply samba-credentials hdb samba-hostconfig com_err kdc-policy', private_library=True, includes='../heimdal/kdc', ) @@ -53,7 +53,7 @@ bld.SAMBA_LIBRARY('kdc-policy', bld.SAMBA_SUBSYSTEM('MIT_SAMBA', source='mit_samba.c', - deps='ldb auth4_sam auth_sam_reply credentials hdb db-glue PAC_GLUE samba-hostconfig com_err' + deps='ldb auth4_sam auth_sam_reply samba-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 90012aad6b..743facc34a 100644 --- a/source4/ldap_server/wscript_build +++ b/source4/ldap_server/wscript_build @@ -6,7 +6,7 @@ bld.SAMBA_MODULE('service_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='samba-credentials cli-ldap samdb process_model gensec samba-hostconfig samba_server_gensec', internal_module=False, ) diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build index c55c808703..fb8b3064e5 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='samba-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='samba-credentials CREDENTIALS_SECRETS cmdline-credentials popt', deps='samba-util' ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index a2bd3a64e9..cef6e32205 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -27,13 +27,13 @@ bld.SAMBA_SUBSYSTEM('cli_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', deps='LIBCLI_SMB2 tevent-util', - public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent' + public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent' ) bld.SAMBA_PYTHON('pysmb', source='pysmb.c', deps='LIBCLI_SMB_COMPOSITE LIBCLI_SMB2 tevent-util pyparam_util', - public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent', + public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent', realname='samba/smb.so' ) diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index 54c901ad0b..a30a4c36b0 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 cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', + public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_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/librpc/wscript_build b/source4/librpc/wscript_build index 8a17b6a7f2..677dd30af7 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -140,7 +140,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 smbclient-raw LP_RESOLVE tevent-util dcerpc-binding', autoproto='rpc/dcerpc_proto.h', - public_deps='credentials tevent talloc', + public_deps='samba-credentials tevent talloc', public_headers='''rpc/dcerpc.h ../../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 diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index d4e4d4ac43..84695eeafd 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -42,7 +42,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 samba-credentials pyparam_util wrap_xattr attr', realname='samba/xattr_native.so' ) diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index fa1e071395..6d554f2273 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 npa_tstream gssapi credentials DCERPC_SHARE' + deps='NDR_NAMED_PIPE_AUTH npa_tstream gssapi samba-credentials DCERPC_SHARE' ) diff --git a/source4/smb_server/smb/wscript_build b/source4/smb_server/smb/wscript_build index 37c933aceb..4004bac2d3 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 samba-credentials samba_server_gensec' ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 082ab6de46..d0eb100a64 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -3,7 +3,7 @@ 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 npa_tstream gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model', + deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH npa_tstream gssapi samba-credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model', private_library=True ) diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build index 51dd098caf..0e5578b11b 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 asn1util 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 asn1util samdb NDR_DRSBLOBS samba-credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', internal_module=True ) -- cgit