From 5fa63bdc96e8b20791307a024ece5df621640503 Mon Sep 17 00:00:00 2001 From: jbasney Date: Wed, 25 Sep 2002 21:57:16 +0000 Subject: [PATCH] pass in mechanism OID to ssh_gssapi_send_error() so mechglue can know which GSSAPI library to use to call gss_display_status() --- openssh/auth2-gss.c | 2 +- openssh/kexgss.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openssh/auth2-gss.c b/openssh/auth2-gss.c index 597b614..ddaf953 100644 --- a/openssh/auth2-gss.c +++ b/openssh/auth2-gss.c @@ -144,7 +144,7 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt) if (GSS_ERROR(maj_status)) { /* Failure */ - ssh_gssapi_send_error(maj_status,min_status); + ssh_gssapi_send_error(gssctxt->oid,maj_status,min_status); authctxt->postponed = 0; dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, NULL); dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); diff --git a/openssh/kexgss.c b/openssh/kexgss.c index da96461..7d18b1a 100644 --- a/openssh/kexgss.c +++ b/openssh/kexgss.c @@ -371,18 +371,18 @@ kexgss_server(Kex *kex) } while (maj_status & GSS_S_CONTINUE_NEEDED); if (GSS_ERROR(maj_status)) { - ssh_gssapi_send_error(maj_status,min_status); + ssh_gssapi_send_error(ctxt->oid,maj_status,min_status); packet_disconnect("gssapi key exchange handshake failed"); } debug("gss_complete"); if (!(ret_flags & GSS_C_MUTUAL_FLAG)) { - ssh_gssapi_send_error(maj_status,min_status); + ssh_gssapi_send_error(ctxt->oid,maj_status,min_status); packet_disconnect("gssapi mutual authentication failed"); } if (!(ret_flags & GSS_C_INTEG_FLAG)) { - ssh_gssapi_send_error(maj_status,min_status); + ssh_gssapi_send_error(ctxt->oid,maj_status,min_status); packet_disconnect("gssapi channel integrity not established"); } @@ -423,7 +423,7 @@ kexgss_server(Kex *kex) gssbuf.length = 20; /* Hashlen appears to always be 20 */ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) { - ssh_gssapi_send_error(maj_status,min_status); + ssh_gssapi_send_error(ctxt->oid,maj_status,min_status); packet_disconnect("Couldn't get MIC"); } -- 2.45.1