From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 30 Oct 2010 00:46:20 +0000 (+1100)
Subject: s4-auth: make KERBEROS subsystem into authkrb5 private library
X-Git-Tag: samba-4.0.0alpha14~1553
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=045e3445a0cea796c400eacbdb28611b664ef902

s4-auth: make KERBEROS subsystem into authkrb5 private library

this fixes some double linking. The name 'KERBEROS' was also a bit
confusing, as it sounded like a base kerberos library, when it is in
fact part of auth
---

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index ddb601a94c2..902de0b1520 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 KERBEROS 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 KERBEROS'
+	deps='gssapi CREDENTIALS authkrb5'
 	)
 
 
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 4f0c8ccadd2..c272d294b7a 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -1,15 +1,16 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('KERBEROS',
-	source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
-	autoproto='proto.h',
-	public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err',
-	deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr'
-	)
+bld.SAMBA_LIBRARY('authkrb5',
+                  source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
+                  autoproto='proto.h',
+                  public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err',
+                  deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr',
+                  private_library=True
+                  )
 
 bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL',
 	autoproto='kerberos_util.h',
 	source='kerberos_util.c',
-	deps='KERBEROS com_err ldb CREDENTIALS_KRB5 SECRETS',
+	deps='authkrb5 com_err ldb CREDENTIALS_KRB5 SECRETS',
 	)
 
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index a2ed6592f33..6650f0bc6b0 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -156,7 +156,7 @@ bld.SAMBA_MODULE('ldb_password_hash',
 	subsystem='ldb',
 	init_function='LDB_MODULE(password_hash)',
 	internal_module=False,
-	deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err'
+	deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err'
 	)
 
 
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index cb8338231a6..d843fc129f1 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 authkrb5 POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp',
 	internal_module=True
 	)