Author: cy
Date: Thu Mar 19 03:31:12 2020
New Revision: 359116
URL: https://svnweb.freebsd.org/changeset/base/359116
Log:
MFC r358066:
When pam_login_access(5) fails to match a username it attempts to
match the primary group a user belongs to. This commit extends the
match to secondary groups a user belongs to as well, just as the Linux
pam_access(5) does.
Approved by: des (implicit, blanket)
Modified:
stable/12/lib/libpam/modules/pam_login_access/login_access.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/lib/libpam/modules/pam_login_access/login_access.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/lib/libpam/modules/pam_login_access/login_access.c
==============================================================================
--- stable/12/lib/libpam/modules/pam_login_access/login_access.c Thu Mar
19 03:29:46 2020 (r359115)
+++ stable/12/lib/libpam/modules/pam_login_access/login_access.c Thu Mar
19 03:31:12 2020 (r359116)
@@ -17,10 +17,12 @@ static char sccsid[] = "%Z% %M% %I% %E% %U%";
__FBSDID("$FreeBSD$");
#include <sys/types.h>
+#include <sys/param.h>
#include <ctype.h>
#include <errno.h>
#include <grp.h>
#include <netdb.h>
+#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -174,6 +176,9 @@ static int
user_match(const char *tok, const char *string)
{
struct group *group;
+ struct passwd *passwd;
+ gid_t *grouplist;
+ int ngroups = NGROUPS;
int i;
/*
@@ -186,10 +191,37 @@ user_match(const char *tok, const char *string)
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 */
- for (i = 0; group->gr_mem[i]; i++)
- if (strcasecmp(string, group->gr_mem[i]) == 0)
+ } else {
+ if ((passwd = getpwnam(string)) == NULL)
+ return (NO);
+ errno = 0;
+ if ((group = getgrnam(tok)) == NULL) {/* try group membership */
+ if (errno != 0) {
+ syslog(LOG_ERR, "getgrnam() failed for %s: %s", string,
strerror(errno));
+ } else {
+ syslog(LOG_NOTICE, "group not found: %s", string);
+ }
+ return (NO);
+ }
+ errno = 0;
+ if ((grouplist = calloc(ngroups, sizeof(gid_t))) == NULL) {
+ if (errno == ENOMEM) {
+ syslog(LOG_ERR, "cannot allocate memory for grouplist: %s",
string);
+ }
+ return (NO);
+ }
+ if (getgrouplist(string, passwd->pw_gid, grouplist, &ngroups) != 0) {
+ syslog(LOG_ERR, "getgrouplist() failed for %s", string);
+ free(grouplist);
+ return (NO);
+ }
+ for (i = 0; i < ngroups; i++) {
+ if (grouplist[i] == group->gr_gid) {
+ free(grouplist);
return (YES);
+ }
+ }
+ free(grouplist);
}
return (NO);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
