diff --git a/options.h b/options.h index cad0b46d6..f8c0b3a4b 100644 --- a/options.h +++ b/options.h @@ -53,7 +53,6 @@ #define INCORRECT_PASSWORD "Sorry, try again." /* message for bad passwd */ #define MAILSUBJECT "*** SECURITY information ***" /* subject of mail sent */ /*#define SECURE_PATH "/bin:/usr/ucb:/usr/bin:/usr/etc:/etc" /* secure path */ -/*#define USE_REALPATH /* use sudo_realpath() to expand paths */ /********** You probably don't want to modify anything below here ***********/ diff --git a/parse.c b/parse.c index 8c8999375..d372401b7 100644 --- a/parse.c +++ b/parse.c @@ -79,7 +79,6 @@ int parse_error = FALSE; * this routine is called from the sudo.c module and tries to validate * the user, host and command triplet. */ - int validate() { FILE *sudoers_fp; @@ -135,39 +134,7 @@ int validate() return(VALIDATE_NOT_OK); } -/* - * return TRUE if cmnd matches, in the sudo sense, - * the pathname in path; otherwise, return FALSE - */ -#ifdef USE_REALPATH -int -path_matches(cmnd, path) -char *cmnd, *path; -{ - int clen, plen; - if (cmnd == NULL) - return(FALSE); - - plen = strlen(path); - if (path[plen] != '/') - return(strcmp(cmnd, path) == 0); - - clen = strlen(cmnd); - if (clen < plen + 1) - /* path cannot be the parent dir of cmnd */ - return(FALSE); - - if (strchr(cmnd + plen + 1, '/') != NULL) - /* path could only be an ancestor of cmnd -- */ - /* ignoring, of course, things like // & /./ */ - return(FALSE); - - /* see whether path is the prefix of cmnd */ - return(strncmp(cmnd, path, plen) == 0); -} - -#else /* * If path doesn't end in /, return TRUE iff cmnd & path name the same inode; @@ -215,7 +182,7 @@ char *cmnd, *path; return(dent != NULL); } -#endif /* USE_REALPATH */ + int ntwk_matches(n)