r23456: Update Samba4 to current lorikeet-heimdal.

[jelmer/samba4-debian.git] / source / heimdal / lib / gssapi / mech / gss_import_sec_context.c

diff --git a/source/heimdal/lib/gssapi/mech/gss_import_sec_context.c b/source/heimdal/lib/gssapi/mech/gss_import_sec_context.c
index 5466f97cf4a6028013de923a97d12be59eb2b068..44ca1b2677bad5964e7102ccb20de57ba2d17081 100644 (file)
--- a/source/heimdal/lib/gssapi/mech/gss_import_sec_context.c
+++ b/source/heimdal/lib/gssapi/mech/gss_import_sec_context.c
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_import_sec_context.c,v 1.2 2006/06/28 09:00:25 lha Exp $");
+RCSID("$Id: gss_import_sec_context.c 19956 2007-01-17 12:04:16Z lha $");
 
 OM_uint32
 gss_import_sec_context(OM_uint32 *minor_status,
@@ -43,7 +43,7 @@ gss_import_sec_context(OM_uint32 *minor_status,
        size_t len;
 
        *minor_status = 0;
-       *context_handle = 0;
+       *context_handle = GSS_C_NO_CONTEXT;
 
        /*
         * We added an oid to the front of the token in
@@ -73,6 +73,7 @@ gss_import_sec_context(OM_uint32 *minor_status,
        major_status = m->gm_import_sec_context(minor_status,
            &buf, &ctx->gc_ctx);
        if (major_status != GSS_S_COMPLETE) {
+               _gss_mg_error(m, major_status, *minor_status);
                free(ctx);
        } else {
                *context_handle = (gss_ctx_id_t) ctx;