[openssh-commits] [openssh] 04/06: fix duplicate PAM msgs, missing loginmsg reset

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit a1158bba43e00240c00c530596de2d4e1d405b50
Author: Matthew Heller <hellermf at accre.vanderbilt.edu>
AuthorDate: Mon Oct 14 09:25:41 2024 -0500

    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(...)
---
 monitor.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/monitor.c b/monitor.c
index 55c4a47ba..290b7f536 100644
--- 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);
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.