path_matches -> command_matches

diff --git a/parse.c b/parse.c
index 806eca9c46ca9b654441b6ea1dedb5f0c3b7b7b5..2c89ac233977bf75663b76c50c1ab51b4edc2097 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -168,7 +168,7 @@ int validate(check_cmnd)
  * If path doesn't end in /, return TRUE iff cmnd & path name the same inode;
  * otherwise, return TRUE if cmnd names one of the inodes in path
  */
-int path_matches(cmnd, user_args, path, sudoers_args)
+int command_matches(cmnd, user_args, path, sudoers_args)
     char *cmnd;
     char **user_args;
     char *path;

diff --git a/parse.yacc b/parse.yacc
index 91be0a126aefbba900e1175bb5d31e62026e9665..cd1740e0be5c03143e74fc53a0c029880978bbcd 100644 (file)
--- a/parse.yacc
+++ b/parse.yacc
@@ -96,7 +96,7 @@ int top = 0;
 /*
  * Protoypes
  */
-extern int path_matches                __P((char *, char **, char *, char **));
+extern int command_matches             __P((char *, char **, char *, char **));
 extern int addr_matches                __P((char *));
 extern int netgr_matches       __P((char *, char *, char *));
 extern int usergr_matches      __P((char *, char *));
@@ -268,8 +268,8 @@ cmnd                :       ALL {
                            char **t;
 
                            /* if NewArgc > 1 pass ptr to 1st arg, else NULL */
-                           if (path_matches(cmnd, (NewArgc > 1) ? &NewArgv[1]
-                                            : NULL, $1.cmnd, $1.args))
+                           if (command_matches(cmnd, (NewArgc > 1) ?
+                                   &NewArgv[1] : NULL, $1.cmnd, $1.args))
                                cmnd_matches = TRUE;
 
                            (void) free($1.cmnd);

diff --git a/visudo.c b/visudo.c
index d196f0330702c0d75e2f1734d61866be87ac9eea..f5003003f1eafa0226b7fc01f21c1abc3c9f5d51 100644 (file)
--- a/visudo.c
+++ b/visudo.c
@@ -82,7 +82,7 @@ static char whatnow           __P((void));
 static void whatnow_help       __P((void));
 static RETSIGTYPE Exit         __P((int));
 static void setup_signals      __P((void));
-int path_matches               __P((char *, char **, char *, char **));
+int command_matches            __P((char *, char **, char *, char **));
 int addr_matches               __P((char *));
 int netgr_matches              __P((char *, char *, char *));
 int usergr_matches             __P((char *, char *));
@@ -365,7 +365,7 @@ int main(argc, argv)
  *  These exist to allow us to use the same parser as sudo(8).
  */
 
-int path_matches(cmnd, user_args, path, sudoers_args)
+int command_matches(cmnd, user_args, path, sudoers_args)
     char *cmnd;
     char **user_args;
     char *path;