Rename simple_glob -> fast_glob

diff --git a/def_data.c b/def_data.c
index ccb993ec80dc43f3ec07e336dc48eb42061bb52c..311c21e46b9c41243f1b1797d24cc3488e4d7977 100644 (file)
--- a/def_data.c
+++ b/def_data.c
@@ -307,8 +307,8 @@ struct sudo_defs_types sudo_defs_table[] = {
        "Print a stars at the password prompt when there is user input",
        NULL,
     }, {
-       "simple_glob", T_FLAG,
-       "Use simpler globbing that is less accurate but does not access the filesystem",
+       "fast_glob", T_FLAG,
+       "Use faster globbing that is less accurate but does not access the filesystem",
        NULL,
     }, {
        NULL, 0, NULL

diff --git a/def_data.h b/def_data.h
index 964f99d6fe994799c88bd1ea240e3115d1d98593..1859941c21dc96394be2a98464552541703379ef 100644 (file)
--- a/def_data.h
+++ b/def_data.h
@@ -140,8 +140,8 @@
 #define I_VISIBLEPW             69
 #define def_pwstars             (sudo_defs_table[70].sd_un.flag)
 #define I_PWSTARS               70
-#define def_simple_glob         (sudo_defs_table[71].sd_un.flag)
-#define I_SIMPLE_GLOB           71
+#define def_fast_glob           (sudo_defs_table[71].sd_un.flag)
+#define I_FAST_GLOB             71
 
 enum def_tupple {
        never,

diff --git a/def_data.in b/def_data.in
index 91ef2d0ec53d35eb9881c95f35762650b0dcd51c..1a41399bf0eaf2032e08e6ae50827410888b52a1 100644 (file)
--- a/def_data.in
+++ b/def_data.in
@@ -226,6 +226,6 @@ visiblepw
 pwstars
        T_FLAG
        "Print a stars at the password prompt when there is user input"
-simple_glob
+fast_glob
        T_FLAG
-       "Use simpler globbing that is less accurate but does not access the filesystem"
+       "Use faster globbing that is less accurate but does not access the filesystem"

diff --git a/match.c b/match.c
index 558b96df0e79f54c97ca8d39f100807491039bb2..97d5aa547f5415edaf17ace9611cae0d815db65c 100644 (file)
--- a/match.c
+++ b/match.c
@@ -400,7 +400,7 @@ command_matches(sudoers_cmnd, sudoers_args)
         * If sudoers_cmnd has meta characters in it, we need to
         * use glob(3) and/or fnmatch(3) to do the matching.
         */
-       if (def_simple_glob)
+       if (def_fast_glob)
            return(command_matches_fnmatch(sudoers_cmnd, sudoers_args));
        return(command_matches_glob(sudoers_cmnd, sudoers_args));
     }

diff --git a/sudoers.pod b/sudoers.pod
index 54ec932d951f5b7bdc6f6eeb333aaea28fe1d2e6..5fcd5abbc4e5a4203a3df90b9c64b6fe2585ca42 100644 (file)
--- a/sudoers.pod
+++ b/sudoers.pod
@@ -735,18 +735,17 @@ shell is determined by the C<SHELL> environment variable if it is
 set, falling back on the shell listed in the invoking user's
 /etc/passwd entry if not).  This flag is I<off> by default.
 
-=item simple_glob
+=item fast_glob
 
 Normally, B<sudo> uses the L<glob(3)> function to do shell-style
 globbing when matching pathnames.  However, since it accesses the
 file system, L<glob(3)> can take a long time to complete for some
 patterns, especially when the pattern references a network file
-system that is mounted on demand (automounted).  The I<simple_glob>
+system that is mounted on demand (automounted).  The I<fast_glob>
 option causes B<sudo> to use the L<fnmatch(3)> function, which does
-simpler matching that does not access the file system.  The
-disadvantage of I<simple_glob> is that it is unable to match relative
-pathnames such as F<./ls> or F<../bin/ls>.  This flag is I<off> by
-default.
+not access the file system to do its matching.  The disadvantage
+of I<fast_glob> is that it is unable to match relative pathnames
+such as F<./ls> or F<../bin/ls>.  This flag is I<off> by default.
 
 =item stay_setuid