From: Damien Miller <djm@mindrot.org>
Date: Fri, 20 Nov 2015 01:35:41 +0000 (+1100)
Subject: fix multiple authentication using S/Key w/ privsep
X-Git-Tag: V_7_2_P1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac9473580dcd401f8281305af98635cdaae9bf96;p=thirdparty%2Fopenssh-portable.git

fix multiple authentication using S/Key w/ privsep

bz#2502, patch from Kevin Korb and feandil_
---

diff --git a/monitor.c b/monitor.c
index 395a6f64e..4060a6ec9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1035,7 +1035,8 @@ mm_answer_skeyrespond(int sock, Buffer *m)
 	debug3("%s: sending authenticated: %d", __func__, authok);
 	mm_request_send(sock, MONITOR_ANS_SKEYRESPOND, m);
 
-	auth_method = "skey";
+	auth_method = "keyboard-interactive";
+	auth_submethod = "skey";
 
 	return (authok != 0);
 }