diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth-pam.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20040630 | ||
2 | - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL | ||
3 | appdata_ptr to the conversation function. ok djm@ | ||
4 | |||
1 | 20040627 | 5 | 20040627 |
2 | - (tim) update README files. | 6 | - (tim) update README files. |
3 | - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros. | 7 | - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros. |
@@ -1443,4 +1447,4 @@ | |||
1443 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1447 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1444 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1448 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1445 | 1449 | ||
1446 | $Id: ChangeLog,v 1.3457 2004/06/28 08:11:19 dtucker Exp $ | 1450 | $Id: ChangeLog,v 1.3458 2004/06/30 10:34:31 dtucker Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 56c8d889f..cad89e14f 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 48 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
49 | #include "includes.h" | 49 | #include "includes.h" |
50 | RCSID("$Id: auth-pam.c,v 1.107 2004/06/19 02:54:38 dtucker Exp $"); | 50 | RCSID("$Id: auth-pam.c,v 1.108 2004/06/30 10:34:32 dtucker Exp $"); |
51 | 51 | ||
52 | #ifdef USE_PAM | 52 | #ifdef USE_PAM |
53 | #if defined(HAVE_SECURITY_PAM_APPL_H) | 53 | #if defined(HAVE_SECURITY_PAM_APPL_H) |
@@ -275,6 +275,10 @@ sshpam_thread_conv(int n, const struct pam_message **msg, | |||
275 | debug3("PAM: %s entering, %d messages", __func__, n); | 275 | debug3("PAM: %s entering, %d messages", __func__, n); |
276 | *resp = NULL; | 276 | *resp = NULL; |
277 | 277 | ||
278 | if (data == NULL) { | ||
279 | error("PAM: conversation function passed a null context"); | ||
280 | return (PAM_CONV_ERR); | ||
281 | } | ||
278 | ctxt = data; | 282 | ctxt = data; |
279 | if (n <= 0 || n > PAM_MAX_NUM_MSG) | 283 | if (n <= 0 || n > PAM_MAX_NUM_MSG) |
280 | return (PAM_CONV_ERR); | 284 | return (PAM_CONV_ERR); |