Added tokens for "close", "create", "open", and "help" to the lexer.

diff --git a/common/conflex.c b/common/conflex.c
index d0c4812dd8d33335162000f0ec713159d59c8938..ba22e32b340d7ebc212d801ee9e9870ebb301809 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.87 2001/01/25 08:20:21 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.88 2001/02/27 01:15:36 neild Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -556,6 +556,10 @@ static enum dhcp_token intern (atom, dfv)
                        return CHECK;
                if (!strcasecmp (atom + 1, "lass"))
                        return CLASS;
+               if (!strcasecmp (atom + 1, "lose"))
+                       return TOKEN_CLOSE;
+               if (!strcasecmp (atom + 1, "reate"))
+                       return TOKEN_CREATE;
                if (!strcasecmp (atom + 1, "iaddr"))
                        return CIADDR;
                if (!strncasecmp (atom + 1, "lient", 5)) {
@@ -693,6 +697,8 @@ static enum dhcp_token intern (atom, dfv)
                        return HARDWARE;
                if (!strcasecmp (atom + 1, "ostname"))
                        return HOSTNAME;
+               if (!strcasecmp (atom + 1, "elp"))
+                       return TOKEN_HELP;
                break;
              case 'i':
                if (!strcasecmp (atom + 1, "nclude"))
@@ -819,6 +825,8 @@ static enum dhcp_token intern (atom, dfv)
                        return OR;
                if (!strcasecmp (atom + 1, "n"))
                        return ON;
+               if (!strcasecmp (atom + 1, "pen"))
+                       return TOKEN_OPEN;
                if (!strcasecmp (atom + 1, "ption"))
                        return OPTION;
                if (!strcasecmp (atom + 1, "ne-lease-per-client"))

diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index f9e2360f5f85f9c750be2f9e1345a94252b65b81..cd94c02c4b02421f66cb43269d9dd13d4dc328b9 100644 (file)
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -304,7 +304,11 @@ enum dhcp_token {
        RECONTACT_INTERVAL = 600,
        CLIENT_UPDATES = 601,
        TOKEN_NEW = 601,
-       TRANSMISSION = 602
+       TRANSMISSION = 602,
+       TOKEN_CLOSE = 603,
+       TOKEN_CREATE = 604,
+       TOKEN_OPEN = 605,
+       TOKEN_HELP = 606
 };
 
 #define is_identifier(x)       ((x) >= FIRST_TOKEN &&  \