fix duplicate PAM msgs, missing loginmsg reset

without this change in mm_answer_pam_account all messages added in
auth-pam.c sshpam_query(...) case PAM_SUCCESS end up sent here, then are
still sitting in the loginmsg buffer and printed a second time in
session.c do_login(...)

diff --git a/monitor.c b/monitor.c
index 55c4a47baed263749e9302c94eaa3c8ee9976b88..290b7f536e544be0440e14d32f48ad76c4556af5 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1131,6 +1131,7 @@ mm_answer_pam_account(struct ssh *ssh, int sock, struct sshbuf *m)
        if ((r = sshbuf_put_u32(m, ret)) != 0 ||
            (r = sshbuf_put_stringb(m, loginmsg)) != 0)
                fatal_fr(r, "buffer error");
+       sshbuf_reset(loginmsg);
 
        mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m);