summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-08-11 13:33:24 +1000
committerColin Watson <cjwatson@debian.org>2015-09-17 13:52:41 +0100
commit8d73726cdce65479aaad386c290c71176dc83e31 (patch)
treece780036c5b8660769f132ec2b69909e0e0e1dd8
parent8a07c2ecd69a0692757a08fb757a00ba7a9019bd (diff)
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
-rw-r--r--monitor.c2
-rw-r--r--monitor_wrap.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index 12ed6fd00..870a6b9e1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1143,9 +1143,7 @@ extern KbdintDevice sshpam_device;
1143int 1143int
1144mm_answer_pam_init_ctx(int sock, Buffer *m) 1144mm_answer_pam_init_ctx(int sock, Buffer *m)
1145{ 1145{
1146
1147 debug3("%s", __func__); 1146 debug3("%s", __func__);
1148 authctxt->user = buffer_get_string(m, NULL);
1149 sshpam_ctxt = (sshpam_device.init_ctx)(authctxt); 1147 sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
1150 sshpam_authok = NULL; 1148 sshpam_authok = NULL;
1151 buffer_clear(m); 1149 buffer_clear(m);
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 2a0fe9bf6..e2fcf75ff 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -632,7 +632,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
632 632
633 debug3("%s", __func__); 633 debug3("%s", __func__);
634 buffer_init(&m); 634 buffer_init(&m);
635 buffer_put_cstring(&m, authctxt->user);
636 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m); 635 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
637 debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); 636 debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
638 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m); 637 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);