diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-09-30 10:23:21 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-09-30 10:23:21 +1000 |
commit | d4f04ae2476dded8c3743b0b9152cfe023758236 (patch) | |
tree | fa81d649d0df6a0ce9daefd0ce9382945d01dce6 | |
parent | 6e4221129e58d792ec14025af823f654b5898cd6 (diff) |
- (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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | monitor.c | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -1,6 +1,10 @@ | |||
1 | 20050930 | 1 | 20050930 |
2 | - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype | 2 | - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype |
3 | for strtoll. Patch from o.flebbe at science-computing.de. | 3 | for strtoll. Patch from o.flebbe at science-computing.de. |
4 | - (dtucker) [monitor.c] Bug #1087: Send loginmsg to preauth privsep | ||
5 | child during PAM account check without clearing it. This restores the | ||
6 | post-login warnings such as LDAP password expiry. Patch from Tomas Mraz | ||
7 | with help from several others. | ||
4 | 8 | ||
5 | 20050929 | 9 | 20050929 |
6 | - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg | 10 | - (dtucker) [monitor_wrap.c] Remove duplicate definition of loginmsg |
@@ -3033,4 +3037,4 @@ | |||
3033 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3037 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3034 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3038 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3035 | 3039 | ||
3036 | $Id: ChangeLog,v 1.3900 2005/09/29 23:55:49 dtucker Exp $ | 3040 | $Id: ChangeLog,v 1.3901 2005/09/30 00:23:21 dtucker Exp $ |
@@ -834,9 +834,7 @@ mm_answer_pam_account(int sock, Buffer *m) | |||
834 | ret = do_pam_account(); | 834 | ret = do_pam_account(); |
835 | 835 | ||
836 | buffer_put_int(m, ret); | 836 | buffer_put_int(m, ret); |
837 | buffer_append(&loginmsg, "\0", 1); | 837 | buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg)); |
838 | buffer_put_cstring(m, buffer_ptr(&loginmsg)); | ||
839 | buffer_clear(&loginmsg); | ||
840 | 838 | ||
841 | mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m); | 839 | mm_request_send(sock, MONITOR_ANS_PAM_ACCOUNT, m); |
842 | 840 | ||