summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-08-11 13:33:24 +1000
committerDamien Miller <djm@mindrot.org>2015-08-11 13:36:00 +1000
commitd4697fe9a28dab7255c60433e4dd23cf7fce8a8b (patch)
tree200eef558da3719f9be93d763496228bd8a24eee
parent88763a6c893bf3dfe951ba9271bf09715e8d91ca (diff)
Don't resend username to PAM; it already has it.
Pointed out by Moritz Jodeit; ok dtucker@
-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 b4109657e..f1b873dc4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
1084int 1084int
1085mm_answer_pam_init_ctx(int sock, Buffer *m) 1085mm_answer_pam_init_ctx(int sock, Buffer *m)
1086{ 1086{
1087
1088 debug3("%s", __func__); 1087 debug3("%s", __func__);
1089 authctxt->user = buffer_get_string(m, NULL);
1090 sshpam_ctxt = (sshpam_device.init_ctx)(authctxt); 1088 sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
1091 sshpam_authok = NULL; 1089 sshpam_authok = NULL;
1092 buffer_clear(m); 1090 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)
614 614
615 debug3("%s", __func__); 615 debug3("%s", __func__);
616 buffer_init(&m); 616 buffer_init(&m);
617 buffer_put_cstring(&m, authctxt->user);
618 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m); 617 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
619 debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); 618 debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
620 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m); 619 mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);