fixup tests.

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

diff --git a/Makefile.in b/Makefile.in
index f43493fb28d01f986776c146226e484070bea5d0..d34284828b9f37a393fdf57c697dff9763705838 100644 (file)
--- 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 a85a86483d9765d3bf20002baa758d600f0d7d7f..751d2384ea694fecdee126b5a15f0a163122bc35 100644 (file)
--- 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 8f08d67cf90eaa1f15681bf56f17b826c3315489..10d6ddca13e3d25dff6d2bf97d8df799782bf094 100644 (file)
--- 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 56ebe4d4f8df8870e3bbe41051605fd50c1a7ab9..09da835fa7f82a8915a928e25c15a778185fd821 100644 (file)
--- 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