diff options
author | Damien Miller <djm@mindrot.org> | 2015-08-11 13:33:24 +1000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-09-08 14:50:02 +0100 |
commit | 7de26a97986c8032bf1869347a2ceaee1d64f857 (patch) | |
tree | 2edc44a8eb12af976dd937508e6e2db248496022 | |
parent | 7c2583f26ff8eb848c53255a88574f923edaf94d (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.c | 2 | ||||
-rw-r--r-- | monitor_wrap.c | 1 |
2 files changed, 0 insertions, 3 deletions
@@ -1143,9 +1143,7 @@ extern KbdintDevice sshpam_device; | |||
1143 | int | 1143 | int |
1144 | mm_answer_pam_init_ctx(int sock, Buffer *m) | 1144 | mm_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); |