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

In usergr_matches() matched should be bool but we have to take care

Browse Source 
to handle group_plugin_query() returning a value other than 0/1.
This commit is contained in:
Todd C. Miller
2015-05-07 10:56:12 -06:00
parent d16434f977
commit c80b9c9457
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/sudoers/match.c
View File

@@ -862,7 +862,7 @@ done:
bool
usergr_matches(const char *group, const char *user, const struct passwd *pw)
{
int matched = false;
bool matched = false;
struct passwd *pw0 = NULL;
debug_decl(usergr_matches, SUDOERS_DEBUG_MATCH)
@@ -874,7 +874,8 @@ usergr_matches(const char *group, const char *user, const struct passwd *pw)
}
if (*group == ':' && def_group_plugin) {
matched = group_plugin_query(user, group + 1, pw);
if (group_plugin_query(user, group + 1, pw) == true)
matched = true;
goto done;
}
@@ -894,7 +895,7 @@ usergr_matches(const char *group, const char *user, const struct passwd *pw)
}
/* not a Unix group, could be an external group */
if (def_group_plugin && group_plugin_query(user, group, pw)) {
if (def_group_plugin && group_plugin_query(user, group, pw) == true) {
matched = true;
goto done;
}