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

Don't require a newline at the end of include or includedir directives.

Browse Source
This commit is contained in:
Todd C. Miller
2020-02-14 14:06:45 -07:00
parent 8395a20a20
commit d2314acae8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/sudoers/toke.c
View File

@@ -481,13 +481,13 @@ static yyconst flex_int16_t yy_accept[896] =
43, 0, 0, 0, 0, 0, 43, 43, 43, 43, 43, 0, 0, 0, 0, 0, 43, 43, 43, 43,
43, 43, 43, 43, 53, 53, 53, 0, 37, 53, 43, 43, 43, 43, 53, 53, 53, 0, 37, 53,
53, 0, 24, 0, 29, 47, 0, 22, 72, 72, 53, 0, 24, 0, 29, 47, 0, 22, 20, 72,
62, 0, 62, 42, 42, 42, 42, 53, 53, 53, 62, 0, 62, 42, 42, 42, 42, 53, 53, 53,
53, 62, 62, 42, 42, 42, 42, 0, 0, 0, 53, 62, 62, 42, 42, 42, 42, 0, 0, 0,
0, 0, 43, 43, 43, 43, 43, 43, 43, 43, 0, 0, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 52, 0, 32, 53, 53, 53, 0, 72, 43, 43, 52, 0, 32, 53, 53, 53, 0, 20,
72, 20, 72, 72, 23, 22, 0, 0, 0, 0, 20, 20, 20, 72, 23, 22, 0, 0, 0, 0,
0, 22, 0, 0, 0, 42, 42, 42, 42, 53, 0, 22, 0, 0, 0, 42, 42, 42, 42, 53,
53, 53, 62, 62, 62, 0, 0, 0, 43, 43, 53, 53, 62, 62, 62, 0, 0, 0, 43, 43,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
@@ -496,9 +496,9 @@ static yyconst flex_int16_t yy_accept[896] =
23, 20, 72, 0, 22, 0, 0, 0, 53, 53, 23, 20, 72, 0, 22, 0, 0, 0, 53, 53,
62, 62, 62, 62, 62, 0, 0, 0, 0, 0, 62, 62, 62, 62, 62, 0, 0, 0, 0, 0,
43, 43, 43, 43, 43, 43, 43, 43, 0, 33, 43, 43, 43, 43, 43, 43, 43, 43, 0, 33,
53, 72, 0, 0, 0, 0, 0, 53, 62, 62, 53, 21, 0, 0, 0, 0, 0, 53, 62, 62,
62, 43, 43, 43, 43, 43, 43, 0, 31, 72, 62, 43, 43, 43, 43, 43, 43, 0, 31, 21,
72, 21, 72, 0, 0, 0, 62, 62, 62, 62, 21, 21, 21, 0, 0, 0, 62, 62, 62, 62,
62, 43, 43, 43, 43, 43, 21, 0, 0, 0, 62, 43, 43, 43, 43, 43, 21, 0, 0, 0,
0, 0, 41, 41, 41, 41, 41, 41, 41, 41, 0, 0, 41, 41, 41, 41, 41, 41, 41, 41,
41, 41, 41, 41, 0 41, 41, 41, 41, 0

4
plugins/sudoers/toke.l
View File

@@ -285,7 +285,7 @@ DEFVAR [a-z_]+
yyless(sudoersleng); yyless(sudoersleng);
} /* base64 digest */ } /* base64 digest */
<INITIAL>^#include[[:blank:]]+.*\r?\n { <INITIAL>^#include[[:blank:]]+.*(\r\n|\n)? {
char *path; char *path;
if (continued) { if (continued) {
@@ -303,7 +303,7 @@ DEFVAR [a-z_]+
yyterminate(); yyterminate();
} }
<INITIAL>^#includedir[[:blank:]]+.*\r?\n { <INITIAL>^#includedir[[:blank:]]+.*(\r\n|\n)? {
char *path; char *path;
if (continued) { if (continued) {