r19604: This is a massive commit, and I appologise in advance for it's size.

[samba.git] / source4 / heimdal / lib / gssapi / krb5 / init.c

diff --git a/source4/heimdal/lib/gssapi/init.c b/source4/heimdal/lib/gssapi/krb5/init.c
similarity index 62%
rename from source4/heimdal/lib/gssapi/init.c
rename to source4/heimdal/lib/gssapi/krb5/init.c
index 11d7c9bb9ff950dd6a5045aeaac34e725e62063f..cbef8740b7af058a11bfadb78645e4f4acbdf8e7 100644 (file)
--- a/source4/heimdal/lib/gssapi/init.c
+++ b/source4/heimdal/lib/gssapi/krb5/init.c
@@ -31,15 +31,11 @@
  * SUCH DAMAGE. 
  */
 
-#include "gssapi_locl.h"
+#include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: init.c,v 1.7 2003/07/22 19:50:11 lha Exp $");
+RCSID("$Id: init.c,v 1.9 2006/10/07 22:14:58 lha Exp $");
 
-#ifdef _SAMBA_BUILD_
-#include "auth/kerberos/krb5_init_context.h"
-#endif
-
-static HEIMDAL_MUTEX gssapi_krb5_context_mutex = HEIMDAL_MUTEX_INITIALIZER;
+static HEIMDAL_MUTEX _gsskrb5_context_mutex = HEIMDAL_MUTEX_INITIALIZER;
 static int created_key;
 static HEIMDAL_thread_key gssapi_context_key;
 
@@ -58,12 +54,12 @@ gssapi_destroy_thread_context(void *ptr)
 
 
 struct gssapi_thr_context *
-gssapi_get_thread_context(int createp)
+_gsskrb5_get_thread_context(int createp)
 {
     struct gssapi_thr_context *ctx;
     int ret;
 
-    HEIMDAL_MUTEX_lock(&gssapi_krb5_context_mutex);
+    HEIMDAL_MUTEX_lock(&_gsskrb5_context_mutex);
 
     if (!created_key)
        abort();
@@ -80,72 +76,36 @@ gssapi_get_thread_context(int createp)
        if (ret)
            goto fail;
     }
-    HEIMDAL_MUTEX_unlock(&gssapi_krb5_context_mutex);
+    HEIMDAL_MUTEX_unlock(&_gsskrb5_context_mutex);
     return ctx;
  fail:
-    HEIMDAL_MUTEX_unlock(&gssapi_krb5_context_mutex);
+    HEIMDAL_MUTEX_unlock(&_gsskrb5_context_mutex);
     if (ctx)
        free(ctx);
     return NULL;
 }
 
-#ifdef _SAMBA_BUILD_
-/* Init krb5 with an event context.  Disgusting Samba-specific hack */
-
-krb5_error_code 
-gssapi_krb5_init_ev (void *event_context)
+krb5_error_code
+_gsskrb5_init (void)
 {
-    static struct smb_krb5_context *smb_krb5_context;
     krb5_error_code ret = 0;
 
-    HEIMDAL_MUTEX_lock(&gssapi_krb5_context_mutex);
+    HEIMDAL_MUTEX_lock(&_gsskrb5_context_mutex);
 
-    if(smb_krb5_context == NULL) {
-       ret = smb_krb5_init_context(event_context, &smb_krb5_context);
-    }
+    if(_gsskrb5_context == NULL)
+       ret = krb5_init_context (&_gsskrb5_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;
+           krb5_free_context(_gsskrb5_context);
+           _gsskrb5_context = NULL;
        } else
            created_key = 1;
     }
-    if (ret == 0) {
-       gssapi_krb5_context = smb_krb5_context->krb5_context;
-    }
 
-    HEIMDAL_MUTEX_unlock(&gssapi_krb5_context_mutex);
-    return ret;
-}
-#endif
-
-krb5_error_code
-gssapi_krb5_init (void)
-{
-    krb5_error_code ret = 0;
-#ifdef _SAMBA_BUILD_
-    ret = gssapi_krb5_init_ev(NULL);
-#else 
-    HEIMDAL_MUTEX_lock(&gssapi_krb5_context_mutex);
-
-    if(gssapi_krb5_context == NULL) {
-       ret = krb5_init_context (&gssapi_krb5_context);
-    }
-    if (ret == 0 && !created_key) {
-       HEIMDAL_key_create(&gssapi_context_key, 
-                          gssapi_destroy_thread_context,
-                          ret);
-       if (ret) {
-           krb5_free_context(gssapi_krb5_context);
-           gssapi_krb5_context = NULL;
-       } else
-           created_key = 1;
-    }
+    HEIMDAL_MUTEX_unlock(&_gsskrb5_context_mutex);
 
-    HEIMDAL_MUTEX_unlock(&gssapi_krb5_context_mutex);
-#endif
     return ret;
 }