(gss_delete_sec_context): Add extra indirection so that we actually

fetch the context correctly.

(gss_accept_sec_context): Remove unused code.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6744 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index c6811ed89fe203c71b77d5383ab80cb92ae37fa4..79444319c49212ac9390b14a69fe76068ec9d8c5 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,15 @@
+Sat Sep  9 00:16:34 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * krb5_gss_glue.c (gss_delete_sec_context): Add extra indirection
+               so that we actually fetch the context correctly.
+               (gss_accept_sec_context): Remove unused code.
+
+Wed Sep  6 16:12:28 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * init_sec_context.c (make_ap_req): Initialize mk_req_flags to
+               zero so that when we OR in flags, the result is
+               well-defined. 
+
 Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
 
         * accept_sec_context.c, init_sec_context.c, util.c : 

diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index 03298646ad3a850084f1bbdb4bcf64ba4a3f4eb0..bcd999ae70ce118cfc5ddc9113670e4cd3460d80 100644 (file)
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -36,7 +36,7 @@ make_ap_req(context, auth_context, cred, server, endtime, chan_bindings,
     krb5_flags *flags;
     gss_buffer_t token;
 {
-    krb5_flags mk_req_flags;
+    krb5_flags mk_req_flags = 0;
     krb5_error_code code;
     krb5_data checksum_data;
     krb5_checksum md5;

diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index f6271afa759a405d3f7cf3eae882c41493bd0a56..3634cc1ea589ce6f6e7af7fb24f0aaaa46ffbd2a 100644 (file)
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -38,16 +38,12 @@ gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
      OM_uint32 *time_rec;
      gss_cred_id_t *delegated_cred_handle;
 {
-   krb5_gss_ctx_id_t * ctx;
-
    /* validate the context handle */
    if (! kg_validate_ctx_id(context_handle)) {
       *minor_status = (OM_uint32) G_VALIDATE_FAILED;
       return(GSS_S_NO_CONTEXT);
    }
 
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
    if (!kg_context && kg_get_context())
           return GSS_S_FAILURE;
 
@@ -185,7 +181,7 @@ gss_delete_sec_context(minor_status, context_handle, output_token)
       return(GSS_S_NO_CONTEXT);
    }
 
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
+   ctx = (krb5_gss_ctx_id_rec *) *context_handle;
 
    return(krb5_gss_delete_sec_context(ctx->context, minor_status,
                                      context_handle, output_token));