isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't try to stat() "pseudo commands" like "validate"

Browse Source
This commit is contained in:
Todd C. Miller
1995-09-01 02:54:08 +00:00
parent ed57e2a47e
commit ffbade1541
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parse.c
View File

@@ -157,8 +157,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 int path_matches(cmnd, path)
path_matches(cmnd, path)
char *cmnd, *path; char *cmnd, *path;
{ {
int plen; int plen;
@@ -169,6 +168,10 @@ path_matches(cmnd, path)
static char *c; static char *c;
char *args; char *args;
/* don't bother with pseudo commands like "validate" */
if (*cmnd != '/')
return(FALSE);
/* only need to stat cmnd once since it never changes */ /* only need to stat cmnd once since it never changes */
if (cmnd_st.st_dev == 0) { if (cmnd_st.st_dev == 0) {
if (stat(cmnd, &cmnd_st) < 0) if (stat(cmnd, &cmnd_st) < 0)
@@ -180,9 +183,8 @@ path_matches(cmnd, path)
} }
/* if the given path has command line args, split them out */ /* if the given path has command line args, split them out */
if ((args = strchr(path, ' '))) { if ((args = strchr(path, ' ')))
*args++ = '\0'; *args++ = '\0';
}
plen = strlen(path); plen = strlen(path);
if (path[plen - 1] != '/') { if (path[plen - 1] != '/') {
@@ -201,10 +203,15 @@ path_matches(cmnd, path)
if (stat(path, &pst) < 0) if (stat(path, &pst) < 0)
return(FALSE); return(FALSE);
/* XXX - clean up this monstrosity! */ /* put things back the way we found 'em */
if (args) if (args)
*(args - 1) = ' '; *(args - 1) = ' ';
/*
* Return true if inode/device matches and there are no args
* (in sudoers or command) or if the args match;
* else return false.
*/
if (cmnd_st.st_dev == pst.st_dev && cmnd_st.st_ino == pst.st_ino) { if (cmnd_st.st_dev == pst.st_dev && cmnd_st.st_ino == pst.st_ino) {
if (!cmnd_args && !args) if (!cmnd_args && !args)
return(TRUE); return(TRUE);
@@ -216,7 +223,9 @@ path_matches(cmnd, path)
return(FALSE); return(FALSE);
} }
/* grot through path's directory entries, looking for cmnd */ /*
* Grot through path's directory entries, looking for cmnd.
*/
dirp = opendir(path); dirp = opendir(path);
if (dirp == NULL) if (dirp == NULL)
return(FALSE); return(FALSE);
@@ -241,8 +250,7 @@ path_matches(cmnd, path)
int int addr_matches(n)
addr_matches(n)
char *n; char *n;
{ {
int i; int i;
@@ -261,8 +269,7 @@ addr_matches(n)
int int netgr_matches(netgr, host, user)
netgr_matches(netgr, host, user)
char *netgr; char *netgr;
char *host; char *host;
char *user; char *user;