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 b4109657efdf546b119f9a82693e66f4e557e7d5..f1b873dc4d7db3a59272dd64eccd83550731866c 100644 (file)
--- 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 e6217b3d42f6130de6849096496504d84281cdd9..eac421ba145bf69061e9344c1ad4dfd281c1ae20 100644 (file)
--- 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);