Regularize TOKEN_NOT vs. NOT.

diff --git a/common/conflex.c b/common/conflex.c
index c33620c7f065abd788518206705cda50247c0a56..deb099b8c80fea190d5cd72641275968d0db93a6 100644 (file)
--- 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 abb694b966809c248730a8d7ab84c2da964effd6..fe74b9ec67455025d3c3a63b8c6e95d55e5f172d 100644 (file)
--- 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 0dcf2b65aca8bc27d91d333eed9fdf5c34433f4b..b1e78a64a3bdc96e7ddbafd6a1e27b7b50a29388 100644 (file)
--- 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,