From: Wouter Wijngaards Date: Thu, 6 May 2010 05:23:49 +0000 (+0000) Subject: - Fix bug#308: spelling error in variable name in parser and lexer. X-Git-Tag: release-1.4.5rc1~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271445fa4d48141a1cd0a4237cea0ba0304def61;p=thirdparty%2Funbound.git - Fix bug#308: spelling error in variable name in parser and lexer. git-svn-id: file:///svn/unbound/trunk@2110 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index b8a46e6c0..d7adf51b4 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +6 May 2010: Wouter + - Fix bug#308: spelling error in variable name in parser and lexer. + 4 May 2010: Wouter - Fix dnssec-missing detection that was turned off by server selection. - Conforms to draft-ietf-dnsop-default-local-zones-13. Added default diff --git a/util/configlexer.c b/util/configlexer.c index 91bc7c0e9..70318f431 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -2007,7 +2007,7 @@ YY_RULE_SETUP case 46: YY_RULE_SETUP #line 169 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNNSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 47: YY_RULE_SETUP diff --git a/util/configlexer.lex b/util/configlexer.lex index ec39b19cd..2d9b4704f 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -166,7 +166,7 @@ target-fetch-policy{COLON} { YDVAR(1, VAR_TARGET_FETCH_POLICY) } harden-short-bufsize{COLON} { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } harden-large-queries{COLON} { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } harden-glue{COLON} { YDVAR(1, VAR_HARDEN_GLUE) } -harden-dnssec-stripped{COLON} { YDVAR(1, VAR_HARDEN_DNNSEC_STRIPPED) } +harden-dnssec-stripped{COLON} { YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } harden-referral-path{COLON} { YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } use-caps-for-id{COLON} { YDVAR(1, VAR_USE_CAPS_FOR_ID) } unwanted-reply-threshold{COLON} { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } diff --git a/util/configparser.c b/util/configparser.c index f420a9b3b..cec2006b5 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -192,7 +192,7 @@ extern struct config_parser_state* cfg_parser; VAR_ROOT_HINTS = 323, VAR_DO_NOT_QUERY_LOCALHOST = 324, VAR_CACHE_MAX_TTL = 325, - VAR_HARDEN_DNNSEC_STRIPPED = 326, + VAR_HARDEN_DNSSEC_STRIPPED = 326, VAR_ACCESS_CONTROL = 327, VAR_LOCAL_ZONE = 328, VAR_LOCAL_DATA = 329, @@ -309,7 +309,7 @@ extern struct config_parser_state* cfg_parser; #define VAR_ROOT_HINTS 323 #define VAR_DO_NOT_QUERY_LOCALHOST 324 #define VAR_CACHE_MAX_TTL 325 -#define VAR_HARDEN_DNNSEC_STRIPPED 326 +#define VAR_HARDEN_DNSSEC_STRIPPED 326 #define VAR_ACCESS_CONTROL 327 #define VAR_LOCAL_ZONE 328 #define VAR_LOCAL_DATA 329 @@ -806,7 +806,7 @@ static const char *const yytname[] = "VAR_KEY_CACHE_SIZE", "VAR_KEY_CACHE_SLABS", "VAR_TRUSTED_KEYS_FILE", "VAR_VAL_NSEC3_KEYSIZE_ITERATIONS", "VAR_USE_SYSLOG", "VAR_OUTGOING_INTERFACE", "VAR_ROOT_HINTS", "VAR_DO_NOT_QUERY_LOCALHOST", - "VAR_CACHE_MAX_TTL", "VAR_HARDEN_DNNSEC_STRIPPED", "VAR_ACCESS_CONTROL", + "VAR_CACHE_MAX_TTL", "VAR_HARDEN_DNSSEC_STRIPPED", "VAR_ACCESS_CONTROL", "VAR_LOCAL_ZONE", "VAR_LOCAL_DATA", "VAR_INTERFACE_AUTOMATIC", "VAR_STATISTICS_INTERVAL", "VAR_DO_DAEMONIZE", "VAR_USE_CAPS_FOR_ID", "VAR_STATISTICS_CUMULATIVE", "VAR_OUTGOING_PORT_PERMIT", diff --git a/util/configparser.h b/util/configparser.h index fe2f2a089..524854371 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -107,7 +107,7 @@ VAR_ROOT_HINTS = 323, VAR_DO_NOT_QUERY_LOCALHOST = 324, VAR_CACHE_MAX_TTL = 325, - VAR_HARDEN_DNNSEC_STRIPPED = 326, + VAR_HARDEN_DNSSEC_STRIPPED = 326, VAR_ACCESS_CONTROL = 327, VAR_LOCAL_ZONE = 328, VAR_LOCAL_DATA = 329, @@ -224,7 +224,7 @@ #define VAR_ROOT_HINTS 323 #define VAR_DO_NOT_QUERY_LOCALHOST 324 #define VAR_CACHE_MAX_TTL 325 -#define VAR_HARDEN_DNNSEC_STRIPPED 326 +#define VAR_HARDEN_DNSSEC_STRIPPED 326 #define VAR_ACCESS_CONTROL 327 #define VAR_LOCAL_ZONE 328 #define VAR_LOCAL_DATA 329 diff --git a/util/configparser.y b/util/configparser.y index 919486838..4bc49cdc1 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -86,7 +86,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_KEY_CACHE_SLABS VAR_TRUSTED_KEYS_FILE %token VAR_VAL_NSEC3_KEYSIZE_ITERATIONS VAR_USE_SYSLOG %token VAR_OUTGOING_INTERFACE VAR_ROOT_HINTS VAR_DO_NOT_QUERY_LOCALHOST -%token VAR_CACHE_MAX_TTL VAR_HARDEN_DNNSEC_STRIPPED VAR_ACCESS_CONTROL +%token VAR_CACHE_MAX_TTL VAR_HARDEN_DNSSEC_STRIPPED VAR_ACCESS_CONTROL %token VAR_LOCAL_ZONE VAR_LOCAL_DATA VAR_INTERFACE_AUTOMATIC %token VAR_STATISTICS_INTERVAL VAR_DO_DAEMONIZE VAR_USE_CAPS_FOR_ID %token VAR_STATISTICS_CUMULATIVE VAR_OUTGOING_PORT_PERMIT @@ -699,7 +699,7 @@ server_harden_glue: VAR_HARDEN_GLUE STRING_ARG free($2); } ; -server_harden_dnssec_stripped: VAR_HARDEN_DNNSEC_STRIPPED STRING_ARG +server_harden_dnssec_stripped: VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", $2)); if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)