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

When parsing def_editor, break out of the loop when we find the

Browse Source 
first valid editor.  Bug #714
This commit is contained in:
Todd C. Miller
2015-08-21 11:25:02 -06:00
parent 7df2487165
commit 333faa20e2
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -14,6 +14,10 @@ What's new in Sudo 1.8.15
enabling the sudoedit_follow option in sudoers or on a per-command
basis with the FOLLOW and NOFOLLOW tags. Bug #707.
* Fixed a bug introduced in versino 1.8.14 that caused the last
valid editor in the sudoers "editor" list to be used by visudo
and sudoedit instead of the first. Bug #714.
What's new in Sudo 1.8.14p3
* Fixed a bug introduced in sudo 1.8.14p2 that prevented sudo

4
plugins/sudoers/sudoers.c
View File

@@ -1201,7 +1201,9 @@ find_editor(int nfiles, char **files, int *argc_out, char ***argv_out)
if ((editor = getenv(*ev)) != NULL && *editor != '\0') {
editor_path = resolve_editor(editor, strlen(editor),
nfiles, files, argc_out, argv_out, NULL);
if (editor_path == NULL && errno != ENOENT)
if (editor_path != NULL)
break;
if (errno != ENOENT)
debug_return_str(NULL);
}
}

4
plugins/sudoers/visudo.c
View File

@@ -330,7 +330,9 @@ get_editor(int *editor_argc, char ***editor_argv)
cp != NULL; cp = sudo_strsplit(NULL, def_editor_end, ":", &ep)) {
editor_path = resolve_editor(cp, (size_t)(ep - cp), 2, files,
editor_argc, editor_argv, whitelist);
if (editor_path == NULL && errno != ENOENT)
if (editor_path != NULL)
break;
if (errno != ENOENT)
debug_return_str(NULL);
}
}