[src/netbsd-3]: src/lib/libpam/modules/pam_login_access Pull up revision 1.3 ...

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

details:   https://anonhg.NetBSD.org/src/rev/8413e6d2f814
branches:  netbsd-3
changeset: 576554:8413e6d2f814
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jul 11 11:31:12 2005 +0000

description:
Pull up revision 1.3 (requested by lukem in ticket #539):
Fix getgrnam -> getgrnam_r

diffstat:

 lib/libpam/modules/pam_login_access/login_access.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 995d832663fc -r 8413e6d2f814 lib/libpam/modules/pam_login_access/login_access.c
--- a/lib/libpam/modules/pam_login_access/login_access.c        Mon Jul 11 11:30:36 2005 +0000
+++ b/lib/libpam/modules/pam_login_access/login_access.c        Mon Jul 11 11:31:12 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: login_access.c,v 1.2 2004/12/12 08:18:46 christos Exp $        */
+/*     $NetBSD: login_access.c,v 1.2.2.1 2005/07/11 11:31:12 tron Exp $        */
 
 /*
  * This module implements a simple but effective form of login access
@@ -19,7 +19,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/lib/libpam/modules/pam_login_access/login_access.c,v 1.12 2004/03/05 08:10:18 markm Exp $");
 #else
-__RCSID("$NetBSD: login_access.c,v 1.2 2004/12/12 08:18:46 christos Exp $");
+__RCSID("$NetBSD: login_access.c,v 1.2.2.1 2005/07/11 11:31:12 tron Exp $");
 #endif
 
 #include <sys/types.h>
@@ -161,7 +161,8 @@
 static int
 user_match(const char *tok, const char *string)
 {
-    struct group *group;
+    struct group grres, *group;
+    char grbuf[1024];
     int     i;
 
     /*
@@ -174,7 +175,8 @@
        return (netgroup_match(tok + 1, (char *) 0, string));
     } else if (string_match(tok, string)) {    /* ALL or exact match */
        return (YES);
-    } else if ((group = getgrnam(tok)) != NULL) {/* try group membership */
+    } else if (getgrnam_r(tok, &grres, grbuf, sizeof(grbuf), &group) == 0 &&
+       group != NULL) {/* try group membership */
        for (i = 0; group->gr_mem[i]; i++)
            if (strcasecmp(string, group->gr_mem[i]) == 0)
                return (YES);