struct sudoers_user_context: rename env_vars to env_add

Author: millert

plugins/sudoers/logging.c

@@ -1002,7 +1002,7 @@ sudoers_to_eventlog(const struct sudoers_context *ctx, struct eventlog *evlog,
 	evlog->submitgroup = grp->gr_name;
     evlog->ttyname = ctx->user.ttypath;
     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->submit_time = ctx->submit_time;
     evlog->lines = ctx->user.lines;

plugins/sudoers/sudoers.c

@@ -582,7 +582,7 @@ sudoers_check_common(struct sudoers_context *ctx, int pwflag)
 		U_("sorry, you are not allowed to preserve the environment"));
 	    goto bad;
 	} else {
-	    if (!validate_env_vars(ctx, ctx->user.env_vars))
+	    if (!validate_env_vars(ctx, ctx->user.env_add))
 		goto bad;
 	}
     }
@@ -641,7 +641,7 @@ sudoers_check_cmnd(int argc, char * const argv[], char *env_add[],
 
     /* Environment variables specified on the command line. */
     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
@@ -754,7 +754,7 @@ sudoers_check_cmnd(int argc, char * const argv[], char *env_add[],
     }
 
     /* 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",
 	    U_("error setting user-specified environment variables"));
 	goto error;

plugins/sudoers/sudoers.h

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