Add unknown-state and potential-conflict-nic

diff --git a/common/conflex.c b/common/conflex.c
index a9df4cb4b18e119c990be87cae019957104b51ba..0d7bc89cf91da74f25ef3c056bae053c04f1e85f 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.72 2000/05/01 17:25:36 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.73 2000/05/03 05:56:28 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -813,6 +813,8 @@ static enum dhcp_token intern (atom, dfv)
                        return PORT;
                if (!strcasecmp (atom + 1, "otential-conflict"))
                        return POTENTIAL_CONFLICT;
+               if (!strcasecmp (atom + 1, "otential-conflict-nic"))
+                       return POTENTIAL_CONFLICT_NIC;
                if (!strcasecmp (atom + 1, "ick-first-value") ||
                    !strcasecmp (atom + 1, "ick"))
                        return PICK;
@@ -846,6 +848,8 @@ static enum dhcp_token intern (atom, dfv)
                        return NS_REFUSED;
                break;
              case 's':
+               if (!strcasecmp (atom + 1, "tate"))
+                       return STATE;
                if (!strcasecmp (atom + 1, "ecret"))
                        return SECRET;
                if (!strcasecmp (atom + 1, "ervfail"))
@@ -936,6 +940,8 @@ static enum dhcp_token intern (atom, dfv)
                if (!strncasecmp (atom + 1, "nknown", 6)) {
                        if (!strcasecmp (atom + 7, "-clients"))
                                return UNKNOWN_CLIENTS;
+                       if (!strcasecmp (atom + 7, "-state"))
+                               return UNKNOWN_STATE;
                        if (!atom [7])
                                return UNKNOWN;
                        break;

diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 01cc6762377eba1ee15c9ec73200ab3c6475aa7d..0fcfd0cd486efb7b23500385b530de7b6d6b41fd 100644 (file)
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -263,7 +263,10 @@ enum dhcp_token {
        BALANCE = 461,
        TOKEN_MAX = 462,
        SECONDS = 463,
-       ADDRESS = 464
+       ADDRESS = 464,
+       POTENTIAL_CONFLICT_NIC = 465,
+       STATE = 466,
+       UNKNOWN_STATE = 567
 };
 
 #define is_identifier(x)       ((x) >= FIRST_TOKEN &&  \