From: Ted Lemon <source@isc.org>
Date: Thu, 24 Aug 2000 18:46:31 +0000 (+0000)
Subject: POTENTIAL_CONFLICT_NIC -> RESOLUTION_INTERRUPTED.
X-Git-Tag: V3-BETA-2-PATCH-1~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a092d2e23a74612d7612367d8978de4e5d38787;p=thirdparty%2Fdhcp.git

POTENTIAL_CONFLICT_NIC -> RESOLUTION_INTERRUPTED.
---

diff --git a/server/confpars.c b/server/confpars.c
index 5c98f8a60..219eab4dd 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.122 2000/08/15 22:23:33 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.123 2000/08/24 18:46:31 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1007,8 +1007,8 @@ void parse_failover_state (cfile, state, stos)
 		state_in = potential_conflict;
 		break;
 
-	      case POTENTIAL_CONFLICT_NIC:
-		state_in = potential_conflict;
+	      case RESOLUTION_INTERRUPTED:
+		state_in = resolution_interrupted;
 		break;
 
 	      case RECOVER: