From: Ted Lemon <source@isc.org>
Date: Tue, 6 Jul 1999 20:41:25 +0000 (+0000)
Subject: Regularize TOKEN_NOT vs. NOT.
X-Git-Tag: V3-BETA-1-PATCH-0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6fb153e5fcad4cfb996a09b4ab7b5c1d5b3ea1;p=thirdparty%2Fdhcp.git

Regularize TOKEN_NOT vs. NOT.
---

diff --git a/common/conflex.c b/common/conflex.c
index c33620c7f..deb099b8c 100644
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.47 1999/07/06 16:49:59 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.48 1999/07/06 20:41:22 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -539,8 +539,6 @@ static enum dhcp_token intern (atom, dfv)
 			return MY;
 		break;
 	      case 'n':
-		if (!strcasecmp (atom + 1, "ot"))
-			return NOT;
 		if (!strcasecmp (atom + 1, "ormal"))
 			return NORMAL;
 		if (!strcasecmp (atom + 1, "ameserver"))
diff --git a/common/parse.c b/common/parse.c
index abb694b96..fe74b9ec6 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: parse.c,v 1.27 1999/07/06 16:57:05 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: parse.c,v 1.28 1999/07/06 20:41:22 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1514,7 +1514,7 @@ int parse_non_binary (expr, cfile, lose, context)
 		(*expr) -> data.check = col;
 		break;
 
-	      case NOT:
+	      case TOKEN_NOT:
 		token = next_token (&val, cfile);
 		if (!expression_allocate (expr, "parse_expression: NOT"))
 			log_fatal ("can't allocate expression");
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 0dcf2b65a..b1e78a64a 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -113,7 +113,9 @@ enum dhcp_token {
 	MIN_SECS = 333,
 	AND = 334,
 	OR = 335,
+#if 0
 	NOT = 336,
+#endif
 	SUBSTRING = 337,
 	SUFFIX = 338,
 	CHECK = 339,