From 045e3445a0cea796c400eacbdb28611b664ef902 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 30 Oct 2010 11:46:20 +1100
Subject: 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
---
 source4/auth/gensec/wscript_build   |  4 ++--
 source4/auth/kerberos/wscript_build | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'source4/auth')

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index ddb601a94c..902de0b152 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 4f0c8ccadd..c272d294b7 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',
 	)
 
-- 
cgit