Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3]: src/lib/libpam/modules Pull up revision 1.8 (requested by luk...
details: https://anonhg.NetBSD.org/src/rev/b0449d2e541c
branches: netbsd-3
changeset: 576550:b0449d2e541c
user: tron <tron%NetBSD.org@localhost>
date: Mon Jul 11 11:23:34 2005 +0000
description:
Pull up revision 1.8 (requested by lukem in ticket #539):
check for pwd != in getpw*_r functions.
diffstat:
lib/libpam/modules/pam_group/pam_group.c | 7 ++++---
lib/libpam/modules/pam_krb5/pam_krb5.c | 7 ++++---
lib/libpam/modules/pam_lastlog/pam_lastlog.c | 7 ++++---
lib/libpam/modules/pam_unix/pam_unix.c | 7 ++++---
4 files changed, 16 insertions(+), 12 deletions(-)
diffs (112 lines):
diff -r 49f0ad211fc5 -r b0449d2e541c lib/libpam/modules/pam_group/pam_group.c
--- a/lib/libpam/modules/pam_group/pam_group.c Mon Jul 11 11:19:40 2005 +0000
+++ b/lib/libpam/modules/pam_group/pam_group.c Mon Jul 11 11:23:34 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_group.c,v 1.5.2.2 2005/07/11 11:18:33 tron Exp $ */
+/* $NetBSD: pam_group.c,v 1.5.2.3 2005/07/11 11:23:34 tron Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_group/pam_group.c,v 1.4 2003/12/11 13:55:15 des Exp $");
#else
-__RCSID("$NetBSD: pam_group.c,v 1.5.2.2 2005/07/11 11:18:33 tron Exp $");
+__RCSID("$NetBSD: pam_group.c,v 1.5.2.3 2005/07/11 11:23:34 tron Exp $");
#endif
#include <sys/types.h>
@@ -78,7 +78,8 @@
/* get target account */
if (pam_get_user(pamh, &user, NULL) != PAM_SUCCESS ||
user == NULL ||
- getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0)
+ getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
+ pwd == NULL)
return (PAM_AUTH_ERR);
if (pwd->pw_uid != 0 && openpam_get_option(pamh, "root_only"))
return (PAM_IGNORE);
diff -r 49f0ad211fc5 -r b0449d2e541c lib/libpam/modules/pam_krb5/pam_krb5.c
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c Mon Jul 11 11:19:40 2005 +0000
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c Mon Jul 11 11:23:34 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_krb5.c,v 1.6.2.1 2005/04/04 17:55:36 tron Exp $ */
+/* $NetBSD: pam_krb5.c,v 1.6.2.2 2005/07/11 11:23:34 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.1 2005/04/04 17:55:36 tron Exp $");
+__RCSID("$NetBSD: pam_krb5.c,v 1.6.2.2 2005/07/11 11:23:34 tron Exp $");
#endif
#include <sys/types.h>
@@ -224,7 +224,8 @@
PAM_LOG("PAM_USER Redone");
}
- 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 cleanup2;
}
diff -r 49f0ad211fc5 -r b0449d2e541c lib/libpam/modules/pam_lastlog/pam_lastlog.c
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c Mon Jul 11 11:19:40 2005 +0000
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c Mon Jul 11 11:23:34 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_lastlog.c,v 1.6.2.1 2005/04/04 17:55:36 tron Exp $ */
+/* $NetBSD: pam_lastlog.c,v 1.6.2.2 2005/07/11 11:23:34 tron Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -47,7 +47,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.20 2004/01/26 19:28:37 des Exp $");
#else
-__RCSID("$NetBSD: pam_lastlog.c,v 1.6.2.1 2005/04/04 17:55:36 tron Exp $");
+__RCSID("$NetBSD: pam_lastlog.c,v 1.6.2.2 2005/07/11 11:23:34 tron Exp $");
#endif
#include <sys/param.h>
@@ -110,7 +110,8 @@
return pam_err;
if (user == NULL ||
- getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0)
+ getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
+ pwd == NULL)
return PAM_SERVICE_ERR;
PAM_LOG("Got user: %s", user);
diff -r 49f0ad211fc5 -r b0449d2e541c lib/libpam/modules/pam_unix/pam_unix.c
--- a/lib/libpam/modules/pam_unix/pam_unix.c Mon Jul 11 11:19:40 2005 +0000
+++ b/lib/libpam/modules/pam_unix/pam_unix.c Mon Jul 11 11:23:34 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_unix.c,v 1.5.2.2 2005/04/04 17:55:36 tron Exp $ */
+/* $NetBSD: pam_unix.c,v 1.5.2.3 2005/07/11 11:23:34 tron Exp $ */
/*-
* Copyright 1998 Juniper Networks, Inc.
@@ -40,7 +40,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.49 2004/02/10 10:13:21 des Exp $");
#else
-__RCSID("$NetBSD: pam_unix.c,v 1.5.2.2 2005/04/04 17:55:36 tron Exp $");
+__RCSID("$NetBSD: pam_unix.c,v 1.5.2.3 2005/07/11 11:23:34 tron Exp $");
#endif
@@ -158,7 +158,8 @@
return (retval);
if (user == NULL ||
- getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0)
+ getpwnam_r(user, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 ||
+ pwd == NULL)
return (PAM_SERVICE_ERR);
PAM_LOG("Got user: %s", user);
Home |
Main Index |
Thread Index |
Old Index