2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0dbda414b..a8be68846 100644
--- 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
@@ -3033,4 +3037,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3900 2005/09/29 23:55:49 dtucker Exp $
+$Id: ChangeLog,v 1.3901 2005/09/30 00:23:21 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index ef613cd3c..24ad0b794 100644
--- 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);