From: Damien Miller <djm@mindrot.org>
Date: Tue, 11 Aug 2015 03:33:24 +0000 (+1000)
Subject: Don't resend username to PAM; it already has it.
X-Git-Tag: V_7_0_P1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4697fe9a28dab7255c60433e4dd23cf7fce8a8b;p=thirdparty%2Fopenssh-portable.git

Don't resend username to PAM; it already has it.

Pointed out by Moritz Jodeit; ok dtucker@
---

diff --git a/monitor.c b/monitor.c
index b4109657e..f1b873dc4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
 int
 mm_answer_pam_init_ctx(int sock, Buffer *m)
 {
-
 	debug3("%s", __func__);
-	authctxt->user = buffer_get_string(m, NULL);
 	sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
 	sshpam_authok = NULL;
 	buffer_clear(m);
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e6217b3d4..eac421ba1 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
 
 	debug3("%s", __func__);
 	buffer_init(&m);
-	buffer_put_cstring(&m, authctxt->user);
 	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
 	debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
 	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);