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

In pedantic mode we need to save *all* the aliases, not just those

Browse Source 
that match, or we get spurious warnings.
This commit is contained in:
Todd C. Miller
1999-08-17 12:47:53 +00:00
parent 0acdc98f1d
commit b28ac86ab8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
parse.yacc
View File

@@ -562,7 +562,7 @@ cmnd : ALL {
else { else {
if (pedantic) if (pedantic)
(void) fprintf(stderr, (void) fprintf(stderr,
"Warning: undeclared Cmnd_Alias `%s' referenced near line %d", $1, sudolineno); "Warning: undeclared Cmnd_Alias `%s' referenced near line %d\n", $1, sudolineno);
$$ = -1; $$ = -1;
} }
free($1); free($1);
@@ -600,7 +600,7 @@ hostaliases : hostalias
; ;
hostalias : ALIAS { push; } '=' hostlist { hostalias : ALIAS { push; } '=' hostlist {
if (host_matches != -1 && if ((host_matches != -1 || pedantic) &&
!add_alias($1, HOST_ALIAS, host_matches)) !add_alias($1, HOST_ALIAS, host_matches))
YYERROR; YYERROR;
pop; pop;
@@ -624,7 +624,7 @@ cmndalias : ALIAS {
ga_list[ga_list_len-1].alias = estrdup($1); ga_list[ga_list_len-1].alias = estrdup($1);
} }
} '=' cmndlist { } '=' cmndlist {
if (cmnd_matches != -1 && if ((cmnd_matches != -1 || pedantic) &&
!add_alias($1, CMND_ALIAS, cmnd_matches)) !add_alias($1, CMND_ALIAS, cmnd_matches))
YYERROR; YYERROR;
pop; pop;
@@ -652,7 +652,7 @@ runasalias : ALIAS {
ga_list[ga_list_len-1].alias = estrdup($1); ga_list[ga_list_len-1].alias = estrdup($1);
} }
} '=' runaslist { } '=' runaslist {
if (runas_matches != -1 && if ((runas_matches != -1 || pedantic) &&
!add_alias($1, RUNAS_ALIAS, runas_matches)) !add_alias($1, RUNAS_ALIAS, runas_matches))
YYERROR; YYERROR;
pop; pop;
@@ -668,7 +668,7 @@ useraliases : useralias
; ;
useralias : ALIAS { push; } '=' userlist { useralias : ALIAS { push; } '=' userlist {
if (user_matches != -1 && if ((user_matches != -1 || pedantic) &&
!add_alias($1, USER_ALIAS, user_matches)) !add_alias($1, USER_ALIAS, user_matches))
YYERROR; YYERROR;
pop; pop;

10
sudo.tab.c
View File

@@ -1440,7 +1440,7 @@ case 44:
else { else {
if (pedantic) if (pedantic)
(void) fprintf(stderr, (void) fprintf(stderr,
"Warning: undeclared Cmnd_Alias `%s' referenced near line %d", yyvsp[0].string, sudolineno); "Warning: undeclared Cmnd_Alias `%s' referenced near line %d\n", yyvsp[0].string, sudolineno);
yyval.BOOLEAN = -1; yyval.BOOLEAN = -1;
} }
free(yyvsp[0].string); free(yyvsp[0].string);
@@ -1482,7 +1482,7 @@ break;
case 49: case 49:
#line 602 "parse.yacc" #line 602 "parse.yacc"
{ {
if (host_matches != -1 && if ((host_matches != -1 || pedantic) &&
!add_alias(yyvsp[-3].string, HOST_ALIAS, host_matches)) !add_alias(yyvsp[-3].string, HOST_ALIAS, host_matches))
YYERROR; YYERROR;
pop; pop;
@@ -1503,7 +1503,7 @@ break;
case 55: case 55:
#line 626 "parse.yacc" #line 626 "parse.yacc"
{ {
if (cmnd_matches != -1 && if ((cmnd_matches != -1 || pedantic) &&
!add_alias(yyvsp[-3].string, CMND_ALIAS, cmnd_matches)) !add_alias(yyvsp[-3].string, CMND_ALIAS, cmnd_matches))
YYERROR; YYERROR;
pop; pop;
@@ -1532,7 +1532,7 @@ break;
case 61: case 61:
#line 654 "parse.yacc" #line 654 "parse.yacc"
{ {
if (runas_matches != -1 && if ((runas_matches != -1 || pedantic) &&
!add_alias(yyvsp[-3].string, RUNAS_ALIAS, runas_matches)) !add_alias(yyvsp[-3].string, RUNAS_ALIAS, runas_matches))
YYERROR; YYERROR;
pop; pop;
@@ -1549,7 +1549,7 @@ break;
case 65: case 65:
#line 670 "parse.yacc" #line 670 "parse.yacc"
{ {
if (user_matches != -1 && if ((user_matches != -1 || pedantic) &&
!add_alias(yyvsp[-3].string, USER_ALIAS, user_matches)) !add_alias(yyvsp[-3].string, USER_ALIAS, user_matches))
YYERROR; YYERROR;
pop; pop;