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

stuff back in to prevent namespace pollution problems.

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