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

Pointed out by Moritz Jodeit; ok dtucker@

Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=d4697fe9a28dab7255c60433e4dd23cf7fce8a8b
Forwarded: not-needed
Last-Update: 2015-08-19

Patch-Name: backport-do-not-resend-username-to-pam.patch

2 files changed, 0 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index 3a3d2f03b..3fc9253e4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1127,9 +1127,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 6ae72a03b..679991178 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -632,7 +632,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);