diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-09-09 04:17:29 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-09-09 04:17:29 +0000 |
| commit | 9164cfe8f50c46a64b398cf3aa533047a6ecf189 (patch) | |
| tree | 137de0b1c810e6e3a16ee32a4cebbbf5926c34fb /src | |
| parent | 9c3f755c94a586496b647bbe72276feeb93722f6 (diff) | |
| download | krb5-9164cfe8f50c46a64b398cf3aa533047a6ecf189.tar.gz krb5-9164cfe8f50c46a64b398cf3aa533047a6ecf189.tar.xz krb5-9164cfe8f50c46a64b398cf3aa533047a6ecf189.zip | |
(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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 12 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/init_sec_context.c | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/krb5_gss_glue.c | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index c6811ed89..79444319c 100644 --- 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 03298646a..bcd999ae7 100644 --- 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 f6271afa7..3634cc1ea 100644 --- 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)); |