From 22e22bf9bab94862c860ad4ed652f308dda63f81 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 19 Jan 2001 15:46:38 +1100 Subject: - (djm) Merge patch from Tim Waugh (via Nalin Dahyabhai ) to fix NULL pointer deref and fake authloop breakage in PAM code. --- auth2-pam.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'auth2-pam.c') 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); -- cgit v1.2.3