path_matches -> command_matches

This commit is contained in:
Todd C. Miller
1996-02-04 21:09:56 +00:00
parent 5fd8419d8e
commit 1151a4bfdb
3 changed files with 6 additions and 6 deletions

View File

@@ -168,7 +168,7 @@ int validate(check_cmnd)
* If path doesn't end in /, return TRUE iff cmnd & path name the same inode; * 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 * 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 *cmnd;
char **user_args; char **user_args;
char *path; char *path;

View File

@@ -96,7 +96,7 @@ int top = 0;
/* /*
* Protoypes * 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 addr_matches __P((char *));
extern int netgr_matches __P((char *, char *, char *)); extern int netgr_matches __P((char *, char *, char *));
extern int usergr_matches __P((char *, char *)); extern int usergr_matches __P((char *, char *));
@@ -268,8 +268,8 @@ cmnd : ALL {
char **t; char **t;
/* if NewArgc > 1 pass ptr to 1st arg, else NULL */ /* if NewArgc > 1 pass ptr to 1st arg, else NULL */
if (path_matches(cmnd, (NewArgc > 1) ? &NewArgv[1] if (command_matches(cmnd, (NewArgc > 1) ?
: NULL, $1.cmnd, $1.args)) &NewArgv[1] : NULL, $1.cmnd, $1.args))
cmnd_matches = TRUE; cmnd_matches = TRUE;
(void) free($1.cmnd); (void) free($1.cmnd);

View File

@@ -82,7 +82,7 @@ static char whatnow __P((void));
static void whatnow_help __P((void)); static void whatnow_help __P((void));
static RETSIGTYPE Exit __P((int)); static RETSIGTYPE Exit __P((int));
static void setup_signals __P((void)); 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 addr_matches __P((char *));
int netgr_matches __P((char *, char *, char *)); int netgr_matches __P((char *, char *, char *));
int usergr_matches __P((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). * 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 *cmnd;
char **user_args; char **user_args;
char *path; char *path;