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

struct sudoers_user_context: rename env_vars to env_add

Browse Source
This commit is contained in:
Todd C. Miller
2023-10-21 19:15:45 -06:00
parent 2b87749f8f
commit c7a61a9438
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/logging.c
View File

@@ -1002,7 +1002,7 @@ sudoers_to_eventlog(const struct sudoers_context *ctx, struct eventlog *evlog,
evlog->submitgroup = grp->gr_name; evlog->submitgroup = grp->gr_name;
evlog->ttyname = ctx->user.ttypath; evlog->ttyname = ctx->user.ttypath;
evlog->argv = (char **)argv; evlog->argv = (char **)argv;
evlog->env_add = (char **)ctx->user.env_vars; evlog->env_add = (char **)ctx->user.env_add;
evlog->envp = (char **)envp; evlog->envp = (char **)envp;
evlog->submit_time = ctx->submit_time; evlog->submit_time = ctx->submit_time;
evlog->lines = ctx->user.lines; evlog->lines = ctx->user.lines;

6
plugins/sudoers/sudoers.c
View File

@@ -582,7 +582,7 @@ sudoers_check_common(struct sudoers_context *ctx, int pwflag)
U_("sorry, you are not allowed to preserve the environment")); U_("sorry, you are not allowed to preserve the environment"));
goto bad; goto bad;
} else { } else {
if (!validate_env_vars(ctx, ctx->user.env_vars)) if (!validate_env_vars(ctx, ctx->user.env_add))
goto bad; goto bad;
} }
} }
@@ -641,7 +641,7 @@ sudoers_check_cmnd(int argc, char * const argv[], char *env_add[],
/* Environment variables specified on the command line. */ /* Environment variables specified on the command line. */
if (env_add != NULL && env_add[0] != NULL) if (env_add != NULL && env_add[0] != NULL)
sudoers_ctx.user.env_vars = env_add; sudoers_ctx.user.env_add = env_add;
/* /*
* Make a local copy of argc/argv, with special handling for the * Make a local copy of argc/argv, with special handling for the
@@ -754,7 +754,7 @@ sudoers_check_cmnd(int argc, char * const argv[], char *env_add[],
} }
/* Insert user-specified environment variables. */ /* Insert user-specified environment variables. */
if (!insert_env_vars(sudoers_ctx.user.env_vars)) { if (!insert_env_vars(sudoers_ctx.user.env_add)) {
sudo_warnx("%s", sudo_warnx("%s",
U_("error setting user-specified environment variables")); U_("error setting user-specified environment variables"));
goto error; goto error;

2
plugins/sudoers/sudoers.h
View File

@@ -131,7 +131,7 @@ struct sudoers_user_context {
char *cmnd_list; char *cmnd_list;
char *ccname; char *ccname;
struct gid_list *gid_list; struct gid_list *gid_list;
char * const * env_vars; char * const * env_add;
int closefrom; int closefrom;
int lines; int lines;
int cols; int cols;