summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-03-05 16:26:32 +0000
committerColin Watson <cjwatson@debian.org>2004-03-05 16:26:32 +0000
commit9414b9d65cdc953c2436ba0a607b149e4b4cde1a (patch)
treeb17f98ded50ec565754e1a1dd6a16d7ee5739afe /monitor_wrap.c
parentf8e0d0cb8e77672526baf211bda0b4baae557d33 (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_wrap.c')
-rw-r--r--monitor_wrap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e7c15cecd..b1b1c3a61 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -686,7 +686,7 @@ mm_session_pty_cleanup2(Session *s)
686 686
687#ifdef USE_PAM 687#ifdef USE_PAM
688void 688void
689mm_start_pam(char *user) 689mm_start_pam(Authctxt *authctxt)
690{ 690{
691 Buffer m; 691 Buffer m;
692 692
@@ -695,8 +695,6 @@ mm_start_pam(char *user)
695 fatal("UsePAM=no, but ended up in %s anyway", __func__); 695 fatal("UsePAM=no, but ended up in %s anyway", __func__);
696 696
697 buffer_init(&m); 697 buffer_init(&m);
698 buffer_put_cstring(&m, user);
699
700 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_START, &m); 698 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_START, &m);
701 699
702 buffer_free(&m); 700 buffer_free(&m);