segv bug fix: gss_accept_sec_context() returns a read-only pointer to the

mech OID, so we shouldn't stash it in our Gssctxt object where we expect
a pointer to an xmalloc'ed object

diff --git a/openssh/gss-genr.c b/openssh/gss-genr.c
index 2fff35ae528d29e672b6b8207fb036a41b6c1a73..334536e0ab19ad4bf69808908507debd929c8fae 100644 (file)
--- a/openssh/gss-genr.c
+++ b/openssh/gss-genr.c
@@ -398,6 +398,7 @@ OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok,
                                gss_buffer_desc *send_tok, OM_uint32 *flags) 
 {
        OM_uint32 maj_status, min_status;
+       gss_OID mech;
        
        maj_status=gss_accept_sec_context(&min_status,
                                          &ctx->context,
@@ -405,7 +406,7 @@ OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok,
                                          recv_tok,
                                          GSS_C_NO_CHANNEL_BINDINGS,
                                          &ctx->client,
-                                         &ctx->oid,
+                                         &mech, /* read-only pointer */
                                          send_tok,
                                          flags,
                                          NULL,