From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 26 Sep 2007 11:29:37 +0000 (+0000)
Subject: fixup tests.
X-Git-Tag: release-0.6~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f8d43f9dacb34759a9f5cc1f575d668f21b6ae;p=thirdparty%2Funbound.git

fixup tests.


git-svn-id: file:///svn/unbound/trunk@646 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/Makefile.in b/Makefile.in
index f43493fb2..d34284828 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ endif
 BUILD=build/
 
 LINT=splint
-LINTFLAGS=+quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc -Drlimit=rlimit64 +posixlib
+LINTFLAGS=+quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc -Drlimit=rlimit64 -D__gnuc_va_list=va_list
 # compat with openssl linux edition.
 LINTFLAGS+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int" -DPQ_64BIT=uint64_t
 
diff --git a/util/config_file.c b/util/config_file.c
index a85a86483..751d2384e 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -142,7 +142,6 @@ create_cfg_parser(struct config_file* cfg, char* filename)
 	cfg_parser->line = 1;
 	cfg_parser->errors = 0;
 	cfg_parser->cfg = cfg;
-	cfg_parser->server_settings_seen = 0;
 }
 
 int 
diff --git a/util/config_file.h b/util/config_file.h
index 8f08d67cf..10d6ddca1 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -256,8 +256,6 @@ struct config_parser_state {
 	int errors;
 	/** the result of parsing is stored here. */
 	struct config_file* cfg;
-	/** has server: already been seen. */
-	int server_settings_seen;
 };
 
 /** global config parser object used during config parsing */
diff --git a/util/configparser.y b/util/configparser.y
index 56ebe4d4f..09da835fa 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -94,11 +94,8 @@ toplevelvar: serverstart contents_server | stubstart contents_stub |
 
 /* server: declaration */
 serverstart: VAR_SERVER
-	{ OUTYY(("\nP(server:)\n")); 
-		if(cfg_parser->server_settings_seen) {
-			yyerror("duplicate server: element.");
-		}
-		cfg_parser->server_settings_seen = 1;
+	{ 
+		OUTYY(("\nP(server:)\n")); 
 	}
 	;
 contents_server: contents_server content_server