From: Luke Howard <lukeh@padl.com>
Date: Tue, 25 Aug 2009 18:14:57 +0000 (+0000)
Subject: don't copy auth data context, take ownership of it from auth context
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a171754c7821685f024534d76230db452b29599f;p=thirdparty%2Fkrb5.git

don't copy auth data context, take ownership of it from auth context

git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/authdata@22602 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 99b588e6a4..098edd6b59 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -827,11 +827,14 @@ kg_accept_krb5(minor_status, context_handle,
         goto fail;
     }
     if ((code = kg_init_name(context, authdat->client,
-                             ad_context, 0, &ctx->there))) {
+                             ad_context, KG_INIT_NAME_NO_COPY, &ctx->there))) {
         major_status = GSS_S_FAILURE;
         goto fail;
     }
+    /* Now owned by ctx->there */
     authdat->client = NULL;
+    if (ad_context != NULL)
+        krb5_auth_con_set_authdata_context(context, auth_context, NULL);
 
     if ((code = krb5_auth_con_getrecvsubkey(context, auth_context,
                                             &ctx->subkey))) {
diff --git a/src/lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c
index 07718d4d07..ee9f7915ee 100644
--- a/src/lib/krb5/krb/authdata.c
+++ b/src/lib/krb5/krb/authdata.c
@@ -28,6 +28,8 @@
 #include "authdata.h"
 #include "auth_con.h"
 
+#define DEBUG 1
+
 /* Based on preauth2.c */
 
 #if TARGET_OS_MAC