Skip to content

Commit 2e18923

Browse files
committed
sudoedit: don't overload EISDIR, it produces confusing error messages.
1 parent e73c4dd commit 2e18923

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎src/edit_open.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ sudo_edit_open_nonwritable(char *path, int oflags, mode_t mode,
386386

387387
if (writable) {
388388
close(dfd);
389-
errno = EISDIR;
389+
errno = EINVAL;
390390
debug_return_int(-1);
391391
}
392392

‎src/sesh.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ sesh_edit_create_tfiles(int edit_flags, struct sudo_cred *user_cred,
288288
if (errno == ELOOP) {
289289
sudo_warnx(U_("%s: editing symbolic links is not "
290290
"permitted"), path_src);
291-
} else if (errno == EISDIR) {
291+
} else if (errno == EINVAL) {
292292
sudo_warnx(U_("%s: editing files in a writable directory "
293293
"is not permitted"), path_src);
294294
} else {
@@ -388,7 +388,7 @@ sesh_edit_copy_tfiles(int edit_flags, struct sudo_cred *user_cred,
388388
if (errno == ELOOP) {
389389
sudo_warnx(U_("%s: editing symbolic links is not "
390390
"permitted"), path_dst);
391-
} else if (errno == EISDIR) {
391+
} else if (errno == EINVAL) {
392392
sudo_warnx(U_("%s: editing files in a writable directory "
393393
"is not permitted"), path_dst);
394394
} else {

‎src/sudo_edit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ sudo_edit_create_tfiles(const struct command_details *command_details,
199199
if (ofd == -1 && errno == ELOOP) {
200200
sudo_warnx(U_("%s: editing symbolic links is not permitted"),
201201
files[i]);
202-
} else if (ofd == -1 && errno == EISDIR) {
202+
} else if (ofd == -1 && errno == EINVAL) {
203203
sudo_warnx(U_("%s: editing files in a writable directory is not permitted"),
204204
files[i]);
205205
} else {

0 commit comments

Comments
 (0)