From: Matthew Heller <hellermf@accre.vanderbilt.edu>
Date: Mon, 14 Oct 2024 14:25:41 +0000 (-0500)
Subject: fix duplicate PAM msgs, missing loginmsg reset
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1158bba43e00240c00c530596de2d4e1d405b50;p=thirdparty%2Fopenssh-portable.git

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 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);