isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only call gr_delref() when use sudo's password caching functions.

Browse Source
This commit is contained in:
Todd C. Miller
2012-05-08 16:39:37 -04:00
parent 75d70b334b
commit aa3defa3f0
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/system_group/system_group.c
View File

@@ -75,15 +75,16 @@ static sudo_printf_t sudo_log;
typedef struct group * (*sysgroup_getgrnam_t)(const char *); typedef struct group * (*sysgroup_getgrnam_t)(const char *);
typedef struct group * (*sysgroup_getgrgid_t)(gid_t); typedef struct group * (*sysgroup_getgrgid_t)(gid_t);
typedef void (*sysgroup_gr_delref_t)(struct group *);
static sysgroup_getgrnam_t sysgroup_getgrnam; static sysgroup_getgrnam_t sysgroup_getgrnam;
static sysgroup_getgrgid_t sysgroup_getgrgid; static sysgroup_getgrgid_t sysgroup_getgrgid;
static sysgroup_gr_delref_t sysgroup_gr_delref;
static bool need_setent; static bool need_setent;
static int static int
sysgroup_init(int version, sudo_printf_t sudo_printf, char *const argv[]) sysgroup_init(int version, sudo_printf_t sudo_printf, char *const argv[])
{ {
struct stat sb;
void *handle; void *handle;
sudo_log = sudo_printf; sudo_log = sudo_printf;
@@ -113,6 +114,10 @@ sysgroup_init(int version, sudo_printf_t sudo_printf, char *const argv[])
need_setent = true; need_setent = true;
} }
handle = dlsym(RTLD_DEFAULT, "gr_delref");
if (handle != NULL)
sysgroup_gr_delref = (sysgroup_gr_delref_t)handle;
if (need_setent) if (need_setent)
setgrent(); setgrent();
@@ -134,7 +139,6 @@ sysgroup_query(const char *user, const char *group, const struct passwd *pwd)
{ {
char **member, *ep = '\0'; char **member, *ep = '\0';
struct group *grp; struct group *grp;
gid_t gid;
grp = sysgroup_getgrnam(group); grp = sysgroup_getgrnam(group);
if (grp == NULL && group[0] == '#' && group[1] != '\0') { if (grp == NULL && group[0] == '#' && group[1] != '\0') {
@@ -147,11 +151,13 @@ sysgroup_query(const char *user, const char *group, const struct passwd *pwd)
if (grp != NULL) { if (grp != NULL) {
for (member = grp->gr_mem; *member != NULL; member++) { for (member = grp->gr_mem; *member != NULL; member++) {
if (strcasecmp(user, *member) == 0) { if (strcasecmp(user, *member) == 0) {
gr_delref(grp); if (sysgroup_gr_delref)
sysgroup_gr_delref(grp);
return true; return true;
} }
} }
gr_delref(grp); if (sysgroup_gr_delref)
sysgroup_gr_delref(grp);
} }
return false; return false;