From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 1 Jun 2016 18:38:53 +0000 (-0600)
Subject: Back out cfa26b99228f, it was already fixed differently.
X-Git-Tag: SUDO_1_8_17^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc517ba9f890e8671e5d4cdda4134c9cffd64d8b;p=sudo

Back out cfa26b99228f, it was already fixed differently.
Caught by regress checks.
---

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index 7b9ff9e70..4cd0393e4 100644
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -2385,7 +2385,7 @@ YY_RULE_SETUP
 				LEXTRACE("ERROR "); /* empty string */
 				LEXRETURN(ERROR);
 			    }
-			    if (prev_state == INITIAL || prev_state == GOTDEFS) {
+			    if (prev_state == INITIAL) {
 				switch (sudoerslval.string[0]) {
 				case '%':
 				    if (sudoerslval.string[1] == '\0' ||
diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index 4aac66a4e..ca910f245 100644
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -185,7 +185,7 @@ DEFVAR			[a-z_]+
 				LEXTRACE("ERROR "); /* empty string */
 				LEXRETURN(ERROR);
 			    }
-			    if (prev_state == INITIAL || prev_state == GOTDEFS) {
+			    if (prev_state == INITIAL) {
 				switch (sudoerslval.string[0]) {
 				case '%':
 				    if (sudoerslval.string[1] == '\0' ||