From 041b1a896a3e79ef672990931eab31009d0f4138 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 28 Mar 2011 14:50:55 -0400 Subject: [PATCH] Add back missing #include of config.h --- plugins/sudoers/toke.c | 123 +++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c index 17ceafafb..2aeb0f84e 100644 --- a/plugins/sudoers/toke.c +++ b/plugins/sudoers/toke.c @@ -1,3 +1,4 @@ +#include /* $OpenBSD: flex.skl,v 1.11 2010/08/04 18:24:50 millert Exp $ */ /* A lexical scanner generated by flex */ @@ -1398,9 +1399,9 @@ static char *yy_last_accepting_cpos; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "./toke.l" +#line 1 "toke.l" #define INITIAL 0 -#line 2 "./toke.l" +#line 2 "toke.l" /* * Copyright (c) 1996, 1998-2005, 2007-2011 * Todd C. Miller @@ -1659,7 +1660,7 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 118 "./toke.l" +#line 118 "toke.l" #line 1665 "lex.yy.c" @@ -1747,7 +1748,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 119 "./toke.l" +#line 119 "toke.l" { LEXTRACE(", "); return ','; @@ -1755,12 +1756,12 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 124 "./toke.l" +#line 124 "toke.l" BEGIN STARTDEFS; YY_BREAK case 3: YY_RULE_SETUP -#line 126 "./toke.l" +#line 126 "toke.l" { BEGIN INDEFS; LEXTRACE("DEFVAR "); @@ -1772,7 +1773,7 @@ YY_RULE_SETUP case 4: YY_RULE_SETUP -#line 135 "./toke.l" +#line 135 "toke.l" { BEGIN STARTDEFS; LEXTRACE(", "); @@ -1781,7 +1782,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 141 "./toke.l" +#line 141 "toke.l" { LEXTRACE("= "); return '='; @@ -1789,7 +1790,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 146 "./toke.l" +#line 146 "toke.l" { LEXTRACE("+= "); return '+'; @@ -1797,7 +1798,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 151 "./toke.l" +#line 151 "toke.l" { LEXTRACE("-= "); return '-'; @@ -1805,7 +1806,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 156 "./toke.l" +#line 156 "toke.l" { LEXTRACE("BEGINSTR "); yylval.string = NULL; @@ -1815,7 +1816,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 163 "./toke.l" +#line 163 "toke.l" { LEXTRACE("WORD(2) "); if (!fill(yytext, yyleng)) @@ -1827,7 +1828,7 @@ YY_RULE_SETUP case 10: YY_RULE_SETUP -#line 172 "./toke.l" +#line 172 "toke.l" { /* Line continuation char followed by newline. */ ++sudolineno; @@ -1836,7 +1837,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 178 "./toke.l" +#line 178 "toke.l" { LEXTRACE("ENDSTR "); BEGIN prev_state; @@ -1871,7 +1872,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 210 "./toke.l" +#line 210 "toke.l" { LEXTRACE("BACKSLASH "); if (!append(yytext, yyleng)) @@ -1880,7 +1881,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 216 "./toke.l" +#line 216 "toke.l" { LEXTRACE("STRBODY "); if (!append(yytext, yyleng)) @@ -1891,7 +1892,7 @@ YY_RULE_SETUP case 14: YY_RULE_SETUP -#line 224 "./toke.l" +#line 224 "toke.l" { /* quoted fnmatch glob char, pass verbatim */ LEXTRACE("QUOTEDCHAR "); @@ -1902,7 +1903,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 232 "./toke.l" +#line 232 "toke.l" { /* quoted sudoers special char, strip backslash */ LEXTRACE("QUOTEDCHAR "); @@ -1913,7 +1914,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 240 "./toke.l" +#line 240 "toke.l" { BEGIN INITIAL; yyless(0); @@ -1922,7 +1923,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 246 "./toke.l" +#line 246 "toke.l" { LEXTRACE("ARG "); if (!fill_args(yytext, yyleng, sawspace)) @@ -1933,7 +1934,7 @@ YY_RULE_SETUP case 18: YY_RULE_SETUP -#line 254 "./toke.l" +#line 254 "toke.l" { char *path; @@ -1954,7 +1955,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 272 "./toke.l" +#line 272 "toke.l" { char *path; @@ -1978,7 +1979,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 293 "./toke.l" +#line 293 "toke.l" { char deftype; int n; @@ -2021,7 +2022,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 333 "./toke.l" +#line 333 "toke.l" { int n; @@ -2050,7 +2051,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 359 "./toke.l" +#line 359 "toke.l" { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); @@ -2059,7 +2060,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 365 "./toke.l" +#line 365 "toke.l" { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); @@ -2068,7 +2069,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 371 "./toke.l" +#line 371 "toke.l" { LEXTRACE("NOEXEC "); return NOEXEC; @@ -2076,7 +2077,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 376 "./toke.l" +#line 376 "toke.l" { LEXTRACE("EXEC "); return EXEC; @@ -2084,7 +2085,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 381 "./toke.l" +#line 381 "toke.l" { LEXTRACE("SETENV "); return SETENV; @@ -2092,7 +2093,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 386 "./toke.l" +#line 386 "toke.l" { LEXTRACE("NOSETENV "); return NOSETENV; @@ -2100,7 +2101,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 391 "./toke.l" +#line 391 "toke.l" { LEXTRACE("LOG_OUTPUT "); return LOG_OUTPUT; @@ -2108,7 +2109,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 396 "./toke.l" +#line 396 "toke.l" { LEXTRACE("NOLOG_OUTPUT "); return NOLOG_OUTPUT; @@ -2116,7 +2117,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 401 "./toke.l" +#line 401 "toke.l" { LEXTRACE("LOG_INPUT "); return LOG_INPUT; @@ -2124,7 +2125,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 406 "./toke.l" +#line 406 "toke.l" { LEXTRACE("NOLOG_INPUT "); return NOLOG_INPUT; @@ -2132,7 +2133,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 411 "./toke.l" +#line 411 "toke.l" { /* empty group or netgroup */ LEXTRACE("ERROR "); @@ -2141,7 +2142,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 417 "./toke.l" +#line 417 "toke.l" { /* netgroup */ if (!fill(yytext, yyleng)) @@ -2152,7 +2153,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 425 "./toke.l" +#line 425 "toke.l" { /* group */ if (!fill(yytext, yyleng)) @@ -2163,7 +2164,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 433 "./toke.l" +#line 433 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); @@ -2173,7 +2174,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 440 "./toke.l" +#line 440 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); @@ -2183,7 +2184,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 447 "./toke.l" +#line 447 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); @@ -2197,7 +2198,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 458 "./toke.l" +#line 458 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); @@ -2211,7 +2212,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 469 "./toke.l" +#line 469 "toke.l" { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); @@ -2236,7 +2237,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 491 "./toke.l" +#line 491 "toke.l" { /* no command args allowed for Defaults!/path */ if (!fill_cmnd(yytext, yyleng)) @@ -2247,7 +2248,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 499 "./toke.l" +#line 499 "toke.l" { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -2257,7 +2258,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 506 "./toke.l" +#line 506 "toke.l" { /* directories can't have args... */ if (yytext[yyleng - 1] == '/') { @@ -2275,7 +2276,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 521 "./toke.l" +#line 521 "toke.l" { LEXTRACE("BEGINSTR "); yylval.string = NULL; @@ -2285,7 +2286,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 528 "./toke.l" +#line 528 "toke.l" { /* a word */ if (!fill(yytext, yyleng)) @@ -2296,7 +2297,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 536 "./toke.l" +#line 536 "toke.l" { LEXTRACE("( "); return '('; @@ -2304,7 +2305,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 541 "./toke.l" +#line 541 "toke.l" { LEXTRACE(") "); return ')'; @@ -2312,7 +2313,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 546 "./toke.l" +#line 546 "toke.l" { LEXTRACE(", "); return ','; @@ -2320,7 +2321,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 551 "./toke.l" +#line 551 "toke.l" { LEXTRACE("= "); return '='; @@ -2328,7 +2329,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 556 "./toke.l" +#line 556 "toke.l" { LEXTRACE(": "); return ':'; @@ -2336,7 +2337,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 561 "./toke.l" +#line 561 "toke.l" { if (yyleng & 1) return '!'; /* return '!' */ @@ -2344,7 +2345,7 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 566 "./toke.l" +#line 566 "toke.l" { if (YY_START == INSTR) { LEXTRACE("ERROR "); @@ -2359,14 +2360,14 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 578 "./toke.l" +#line 578 "toke.l" { /* throw away space/tabs */ sawspace = TRUE; /* but remember for fill_args */ } YY_BREAK case 53: YY_RULE_SETUP -#line 582 "./toke.l" +#line 582 "toke.l" { sawspace = TRUE; /* remember for fill_args */ ++sudolineno; @@ -2375,7 +2376,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP -#line 588 "./toke.l" +#line 588 "toke.l" { BEGIN INITIAL; ++sudolineno; @@ -2386,7 +2387,7 @@ YY_RULE_SETUP YY_BREAK case 55: YY_RULE_SETUP -#line 596 "./toke.l" +#line 596 "toke.l" { LEXTRACE("ERROR "); return ERROR; @@ -2398,7 +2399,7 @@ case YY_STATE_EOF(GOTCMND): case YY_STATE_EOF(STARTDEFS): case YY_STATE_EOF(INDEFS): case YY_STATE_EOF(INSTR): -#line 601 "./toke.l" +#line 601 "toke.l" { if (YY_START != INITIAL) { BEGIN INITIAL; @@ -2411,7 +2412,7 @@ case YY_STATE_EOF(INSTR): YY_BREAK case 56: YY_RULE_SETUP -#line 611 "./toke.l" +#line 611 "toke.l" ECHO; YY_BREAK #line 2418 "lex.yy.c" @@ -3305,7 +3306,7 @@ int main() return 0; } #endif -#line 611 "./toke.l" +#line 611 "toke.l" struct path_list { char *path; -- 2.40.0