diff options
author | Colin Watson <cjwatson@debian.org> | 2004-03-05 16:26:32 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-03-05 16:26:32 +0000 |
commit | 9414b9d65cdc953c2436ba0a607b149e4b4cde1a (patch) | |
tree | b17f98ded50ec565754e1a1dd6a16d7ee5739afe /monitor.c | |
parent | f8e0d0cb8e77672526baf211bda0b4baae557d33 (diff) |
Really pick up upstream fix for OpenSSH bug #808, a segfault. The previous
auth-pam.c change was in fact a different bug.
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -782,16 +782,10 @@ mm_answer_skeyrespond(int socket, Buffer *m) | |||
782 | int | 782 | int |
783 | mm_answer_pam_start(int socket, Buffer *m) | 783 | mm_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 | ||