fixup tests.

git-svn-id: file:///svn/unbound/trunk@646 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2007-09-26 11:29:37 +00:00
parent 6a482dc7f2
commit c2f8d43f9d
4 changed files with 3 additions and 9 deletions

View File

@ -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

View File

@ -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

View File

@ -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 */

View File

@ -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