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

Avoid symbol name clash with is_writable() function variable.

Browse Source 
Rename "is_writable" variable to "writable".
This commit is contained in:
Todd C. Miller
2021-11-09 13:39:30 -07:00
parent 03927f998f
commit 7085a64475
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/edit_open.c
View File

@@ -341,7 +341,7 @@ sudo_edit_open_nonwritable(char *path, int oflags, mode_t mode,
struct sudo_cred *user_cred, struct sudo_cred *cur_cred) struct sudo_cred *user_cred, struct sudo_cred *cur_cred)
{ {
const int dflags = DIR_OPEN_FLAGS; const int dflags = DIR_OPEN_FLAGS;
int dfd, fd, is_writable; int dfd, fd, writable;
debug_decl(sudo_edit_open_nonwritable, SUDO_DEBUG_EDIT); debug_decl(sudo_edit_open_nonwritable, SUDO_DEBUG_EDIT);
if (path[0] == '/') { if (path[0] == '/') {
@@ -363,8 +363,8 @@ sudo_edit_open_nonwritable(char *path, int oflags, mode_t mode,
* Look up one component at a time, avoiding symbolic links in * Look up one component at a time, avoiding symbolic links in
* writable directories. * writable directories.
*/ */
is_writable = dir_is_writable(dfd, user_cred, cur_cred); writable = dir_is_writable(dfd, user_cred, cur_cred);
if (is_writable == -1) { if (writable == -1) {
close(dfd); close(dfd);
debug_return_int(-1); debug_return_int(-1);
} }
@@ -374,7 +374,7 @@ sudo_edit_open_nonwritable(char *path, int oflags, mode_t mode,
if (slash == NULL) if (slash == NULL)
break; break;
*slash = '\0'; *slash = '\0';
if (is_writable) if (writable)
subdfd = sudo_edit_openat_nofollow(dfd, path, dflags, 0); subdfd = sudo_edit_openat_nofollow(dfd, path, dflags, 0);
else else
subdfd = openat(dfd, path, dflags, 0); subdfd = openat(dfd, path, dflags, 0);
@@ -386,7 +386,7 @@ sudo_edit_open_nonwritable(char *path, int oflags, mode_t mode,
dfd = subdfd; dfd = subdfd;
} }
if (is_writable) { if (writable) {
close(dfd); close(dfd);
errno = EISDIR; errno = EISDIR;
debug_return_int(-1); debug_return_int(-1);