diff options
| author | Damien Miller <djm@mindrot.org> | 2001-01-19 15:46:38 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-01-19 15:46:38 +1100 |
| commit | 22e22bf9bab94862c860ad4ed652f308dda63f81 (patch) | |
| tree | b4d1a83f4ea81c3b1c82a3a5a28de21bbd5d4c2c /auth2-pam.c | |
| parent | f569241db2e79b0bd7d1be6e288f2bd25e9c7ab4 (diff) | |
- (djm) Merge patch from Tim Waugh (via Nalin Dahyabhai <nalin@redhat.com>)
to fix NULL pointer deref and fake authloop breakage in PAM code.
Diffstat (limited to 'auth2-pam.c')
| -rw-r--r-- | auth2-pam.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/auth2-pam.c b/auth2-pam.c index 498cc746..d1d84097 100644 --- a/auth2-pam.c +++ b/auth2-pam.c @@ -1,5 +1,5 @@ #include "includes.h" -RCSID("$Id: auth2-pam.c,v 1.3 2001/01/19 04:26:52 mouring Exp $"); +RCSID("$Id: auth2-pam.c,v 1.4 2001/01/19 04:46:38 djm Exp $"); #ifdef USE_PAM #include "ssh.h" @@ -36,10 +36,8 @@ auth2_pam(Authctxt *authctxt) if (authctxt->user == NULL) fatal("auth2_pam: internal error: no user"); - if (authctxt->valid) { - conv2.appdata_ptr = authctxt; - pam_set_conv(&conv2); - } + conv2.appdata_ptr = authctxt; + pam_set_conv(&conv2); dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, &input_userauth_info_response_pam); |