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

Make alias_apply() take 3 arguments, the first being a pointer to the

Browse Source 
struct sudoers_parse_tree.
This commit is contained in:
Todd C. Miller
2018-08-24 09:52:53 -06:00
parent 4b3c8a73a0
commit b2e3adccf3
6 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/sudoers/alias.c
View File

@@ -149,17 +149,42 @@ alias_add(struct sudoers_parse_tree *parse_tree, char *name, int type,
debug_return_str(NULL);
}
/*
* Closure to adapt 2-arg rbapply() to 3-arg alias_apply().
*/
struct alias_apply_closure {
struct sudoers_parse_tree *parse_tree;
int (*func)(struct sudoers_parse_tree *, struct alias *, void *);
void *cookie;
};
/* Adapt rbapply() to alias_apply() calling convention. */
static int
alias_apply_func(void *v1, void *v2)
{
struct alias *a = v1;
struct alias_apply_closure *closure = v2;
return closure->func(closure->parse_tree, a, closure->cookie);
}
/*
* Apply a function to each alias entry and pass in a cookie.
*/
void
alias_apply(struct sudoers_parse_tree *parse_tree, int (*func)(void *, void *),
alias_apply(struct sudoers_parse_tree *parse_tree,
int (*func)(struct sudoers_parse_tree *, struct alias *, void *),
void *cookie)
{
struct alias_apply_closure closure;
debug_decl(alias_apply, SUDOERS_DEBUG_ALIAS)
if (parse_tree->aliases != NULL)
rbapply(parse_tree->aliases, func, cookie, inorder);
if (parse_tree->aliases != NULL) {
closure.parse_tree = parse_tree;
closure.func = func;
closure.cookie = cookie;
rbapply(parse_tree->aliases, alias_apply_func, &closure, inorder);
}
debug_return;
}