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

Only set MODE_PRESERVE_ENV when preserving the entire environment.

Browse Source 
Fixes a problem introduced in 1.8.23 where "sudo -i" could not be
used in conjunction with --preserve-env=VARIABLE.  Bug #835
This commit is contained in:
Todd C. Miller
2018-05-16 09:10:43 -06:00
parent f38317269d
commit cf9c0102d4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/parse_args.c
View File

@@ -330,14 +330,15 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv,
case 'E': case 'E':
/* /*
* Optional argument is a comma-separated list of * Optional argument is a comma-separated list of
* environment variables to preserve. If not present, * environment variables to preserve.
* preserve everything. * If not present, preserve everything.
*/ */
if (optarg == NULL) if (optarg == NULL) {
sudo_settings[ARG_PRESERVE_ENVIRONMENT].value = "true"; sudo_settings[ARG_PRESERVE_ENVIRONMENT].value = "true";
else SET(flags, MODE_PRESERVE_ENV);
} else {
parse_env_list(&extra_env, optarg); parse_env_list(&extra_env, optarg);
SET(flags, MODE_PRESERVE_ENV); }
break; break;
case 'e': case 'e':
if (mode && mode != MODE_EDIT) if (mode && mode != MODE_EDIT)