[src/netbsd-3]: src/lib/libpam/modules/pam_krb5 Pull up revision 1.9 (request...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71009487e10d
branches:  netbsd-3
changeset: 576551:71009487e10d
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jul 11 11:29:04 2005 +0000

description:
Pull up revision 1.9 (requested by lukem in ticket #539):
getpw*_r() may return 0 and set pwd==NULL

diffstat:

 lib/libpam/modules/pam_krb5/pam_krb5.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r b0449d2e541c -r 71009487e10d lib/libpam/modules/pam_krb5/pam_krb5.c
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c    Mon Jul 11 11:23:34 2005 +0000
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c    Mon Jul 11 11:29:04 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pam_krb5.c,v 1.6.2.2 2005/07/11 11:23:34 tron Exp $    */
+/*     $NetBSD: pam_krb5.c,v 1.6.2.3 2005/07/11 11:29:04 tron Exp $    */
 
 /*-
  * This pam_krb5 module contains code that is:
@@ -53,7 +53,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.22 2005/01/24 16:49:50 rwatson Exp $");
 #else
-__RCSID("$NetBSD: pam_krb5.c,v 1.6.2.2 2005/07/11 11:23:34 tron Exp $");
+__RCSID("$NetBSD: pam_krb5.c,v 1.6.2.3 2005/07/11 11:29:04 tron Exp $");
 #endif
 
 #include <sys/types.h>
@@ -414,7 +414,8 @@
        }
 
        /* Get the uid. This should exist. */
-       if (getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0) {
+       if (getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
+           pwd == NULL) {
                retval = PAM_USER_UNKNOWN;
                goto cleanup3;
        }