summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-09-30 10:23:21 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-09-30 10:23:21 +1000
commitd4f04ae2476dded8c3743b0b9152cfe023758236 (patch)
treefa81d649d0df6a0ce9daefd0ce9382945d01dce6 /monitor.c
parent6e4221129e58d792ec14025af823f654b5898cd6 (diff)
downloadopenssh-git-d4f04ae2476dded8c3743b0b9152cfe023758236.tar.gz
- (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.
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index ef613cd3..24ad0b79 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);