summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-21 01:05:00 +0000
committerDamien Miller <djm@mindrot.org>2019-01-21 12:05:49 +1100
commit0a5f2ea35626022299ece3c8817a1abe8cf37b3e (patch)
treec1d8374d48fe77458435e9548f0450fcb0640576 /sshconnect2.c
parent2efcf812b4c1555ca3aff744820a3b3bccd68298 (diff)
upstream: GSSAPI code got missed when converting to new packet API
OpenBSD-Commit-ID: 37e4f06ab4a0f4214430ff462ba91acba28b7851
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index f521f4a55..65d8be667 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.295 2019/01/19 21:40:21 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.296 2019/01/21 01:05:00 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -826,7 +826,7 @@ input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
826 oidv[0] != SSH_GSS_OIDTYPE || 826 oidv[0] != SSH_GSS_OIDTYPE ||
827 oidv[1] != oidlen - 2) { 827 oidv[1] != oidlen - 2) {
828 debug("Badly encoded mechanism OID received"); 828 debug("Badly encoded mechanism OID received");
829 userauth(authctxt, NULL); 829 userauth(ssh, NULL);
830 goto ok; 830 goto ok;
831 } 831 }
832 832
@@ -839,7 +839,7 @@ input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
839 if (GSS_ERROR(process_gssapi_token(ssh, GSS_C_NO_BUFFER))) { 839 if (GSS_ERROR(process_gssapi_token(ssh, GSS_C_NO_BUFFER))) {
840 /* Start again with next method on list */ 840 /* Start again with next method on list */
841 debug("Trying to start again"); 841 debug("Trying to start again");
842 userauth(authctxt, NULL); 842 userauth(ssh, NULL);
843 goto ok; 843 goto ok;
844 } 844 }
845 ok: 845 ok:
@@ -873,7 +873,7 @@ input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh)
873 873
874 /* Start again with the next method in the list */ 874 /* Start again with the next method in the list */
875 if (GSS_ERROR(status)) { 875 if (GSS_ERROR(status)) {
876 userauth(authctxt, NULL); 876 userauth(ssh, NULL);
877 /* ok */ 877 /* ok */
878 } 878 }
879 r = 0; 879 r = 0;