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

Add a sudoers_context struct that embeds the user and runas structs.

Browse Source
This commit is contained in:
Todd C. Miller
2023-08-20 16:27:08 -06:00
parent 1b9fb405a3
commit 2d2529a15e
36 changed files with 920 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/sudoers/pwutil_impl.c
View File

@@ -246,7 +246,7 @@ PREFIX(make_gritem)(gid_t gid, const char *name)
/*
* Dynamically allocate space for a struct item plus the key and data
* elements. Fills in datum from user_ctx.gids or from sudo_getgrouplist2(3).
* elements. Fills in datum from ctx.user.gids or from sudo_getgrouplist2(3).
*/
struct cache_item *
PREFIX(make_gidlist_item)(const struct passwd *pw, char * const *gidstrs,
@@ -264,7 +264,7 @@ PREFIX(make_gidlist_item)(const struct passwd *pw, char * const *gidstrs,
* Ignore supplied gids if the entry type says we must query the group db.
*/
if (type != ENTRY_TYPE_QUERIED && (gidstrs != NULL ||
(pw == user_ctx.pw && user_ctx.gids != NULL))) {
(pw == ctx.user.pw && ctx.user.gids != NULL))) {
if (gidstrs != NULL) {
/* Use supplied gids list (string format). */
ngids = 1;
@@ -290,11 +290,11 @@ PREFIX(make_gidlist_item)(const struct passwd *pw, char * const *gidstrs,
gids[ngids++] = gid;
}
} else {
/* Adopt user_ctx.gids. */
gids = user_ctx.gids;
ngids = user_ctx.ngids;
user_ctx.gids = NULL;
user_ctx.ngids = 0;
/* Adopt ctx.user.gids. */
gids = ctx.user.gids;
ngids = ctx.user.ngids;
ctx.user.gids = NULL;
ctx.user.ngids = 0;
}
type = ENTRY_TYPE_FRONTEND;
} else {