don't call fnmatch() with FNM_PATHNAME flag unless it can only

be a pathname.
need to check against sudoers_args even if user_args is nil

diff --git a/testsudoers.c b/testsudoers.c
index 4accee7065c80b24c47139bba36c8357b1ce2522..184c4879bd2b3a2574c8f51aad134ca24d9ed375 100644 (file)
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -111,8 +111,8 @@ int command_matches(cmnd, user_args, path, sudoers_args)
            return(TRUE);
        else if (!user_args && sudoers_args && !strcmp("\"\"", sudoers_args))
            return(TRUE);
-       else if (user_args && sudoers_args)
-           return((fnmatch(sudoers_args, user_args, FNM_PATHNAME) == 0));
+       else if (sudoers_args)
+           return((fnmatch(sudoers_args, user_args ? user_args : "", 0) == 0));
        else
            return(FALSE);
     } else {
@@ -124,8 +124,8 @@ int command_matches(cmnd, user_args, path, sudoers_args)
                return(TRUE);
            else if (!user_args && sudoers_args && !strcmp("\"\"", sudoers_args))
                return(TRUE);
-           else if (user_args && sudoers_args)
-               return((fnmatch(sudoers_args, user_args, FNM_PATHNAME) == 0));
+           else if (sudoers_args)
+               return((fnmatch(sudoers_args, user_args ? user_args : "", 0) == 0));
            else
                return(FALSE);
        }