- (dtucker) [monitor.c] Bug #1087: Send loginmsg to preauth privsep

   child during PAM account check without clearing it.  This restores the
   post-login warnings such as LDAP password expiry.  Patch from Tomas Mraz
   with help from several others.

diff --git a/ChangeLog b/ChangeLog
index 92cdfb332230ea55ba12682c77deb4d694277c2c..934c9b7ec05c0df56b16555a13aa950d4d112c4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20050930
  - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
    for strtoll.  Patch from o.flebbe at science-computing.de.
+ - (dtucker) [monitor.c] Bug #1087: Send loginmsg to preauth privsep
+   child during PAM account check without clearing it.  This restores the
+   post-login warnings such as LDAP password expiry.  Patch from Tomas Mraz
+   with help from several others.
 
 20050929
  - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg

diff --git a/monitor.c b/monitor.c
index ef613cd3c5ccd6d98d283cae409987037e515481..24ad0b79407038b510d02c6da8b20e40dd4f39b4 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -834,9 +834,7 @@ mm_answer_pam_account(int sock, Buffer *m)
        ret = do_pam_account();
 
        buffer_put_int(m, ret);
-       buffer_append(&loginmsg, "\0", 1);
-       buffer_put_cstring(m, buffer_ptr(&loginmsg));
-       buffer_clear(&loginmsg);
+       buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg));
 
        mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m);