mirrors/pam-modules
1
0
Fork 0
mirror of git://git.gnu.org.ua/pam-modules.git synced 2025-04-26 00:19:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfixes

Browse source 
* pam_ldaphome/pam_ldaphome.c (check_groups): Take into account primary
group.
* doc/pam_regex.8: Fix escaping.
This commit is contained in:
Sergey Poznyakoff 2014-09-11 20:16:59 +03:00
parent 6e7bbc2eb1
commit 05bf037ee1
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/pam_regex.8
View file

@ -126,7 +126,7 @@ Convert the user name to lower case and remove anything starting from
the \fB@\fR character:
.PP
.EX
auth required pam_regex.so extended transform=s/.*/\L&/g;s/@.*//
auth required pam_regex.so extended transform=s/.*/\\L&/g;s/@.*//
.EE
.SH NOTE
This manpage is a short description of \fBpam_regex\fR. For a detailed

20
pam_ldaphome/pam_ldaphome.c
View file

@ -713,17 +713,27 @@ get_pubkeys(LDAP *ld, const char *base, const char *filter, const char *attr)
}
static int
check_groups(int gc, char **gv, const char *username)
check_groups(int gc, char **gv, const char *username, gid_t gid)
{
int i;
struct group *gp;
char *pgname;
gp = getgrgid(gid);
pgname = gp ? gray_strdup(gp->gr_name) : NULL;
for (i = 0; i < gc; i++) {
struct group *gp = getgrnam(gv[i]);
if (strcmp(gv[i], pgname) == 0) {
free(pgname);
return 0;
}
gp = getgrnam(gv[i]);
if (gp) {
char **p;
for (p = gp->gr_mem; *p; p++)
if (strcmp(username, *p) == 0)
if (strcmp(username, *p) == 0) {
free(pgname);
return 0;
}
}
}
return 1;
@ -779,7 +789,7 @@ check_user_groups(pam_handle_t *pamh, struct gray_env *env,
*retval = PAM_AUTH_ERR;
return 1;
}
rc = check_groups(gc, gv, username);
rc = check_groups(gc, gv, username, pw->pw_gid);
argcv_free(gc, gv);
if (rc) {
DEBUG(10, ("ignoring user %s: not in allowed group list",