svn commit: lorikeet r349 - in trunk/heimdal/lib/gssapi: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-22 10:23:36 +0000 (Wed, 22 Jun 2005)
New Revision: 349

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=349

Log:
Thanks to Maurice Massar <massar at unix-ag.uni-kl.de> for pointing out
that I forgot to commit this cludge function, which simply sets the
global gssapi_krb5_keytab variable.

This allows an in-memory keytab to be used by GSSAPI.

Andrew Bartlett


Modified:
   trunk/heimdal/lib/gssapi/accept_sec_context.c
   trunk/heimdal/lib/gssapi/gssapi.h


Changeset:
Modified: trunk/heimdal/lib/gssapi/accept_sec_context.c
===================================================================
--- trunk/heimdal/lib/gssapi/accept_sec_context.c	2005-06-22 02:09:49 UTC (rev 348)
+++ trunk/heimdal/lib/gssapi/accept_sec_context.c	2005-06-22 10:23:36 UTC (rev 349)
@@ -72,6 +72,27 @@
     return GSS_S_COMPLETE;
 }
 
+OM_uint32
+gsskrb5_register_acceptor_keytab (krb5_keytab keytab)
+{
+    krb5_error_code ret;
+
+    ret = gssapi_krb5_init();
+    if(ret)
+	return GSS_S_FAILURE;
+    
+    HEIMDAL_MUTEX_lock(&gssapi_keytab_mutex);
+
+    if(gssapi_krb5_keytab != NULL) {
+	krb5_kt_close(gssapi_krb5_context, gssapi_krb5_keytab);
+	gssapi_krb5_keytab = NULL;
+    }
+    gssapi_krb5_keytab = keytab;
+    HEIMDAL_MUTEX_unlock(&gssapi_keytab_mutex);
+
+    return GSS_S_COMPLETE;
+}
+
 void
 gsskrb5_is_cfx(gss_ctx_id_t context_handle, int *is_cfx)
 {

Modified: trunk/heimdal/lib/gssapi/gssapi.h
===================================================================
--- trunk/heimdal/lib/gssapi/gssapi.h	2005-06-22 02:09:49 UTC (rev 348)
+++ trunk/heimdal/lib/gssapi/gssapi.h	2005-06-22 10:23:36 UTC (rev 349)
@@ -772,6 +772,8 @@
 
 OM_uint32 gsskrb5_register_acceptor_identity
         (const char */*identity*/);
+OM_uint32 gsskrb5_register_acceptor_keytab
+        (struct krb5_keytab_data * /*keytab*/);
 
 OM_uint32 gss_krb5_copy_ccache
 	(OM_uint32 */*minor*/,