-DNO_DOT_PATH -> -DIGNORE_DOT_PATH

diff --git a/OPTIONS b/OPTIONS
index b0875559ea0863fc879874b439635116b5fc75b0..6274db40d08217961ad4518e66eea8208a35e830 100644 (file)
--- 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 9290d357774d432a7462f0e8a1ff23cd7bb00f8c..763f7693d4f6e38a91e36bffdebd24009c480338 100644 (file)
--- 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 be414e5bb233d05b921b82b2ae7dde8f67358e19..e77fee319b82a1b91e4fae7e11b8eca7c4e9283f 100644 (file)
--- 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 */