summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-03-08 23:04:06 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-03-08 23:04:06 +1100
commitdbf7a74ee569a9544276db42eb7aee1141072a24 (patch)
treef9aea6fab5efea9441557696611b04a065ad8128 /monitor.c
parent86c093d2895989d1258459b797ce3630eaa47d1a (diff)
- (dtucker) [auth-pam.c auth-pam.h auth1.c auth2.c monitor.c monitor_wrap.c
monitor_wrap.h] Bug #808: Ensure force_pwchange is correctly initialized even if keyboard-interactive is not used by the client. Prevents segfaults in some cases where the user's password is expired (note this is not considered a security exposure). ok djm@
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/monitor.c b/monitor.c
index 009dcf182..30f7258a0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -782,16 +782,10 @@ mm_answer_skeyrespond(int socket, Buffer *m)
782int 782int
783mm_answer_pam_start(int socket, Buffer *m) 783mm_answer_pam_start(int socket, Buffer *m)
784{ 784{
785 char *user;
786
787 if (!options.use_pam) 785 if (!options.use_pam)
788 fatal("UsePAM not set, but ended up in %s anyway", __func__); 786 fatal("UsePAM not set, but ended up in %s anyway", __func__);
789 787
790 user = buffer_get_string(m, NULL); 788 start_pam(authctxt);
791
792 start_pam(user);
793
794 xfree(user);
795 789
796 monitor_permit(mon_dispatch, MONITOR_REQ_PAM_ACCOUNT, 1); 790 monitor_permit(mon_dispatch, MONITOR_REQ_PAM_ACCOUNT, 1);
797 791