From b0fd211fb2a5b4e28ce7df5f34d93ab955bf404a Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 19 Mar 1996 00:37:24 +0000 Subject: [PATCH] -DNO_DOT_PATH -> -DIGNORE_DOT_PATH --- OPTIONS | 2 +- find_path.c | 12 ++++++------ options.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OPTIONS b/OPTIONS index b0875559e..6274db40d 100644 --- a/OPTIONS +++ b/OPTIONS @@ -153,7 +153,7 @@ SECURE_PATH NOTE: SECURE_PATH is not applied to users in the EXEMPTGROUP. This is off by default. -NO_DOT_PATH +IGNORE_DOT_PATH If defined, sudo will ignore '.' or '' (current dir) in $PATH. The $PATH itself is not modified. This is off by default. diff --git a/find_path.c b/find_path.c index 9290d3577..763f7693d 100644 --- a/find_path.c +++ b/find_path.c @@ -99,9 +99,9 @@ char * find_path(file) char *path = NULL; /* contents of PATH env var */ char *origpath; /* so we can free path later */ char *result = NULL; /* result of path/file lookup */ -#ifndef NO_DOT_PATH +#ifndef IGNORE_DOT_PATH int checkdot = 0; /* check current dir? */ -#endif /* NO_DOT_PATH */ +#endif /* IGNORE_DOT_PATH */ command[0] = '\0'; @@ -150,9 +150,9 @@ char * find_path(file) * things like using './' or './/' */ if (*path == '\0' || (*path == '.' && *(path + 1) == '\0')) { -#ifndef NO_DOT_PATH +#ifndef IGNORE_DOT_PATH checkdot = 1; -#endif /* NO_DOT_PATH */ +#endif /* IGNORE_DOT_PATH */ path = n + 1; continue; } @@ -173,13 +173,13 @@ char * find_path(file) } while (n); -#ifndef NO_DOT_PATH +#ifndef IGNORE_DOT_PATH /* * check current dir if dot was in the PATH */ if (!result && checkdot) result = sudo_goodpath(file); -#endif /* NO_DOT_PATH */ +#endif /* IGNORE_DOT_PATH */ (void) free(origpath); diff --git a/options.h b/options.h index be414e5bb..e77fee319 100644 --- a/options.h +++ b/options.h @@ -56,7 +56,7 @@ #define INCORRECT_PASSWORD "Sorry, try again." /* message for bad passwd */ #define MAILSUBJECT "*** SECURITY information ***" /* subject of mail sent */ #define PASSPROMPT "Password:" /* default password prompt */ -/*#define NO_DOT_PATH /* ignore '.' if in $PATH */ +/*#define IGNORE_DOT_PATH /* ignore '.' in $PATH if it exists */ /*#define SECURE_PATH "/bin:/usr/ucb:/usr/bin:/usr/etc:/etc" /* secure path */ /*#define USE_EXECV /* use execv() instead of execvp() */ /*#define SHELL_IF_NO_ARGS /* if sudo is given no arguments run a shell */ -- 2.40.0