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

[abartlet at samba.org]

Author: abartlet
Date: 2006-10-30 01:36:19 +0000 (Mon, 30 Oct 2006)
New Revision: 642

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

Log:
I don't think we need this samba-specific hack any more.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/gssapi/krb5/init.c


Changeset:
Modified: trunk/heimdal/lib/gssapi/krb5/init.c
===================================================================
--- trunk/heimdal/lib/gssapi/krb5/init.c	2006-10-30 01:17:34 UTC (rev 641)
+++ trunk/heimdal/lib/gssapi/krb5/init.c	2006-10-30 01:36:19 UTC (rev 642)
@@ -89,48 +89,11 @@
     return NULL;
 }
 
-#ifdef _SAMBA_BUILD_
-/* Init krb5 with an event context.  Disgusting Samba-specific hack */
-
-krb5_error_code 
-_gsskrb5_init_ev (void *event_context)
-{
-    static struct smb_krb5_context *smb_krb5_context;
-    krb5_error_code ret = 0;
-
-    HEIMDAL_MUTEX_lock(&_gsskrb5_context_mutex);
-
-    if(smb_krb5_context == NULL) {
-	ret = smb_krb5_init_context(event_context, &smb_krb5_context);
-    }
-    if (ret == 0 && !created_key) {
-	HEIMDAL_key_create(&gssapi_context_key, 
-			   gssapi_destroy_thread_context,
-			   ret);
-	if (ret) {
-	    smb_krb5_free_context(smb_krb5_context);
-	    smb_krb5_context = NULL;
-	} else
-	    created_key = 1;
-    }
-    if (ret == 0) {
-	_gsskrb5_context = smb_krb5_context->krb5_context;
-    }
-
-    HEIMDAL_MUTEX_unlock(&_gsskrb5_context_mutex);
-    return ret;
-}
-#endif
-
 krb5_error_code
 _gsskrb5_init (void)
 {
     krb5_error_code ret = 0;
 
-#ifdef _SAMBA_BUILD_
-    ret = gssapi_krb5_init_ev(NULL);
-#else 
-
     HEIMDAL_MUTEX_lock(&_gsskrb5_context_mutex);
 
     if(_gsskrb5_context == NULL)
@@ -147,6 +110,5 @@
     }
 
     HEIMDAL_MUTEX_unlock(&_gsskrb5_context_mutex);
-#endif
     return ret;
 }