]> granicus.if.org Git - sudo/commitdiff
now always uses fnmatch to match args
authorTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 4 Jun 1996 23:57:30 +0000 (23:57 +0000)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 4 Jun 1996 23:57:30 +0000 (23:57 +0000)
parse.c

diff --git a/parse.c b/parse.c
index 3bb6af6776656cc6113072d00da81c8a3d9905dc..86ddef3fe45e92d5cb1aa0334a63e675d68716ad 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -428,15 +428,9 @@ static int compare_args(user_args, sudoers_args)
     char **ua, **sa;
 
     for (ua=user_args, sa=sudoers_args; *ua && *sa; ua++, sa++) {
-       /* only do wildcard match if there are meta chars */
-       /* XXX - is this really any faster than fnmatch() for all? */
-       if (has_meta(*sa)) {
-           if (fnmatch(*sa, *ua, FNM_PATHNAME))
-               return(FALSE);
-       } else {
-           if (strcmp(*sa, *ua))
-               return(FALSE);
-       }
+       /* Match and honor wildcards */
+       if (fnmatch(*sa, *ua, FNM_PATHNAME) != 0)
+           return(FALSE);
     }
 
     /*