From: Ted Lemon <source@isc.org>
Date: Fri, 1 Sep 2000 00:10:26 +0000 (+0000)
Subject: Fix two bugs in class parsing.
X-Git-Tag: V3-BETA-2-PATCH-1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b19f2e1c315efcdad916ea117f5c098c737f30c0;p=thirdparty%2Fdhcp.git

Fix two bugs in class parsing.
---

diff --git a/server/confpars.c b/server/confpars.c
index 8bf24d863..76733153f 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.124 2000/08/31 04:39:41 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.125 2000/09/01 00:10:26 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1603,8 +1603,8 @@ int parse_class_declaration (cp, cfile, group, type)
 			memset (&data, 0, sizeof data);
 			if (!parse_cshl (&data, cfile)) {
 				class_dereference (&pc, MDL);
-			}
 				return 0;
+			}
 		} else {
 			parse_warn (cfile, "Expecting string or hex list.");
 			class_dereference (&pc, MDL);
@@ -1744,6 +1744,8 @@ int parse_class_declaration (cp, cfile, group, type)
 				break;
 			}
 			token = next_token (&val, cfile);
+			class -> spawning = 1;
+		      submatch:
 			token = next_token (&val, cfile);
 			if (token != WITH) {
 				parse_warn (cfile,
@@ -1751,8 +1753,6 @@ int parse_class_declaration (cp, cfile, group, type)
 				skip_to_semi (cfile);
 				break;
 			}
-			class -> spawning = 1;
-		      submatch:
 			if (class -> submatch) {
 				parse_warn (cfile,
 					    "can't override existing %s.",