diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-08-30 02:45:03 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-08-30 02:45:03 +0000 |
| commit | 429a7bae7686f5bad05bd91e5669e9affc37b949 (patch) | |
| tree | 96eb9e3096947fa60e63faf583e3eea8b7cea88e | |
| parent | 6ab3f45adffdb26029164835fd1917f95dd078bb (diff) | |
| download | krb5-429a7bae7686f5bad05bd91e5669e9affc37b949.tar.gz krb5-429a7bae7686f5bad05bd91e5669e9affc37b949.tar.xz krb5-429a7bae7686f5bad05bd91e5669e9affc37b949.zip | |
init_sec_context.c (krb5_gss_init_sec_context): Remove duplicated
cleanup code.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6636 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/init_sec_context.c | 24 |
2 files changed, 5 insertions, 23 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 6d378f878..4074450e7 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 29 22:38:54 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> + + * init_sec_context.c (krb5_gss_init_sec_context): Remove + duplicated cleanup code. Tue Aug 29 17:48:40 EDT 1995 Paul Park (pjpark@mit.edu) * {accept,init}_sec_context.c - Zero out the newly allocated context diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 2bf413f5c..74ae24412 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -98,7 +98,7 @@ make_ap_req(context, auth_context, cred, server, endtime, chan_bindings, /* call mk_req. subkey and ap_req need to be used or destroyed */ - mk_req_flags |= AP_OPTS_USE_SUBKEY; + mk_req_flags = AP_OPTS_USE_SUBKEY; if (do_mutual) mk_req_flags |= AP_OPTS_MUTUAL_REQUIRED; @@ -449,28 +449,6 @@ krb5_gss_init_sec_context(context, minor_status, claimant_cred_handle, } } - /* store away the sequence number */ - ctx->seq_recv = ap_rep_data->seq_number; - - /* free the ap_rep_data */ - krb5_free_ap_rep_enc_part(context, ap_rep_data); - - /* set established */ - ctx->established = 1; - - /* set returns */ - - if (time_rec) { - if (code = krb5_timeofday(context, &now)) { - (void)krb5_gss_delete_sec_context(context, minor_status, - (gss_ctx_id_t) ctx, - NULL); - *minor_status = code; - return(GSS_S_FAILURE); - } - *time_rec = ctx->endtime - now; - } - if (ret_flags) *ret_flags = GSS_C_CONF_FLAG | GSS_C_INTEG_FLAG | GSS_C_MUTUAL_FLAG; |