Add recover_wait state goo.

diff --git a/common/conflex.c b/common/conflex.c
index 26ca7462d1dc6c3c815ef428329498901fa17786..aa65e41784d487eb5f3baaa0d85b8bad6ffce9ef 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.90 2001/03/17 00:47:32 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.91 2001/04/20 18:07:25 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -888,6 +888,8 @@ static enum dhcp_token intern (atom, dfv)
                        return RECOVER;
                if (!strcasecmp (atom + 1, "ecover-done"))
                        return RECOVER_DONE;
+               if (!strcasecmp (atom + 1, "ecover-wait"))
+                       return RECOVER_WAIT;
                if (!strcasecmp (atom + 1, "econtact-interval"))
                        return RECONTACT_INTERVAL;
                if (!strcasecmp (atom + 1, "equest"))

diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 7fb9c753849880e6d417efd6b21a5012b2a678b7..bc3736e54340fb5bae6eed9b52c11adb2b466cc7 100644 (file)
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -309,7 +309,8 @@ enum dhcp_token {
        TOKEN_CREATE = 604,
        TOKEN_OPEN = 605,
        TOKEN_HELP = 606,
-       END_OF_FILE = 607
+       END_OF_FILE = 607,
+       RECOVER_WAIT = 608
 };
 
 #define is_identifier(x)       ((x) >= FIRST_TOKEN &&  \

diff --git a/includes/failover.h b/includes/failover.h
index fbd9bedd9db52cbe824e0ea98f971f51a7c19d72..9c7bd8138e3bcf5a8b699e540833adbaf84b76f9 100644 (file)
--- a/includes/failover.h
+++ b/includes/failover.h
@@ -239,7 +239,8 @@ enum failover_state {
        recover_done,
        shut_down,
        paused,
-       startup
+       startup,
+       recover_wait
 };
 
 /* Service states are simplifications of failover states, particularly

diff --git a/server/confpars.c b/server/confpars.c
index 68010d29e348d15cab111a7325a5ce950249c488..d9cd14d5fe9529c517e98c8012f2f643a9cb79be 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.139 2001/04/16 22:25:04 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.140 2001/04/20 18:07:29 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1126,6 +1126,10 @@ void parse_failover_state (cfile, state, stos)
                state_in = recover;
                break;
                
+             case RECOVER_WAIT:
+               state_in = recover_wait;
+               break;
+               
              case RECOVER_DONE:
                state_in = recover_done;
                break;