From: Ted Lemon <source@isc.org>
Date: Tue, 23 Feb 1999 19:07:14 +0000 (+0000)
Subject: Fix up authoritative parsing.
X-Git-Tag: V3-ALPHA-19990315~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b8223ae219f88f75a0c15a2c2f7dd492c09f25f;p=thirdparty%2Fdhcp.git

Fix up authoritative parsing.
---

diff --git a/server/confpars.c b/server/confpars.c
index 2b29200ac..a8b01435c 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.58 1999/02/14 19:40:22 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.59 1999/02/23 19:07:14 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -368,6 +368,7 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 		goto insert_statement;
 
 	      case TOKEN_NOT:
+		token = next_token (&val, cfile);
 		token = next_token (&val, cfile);
 		switch (token) {
 		      case AUTHORITATIVE:
@@ -380,11 +381,11 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 		}
 		break;
 	      case AUTHORITATIVE:
+		token = next_token (&val, cfile);
 		group -> authoritative = 1;
 	      authoritative:
-		if (type == HOST_DECL ||
-		    (type == SUBNET_DECL && share && share -> subnets &&
-		     share -> subnets -> next_sibling))
+		if (type == HOST_DECL)
+			parse_warn ("authority makes no sense here."); 
 		parse_semi (cfile);
 		break;