credentials: Rename library to samba-credentials to avoid name clashes.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu Aug 18 22:16:38 CEST 2011 on sn-devel-104

5 files changed, 14 insertions, 14 deletions

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',
 	)