sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Fix nss_initgroups_ignoreusers (add patch to bsdnss.c)

Browse source 
PR:		152982
Submitted by:	kmenshikov@peterhost.ru
Approved by:	mentor (timeout), gabor (mentor)
Obtained from:	http://lists.freebsd.org/pipermail/freebsd-current/2007-July/075131.html
Feature safe:	yes
This commit is contained in:
Michael Scheidell 2011-12-03 18:45:42 +00:00
parent 8f76afd746
commit cda6b3488f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=286814
2 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/nss_ldap/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= nss_ldap PORTNAME= nss_ldap
PORTVERSION= 1.${NSS_LDAP_VERSION} PORTVERSION= 1.${NSS_LDAP_VERSION}
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= net CATEGORIES= net
MASTER_SITES= http://www.padl.com/download/ \ MASTER_SITES= http://www.padl.com/download/ \
LOCAL/martymac LOCAL/martymac

61
net/nss_ldap/files/bsdnss.c
View file

@ -1,9 +1,11 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h>
#include <sys/param.h> #include <sys/param.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
#include <nss.h> #include <nss.h>
#include <nsswitch.h>
#include <netdb.h> #include <netdb.h>
extern enum nss_status _nss_ldap_getgrent_r(struct group *, char *, size_t, extern enum nss_status _nss_ldap_getgrent_r(struct group *, char *, size_t,
@ -14,6 +16,8 @@ extern enum nss_status _nss_ldap_getgrgid_r(gid_t gid, struct group *, char *,
size_t, int *); size_t, int *);
extern enum nss_status _nss_ldap_setgrent(void); extern enum nss_status _nss_ldap_setgrent(void);
extern enum nss_status _nss_ldap_endgrent(void); extern enum nss_status _nss_ldap_endgrent(void);
extern enum nss_status _nss_ldap_initgroups_dyn(const char *, gid_t, long int *,
long int *, gid_t **, long int, int *);
extern enum nss_status _nss_ldap_getpwent_r(struct passwd *, char *, size_t, extern enum nss_status _nss_ldap_getpwent_r(struct passwd *, char *, size_t,
int *); int *);
@ -40,6 +44,7 @@ NSS_METHOD_PROTOTYPE(__nss_compat_getgrgid_r);
NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r); NSS_METHOD_PROTOTYPE(__nss_compat_getgrent_r);
NSS_METHOD_PROTOTYPE(__nss_compat_setgrent); NSS_METHOD_PROTOTYPE(__nss_compat_setgrent);
NSS_METHOD_PROTOTYPE(__nss_compat_endgrent); NSS_METHOD_PROTOTYPE(__nss_compat_endgrent);
static NSS_METHOD_PROTOTYPE(__freebsd_getgroupmembership);
NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r); NSS_METHOD_PROTOTYPE(__nss_compat_getpwnam_r);
NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r); NSS_METHOD_PROTOTYPE(__nss_compat_getpwuid_r);
@ -57,6 +62,7 @@ static ns_mtab methods[] = {
{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r }, { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_ldap_getgrent_r },
{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_ldap_setgrent }, { NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_ldap_setgrent },
{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_ldap_endgrent }, { NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_ldap_endgrent },
{ NSDB_GROUP, "getgroupmembership", __freebsd_getgroupmembership, NULL },
{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_ldap_getpwnam_r }, { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_ldap_getpwnam_r },
{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_ldap_getpwuid_r }, { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_ldap_getpwuid_r },
@ -156,3 +162,58 @@ int __nss_compat_gethostbyaddr(void *retval, void *mdata, va_list ap)
h_errno = h_errnop; h_errno = h_errnop;
return (status); return (status);
} }
static int
__gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *groupc)
{
int ret, dupc;
/* skip duplicates */
for (dupc = 0; dupc < MIN(maxgrp, *groupc); dupc++) {
if (groups[dupc] == gid)
return 1;
}
ret = 1;
if (*groupc < maxgrp) /* add this gid */
groups[*groupc] = gid;
else
ret = 0;
(*groupc)++;
return ret;
}
static int __freebsd_getgroupmembership(void *retval, void *mdata, va_list ap)
{
int err;
enum nss_status s;
const char *user = va_arg(ap, const char *);
gid_t group = va_arg(ap, gid_t);
gid_t *groups = va_arg(ap, gid_t *);
int limit = va_arg(ap, int);
int *size = va_arg(ap, int*);
gid_t *tmpgroups;
long int lstart, lsize;
int i;
tmpgroups = malloc(limit * sizeof(gid_t));
if (tmpgroups == NULL)
return NS_TRYAGAIN;
/* insert primary membership */
__gr_addgid(group, groups, limit, size);
lstart = 0;
lsize = limit;
s = _nss_ldap_initgroups_dyn(user, group, &lstart, &lsize,
&tmpgroups, 0, &err);
if (s == NSS_STATUS_SUCCESS) {
for (i = 0; i < lstart; i++)
__gr_addgid(tmpgroups[i], groups, limit, size);
s = NSS_STATUS_NOTFOUND;
}
free(tmpgroups);
return __nss_compat_result(s, err);
}