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

can't rely on cmnd_matches as much as I thought -- added some $$

Browse Source 
stuff back in to prevent namespace pollution problems.
This commit is contained in:
Todd C. Miller
1996-07-21 22:41:21 +00:00
parent 0b37772296
commit d2173d0291
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
parse.yacc
View File

@@ -156,6 +156,8 @@ void yyerror(s)
%token <tok> ':' '=' ',' '!' '.' /* union member tokens */ %token <tok> ':' '=' ',' '!' '.' /* union member tokens */
%token <tok> ERROR %token <tok> ERROR
%type <BOOLEAN> cmnd
%type <BOOLEAN> opcmnd
%type <BOOLEAN> runasspec %type <BOOLEAN> runasspec
%type <BOOLEAN> runaslist %type <BOOLEAN> runaslist
%type <BOOLEAN> runasuser %type <BOOLEAN> runasuser
@@ -235,7 +237,7 @@ cmndspeclist : cmndspec
; ;
cmndspec : runasspec nopasswd opcmnd { cmndspec : runasspec nopasswd opcmnd {
if ($1 > 0 && cmnd_matches == TRUE) { if ($1 > 0 && $3 == TRUE) {
runas_matches = TRUE; runas_matches = TRUE;
if ($2 == TRUE) if ($2 == TRUE)
no_passwd = TRUE; no_passwd = TRUE;
@@ -261,6 +263,7 @@ opcmnd : cmnd { ; }
cmnd_matches = FALSE; cmnd_matches = FALSE;
else if (cmnd_matched == FALSE) else if (cmnd_matched == FALSE)
cmnd_matches = TRUE; cmnd_matches = TRUE;
$$ = cmnd_matches;
} }
; ;
@@ -315,6 +318,7 @@ cmnd : ALL {
(void) puts("ALL"); (void) puts("ALL");
cmnd_matches = TRUE; cmnd_matches = TRUE;
$$ = TRUE;
} }
| ALIAS { | ALIAS {
if (printmatches == TRUE && host_matches == TRUE && if (printmatches == TRUE && host_matches == TRUE &&
@@ -322,6 +326,7 @@ cmnd : ALL {
(void) puts($1); (void) puts($1);
if (find_alias($1, CMND)) { if (find_alias($1, CMND)) {
cmnd_matches = TRUE; cmnd_matches = TRUE;
$$ = TRUE;
} }
(void) free($1); (void) free($1);
} }
@@ -340,6 +345,7 @@ cmnd : ALL {
if (command_matches(cmnd, (NewArgc > 1) ? if (command_matches(cmnd, (NewArgc > 1) ?
&NewArgv[1] : NULL, $1.cmnd, $1.args)) { &NewArgv[1] : NULL, $1.cmnd, $1.args)) {
cmnd_matches = TRUE; cmnd_matches = TRUE;
$$ = TRUE;
} }
(void) free($1.cmnd); (void) free($1.cmnd);