Imported Upstream version 1.20.1

[platform/upstream/krb5.git] / src / lib / gssapi / mechglue / g_set_context_option.c

diff --git a/src/lib/gssapi/mechglue/g_set_context_option.c b/src/lib/gssapi/mechglue/g_set_context_option.c
index 87db240..eb67a9e 100644 (file)
--- a/src/lib/gssapi/mechglue/g_set_context_option.c
+++ b/src/lib/gssapi/mechglue/g_set_context_option.c
@@ -44,12 +44,11 @@ gss_set_sec_context_option (OM_uint32 *minor_status,
 
     if (minor_status == NULL)
        return GSS_S_CALL_INACCESSIBLE_WRITE;
+    *minor_status = 0;
 
     if (context_handle == NULL)
        return GSS_S_CALL_INACCESSIBLE_WRITE;
 
-    *minor_status = 0;
-
     /*
      * select the approprate underlying mechanism routine and
      * call it.
@@ -72,36 +71,23 @@ gss_set_sec_context_option (OM_uint32 *minor_status,
                                              &internal_ctx,
                                              desired_object,
                                              value);
-    if (status == GSS_S_COMPLETE) {
-       if (ctx == NULL && internal_ctx != GSS_C_NO_CONTEXT) {
-           /* Allocate a union context handle to wrap new context */
-           ctx = (gss_union_ctx_id_t)malloc(sizeof(*ctx));
-           if (ctx == NULL) {
-               *minor_status = ENOMEM;
-               gssint_delete_internal_sec_context(&minor,
-                                                  &mech->mech_type,
-                                                  &internal_ctx,
-                                                  GSS_C_NO_BUFFER);
-               return GSS_S_FAILURE;
-           }
-
-           status = generic_gss_copy_oid(minor_status,
-                                         &mech->mech_type,
-                                         &ctx->mech_type);
-           if (status != GSS_S_COMPLETE) {
-               gssint_delete_internal_sec_context(&minor,
-                                                  ctx->mech_type,
-                                                  &internal_ctx,
-                                                  GSS_C_NO_BUFFER);
-               free(ctx);
-               return status;
-           }
+    if (status != GSS_S_COMPLETE) {
+       map_error(minor_status, mech);
+       return status;
+    }
 
-           ctx->internal_ctx_id = internal_ctx;
-           *context_handle = (gss_ctx_id_t)ctx;
+    if (ctx == NULL && internal_ctx != GSS_C_NO_CONTEXT) {
+       status = gssint_create_union_context(minor_status, &mech->mech_type,
+                                            &ctx);
+       if (status != GSS_S_COMPLETE) {
+           gssint_delete_internal_sec_context(&minor, ctx->mech_type,
+                                              &internal_ctx, GSS_C_NO_BUFFER);
+           return status;
        }
-    } else
-       map_error(minor_status, mech);
 
-    return status;
+       ctx->internal_ctx_id = internal_ctx;
+       *context_handle = (gss_ctx_id_t)ctx;
+    }
+
+    return GSS_S_COMPLETE;
 }