diff options
Diffstat (limited to '')
| -rw-r--r-- | external/unbound/util/config_file.c | 24 | ||||
| -rw-r--r-- | external/unbound/util/configlexer.c | 4 | ||||
| -rw-r--r-- | external/unbound/util/configparser.c | 408 | ||||
| -rw-r--r-- | external/unbound/util/configparser.h | 12 | ||||
| -rw-r--r-- | external/unbound/util/data/dname.c | 30 | ||||
| -rw-r--r-- | external/unbound/util/data/msgreply.c | 13 | ||||
| -rw-r--r-- | external/unbound/util/data/msgreply.h | 5 | ||||
| -rw-r--r-- | external/unbound/util/fptr_wlist.c | 4 | ||||
| -rw-r--r-- | external/unbound/util/fptr_wlist.h | 4 | ||||
| -rw-r--r-- | external/unbound/util/iana_ports.inc | 5 | ||||
| -rw-r--r-- | external/unbound/util/mini_event.h | 15 | ||||
| -rw-r--r-- | external/unbound/util/module.h | 10 | ||||
| -rw-r--r-- | external/unbound/util/net_help.c | 14 | ||||
| -rw-r--r-- | external/unbound/util/winsock_event.h | 15 |
14 files changed, 297 insertions, 266 deletions
diff --git a/external/unbound/util/config_file.c b/external/unbound/util/config_file.c index 96ec2f11d..35bc6452a 100644 --- a/external/unbound/util/config_file.c +++ b/external/unbound/util/config_file.c @@ -1105,7 +1105,7 @@ cfg_count_numbers(const char* s) /* sp ::= (space|tab)* */ int num = 0; while(*s) { - while(*s && isspace((int)*s)) + while(*s && isspace((unsigned char)*s)) s++; if(!*s) /* end of string */ break; @@ -1113,9 +1113,9 @@ cfg_count_numbers(const char* s) s++; if(!*s) /* only - not allowed */ return 0; - if(!isdigit((int)*s)) /* bad character */ + if(!isdigit((unsigned char)*s)) /* bad character */ return 0; - while(*s && isdigit((int)*s)) + while(*s && isdigit((unsigned char)*s)) s++; num++; } @@ -1127,7 +1127,7 @@ static int isalldigit(const char* str, size_t l) { size_t i; for(i=0; i<l; i++) - if(!isdigit(str[i])) + if(!isdigit((unsigned char)str[i])) return 0; return 1; } @@ -1153,13 +1153,13 @@ cfg_parse_memsize(const char* str, size_t* res) else if(len > 1 && str[len-1] == 'B') len--; - if(len > 1 && tolower(str[len-1]) == 'g') + if(len > 1 && tolower((unsigned char)str[len-1]) == 'g') mult = 1024*1024*1024; - else if(len > 1 && tolower(str[len-1]) == 'm') + else if(len > 1 && tolower((unsigned char)str[len-1]) == 'm') mult = 1024*1024; - else if(len > 1 && tolower(str[len-1]) == 'k') + else if(len > 1 && tolower((unsigned char)str[len-1]) == 'k') mult = 1024; - else if(len > 0 && isdigit(str[len-1])) + else if(len > 0 && isdigit((unsigned char)str[len-1])) mult = 1; else { log_err("unknown size specifier: '%s'", str); @@ -1322,7 +1322,7 @@ cfg_parse_local_zone(struct config_file* cfg, const char* val) /* parse it as: [zone_name] [between stuff] [zone_type] */ name = val; - while(*name && isspace(*name)) + while(*name && isspace((unsigned char)*name)) name++; if(!*name) { log_err("syntax error: too short: %s", val); @@ -1341,7 +1341,7 @@ cfg_parse_local_zone(struct config_file* cfg, const char* val) buf[name_end-name] = '\0'; type = last_space_pos(name_end); - while(type && *type && isspace(*type)) + while(type && *type && isspace((unsigned char)*type)) type++; if(!type || !*type) { log_err("syntax error: expected zone type: %s", val); @@ -1368,7 +1368,7 @@ char* cfg_ptr_reverse(char* str) /* parse it as: [IP] [between stuff] [name] */ ip = str; - while(*ip && isspace(*ip)) + while(*ip && isspace((unsigned char)*ip)) ip++; if(!*ip) { log_err("syntax error: too short: %s", str); @@ -1423,7 +1423,7 @@ char* cfg_ptr_reverse(char* str) } /* printed the reverse address, now the between goop and name on end */ - while(*ip_end && isspace(*ip_end)) + while(*ip_end && isspace((unsigned char)*ip_end)) ip_end++; if(name>ip_end) { snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%.*s", diff --git a/external/unbound/util/configlexer.c b/external/unbound/util/configlexer.c index f1336a256..4a0380e6a 100644 --- a/external/unbound/util/configlexer.c +++ b/external/unbound/util/configlexer.c @@ -10,7 +10,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 36 +#define YY_FLEX_SUBMINOR_VERSION 37 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -3787,7 +3787,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; diff --git a/external/unbound/util/configparser.c b/external/unbound/util/configparser.c index 089d675d9..6285e3f6f 100644 --- a/external/unbound/util/configparser.c +++ b/external/unbound/util/configparser.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.1. */ +/* A Bison parser, made by GNU Bison 2.7. */ /* Bison implementation for Yacc-like parsers in C @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.1" +#define YYBISON_VERSION "2.7" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,7 +62,7 @@ /* Copy the first part of user declarations. */ -/* Line 336 of yacc.c */ +/* Line 371 of yacc.c */ #line 38 "./util/configparser.y" #include "config.h" @@ -90,7 +90,7 @@ extern struct config_parser_state* cfg_parser; #endif -/* Line 336 of yacc.c */ +/* Line 371 of yacc.c */ #line 95 "util/configparser.c" # ifndef YY_NULL @@ -111,8 +111,8 @@ extern struct config_parser_state* cfg_parser; /* In a future release of Bison, this section will be replaced by #include "configparser.h". */ -#ifndef YY_UTIL_CONFIGPARSER_H -# define YY_UTIL_CONFIGPARSER_H +#ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED +# define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -428,13 +428,13 @@ extern int yydebug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 350 of yacc.c */ +/* Line 387 of yacc.c */ #line 64 "./util/configparser.y" char* str; -/* Line 350 of yacc.c */ +/* Line 387 of yacc.c */ #line 439 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 @@ -458,11 +458,11 @@ int yyparse (); #endif #endif /* ! YYPARSE_PARAM */ -#endif /* !YY_UTIL_CONFIGPARSER_H */ +#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 353 of yacc.c */ +/* Line 390 of yacc.c */ #line 467 "util/configparser.c" #ifdef short @@ -516,24 +516,24 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -1289,10 +1289,10 @@ static const yytype_uint16 yytable[] = 422, 423, 424, 425, 426, 427, 428 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-123)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-123))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = @@ -1420,47 +1420,18 @@ do \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) - - /* This macro is provided for backward compatibility. */ - #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else @@ -1523,7 +1494,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) switch (yytype) { default: - break; + break; } } @@ -1765,7 +1736,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, { YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ const char *yyformat = YY_NULL; @@ -1828,11 +1798,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -1852,10 +1824,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -1915,7 +1889,7 @@ yydestruct (yymsg, yytype, yyvaluep) { default: - break; + break; } } @@ -1925,8 +1899,17 @@ yydestruct (yymsg, yytype, yyvaluep) /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -1984,7 +1967,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -2002,9 +1985,8 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -2013,13 +1995,6 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; goto yysetstate; /*------------------------------------------------------------. @@ -2160,7 +2135,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -2197,7 +2174,7 @@ yyreduce: switch (yyn) { case 10: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 129 "./util/configparser.y" { OUTYY(("\nP(server:)\n")); @@ -2205,7 +2182,7 @@ yyreduce: break; case 117: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 180 "./util/configparser.y" { struct config_stub* s; @@ -2220,7 +2197,7 @@ yyreduce: break; case 125: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 196 "./util/configparser.y" { struct config_stub* s; @@ -2235,7 +2212,7 @@ yyreduce: break; case 132: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 212 "./util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2247,7 +2224,7 @@ yyreduce: break; case 133: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 221 "./util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2259,7 +2236,7 @@ yyreduce: break; case 134: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 230 "./util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2273,7 +2250,7 @@ yyreduce: break; case 135: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 241 "./util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2285,7 +2262,7 @@ yyreduce: break; case 136: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 250 "./util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2297,7 +2274,7 @@ yyreduce: break; case 137: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 259 "./util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2309,7 +2286,7 @@ yyreduce: break; case 138: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 268 "./util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2325,7 +2302,7 @@ yyreduce: break; case 139: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 281 "./util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2343,7 +2320,7 @@ yyreduce: break; case 140: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 296 "./util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2355,7 +2332,7 @@ yyreduce: break; case 141: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 305 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2367,7 +2344,7 @@ yyreduce: break; case 142: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 314 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2379,7 +2356,7 @@ yyreduce: break; case 143: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 323 "./util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2391,7 +2368,7 @@ yyreduce: break; case 144: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 332 "./util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2403,7 +2380,7 @@ yyreduce: break; case 145: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 341 "./util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2415,7 +2392,7 @@ yyreduce: break; case 146: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 350 "./util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2427,7 +2404,7 @@ yyreduce: break; case 147: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 359 "./util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2439,7 +2416,7 @@ yyreduce: break; case 148: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 368 "./util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2451,7 +2428,7 @@ yyreduce: break; case 149: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 377 "./util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2463,7 +2440,7 @@ yyreduce: break; case 150: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 386 "./util/configparser.y" { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2475,7 +2452,7 @@ yyreduce: break; case 151: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 395 "./util/configparser.y" { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2487,7 +2464,7 @@ yyreduce: break; case 152: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 404 "./util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2497,7 +2474,7 @@ yyreduce: break; case 153: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 411 "./util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2507,7 +2484,7 @@ yyreduce: break; case 154: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 418 "./util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2519,7 +2496,7 @@ yyreduce: break; case 155: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 427 "./util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2531,7 +2508,7 @@ yyreduce: break; case 156: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 436 "./util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2548,7 +2525,7 @@ yyreduce: break; case 157: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 450 "./util/configparser.y" { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2560,7 +2537,7 @@ yyreduce: break; case 158: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 459 "./util/configparser.y" { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2572,7 +2549,7 @@ yyreduce: break; case 159: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 468 "./util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2582,7 +2559,7 @@ yyreduce: break; case 160: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 475 "./util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2592,7 +2569,7 @@ yyreduce: break; case 161: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 482 "./util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2602,7 +2579,7 @@ yyreduce: break; case 162: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 489 "./util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2613,7 +2590,7 @@ yyreduce: break; case 163: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 497 "./util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2623,7 +2600,7 @@ yyreduce: break; case 164: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 504 "./util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2633,7 +2610,7 @@ yyreduce: break; case 165: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 511 "./util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2643,7 +2620,7 @@ yyreduce: break; case 166: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 518 "./util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2653,7 +2630,7 @@ yyreduce: break; case 167: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 525 "./util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2664,7 +2641,7 @@ yyreduce: break; case 168: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 533 "./util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2675,7 +2652,7 @@ yyreduce: break; case 169: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 541 "./util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2686,7 +2663,7 @@ yyreduce: break; case 170: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 549 "./util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2696,7 +2673,7 @@ yyreduce: break; case 171: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 556 "./util/configparser.y" { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2706,7 +2683,7 @@ yyreduce: break; case 172: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 563 "./util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2718,7 +2695,7 @@ yyreduce: break; case 173: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 572 "./util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2730,7 +2707,7 @@ yyreduce: break; case 174: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 581 "./util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2740,7 +2717,7 @@ yyreduce: break; case 175: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 588 "./util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2750,7 +2727,7 @@ yyreduce: break; case 176: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 595 "./util/configparser.y" { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2761,7 +2738,7 @@ yyreduce: break; case 177: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 603 "./util/configparser.y" { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2772,7 +2749,7 @@ yyreduce: break; case 178: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 611 "./util/configparser.y" { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2785,7 +2762,7 @@ yyreduce: break; case 179: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 621 "./util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2801,7 +2778,7 @@ yyreduce: break; case 180: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 634 "./util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2815,7 +2792,7 @@ yyreduce: break; case 181: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 645 "./util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2826,7 +2803,7 @@ yyreduce: break; case 182: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 653 "./util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2842,7 +2819,7 @@ yyreduce: break; case 183: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 666 "./util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2854,7 +2831,7 @@ yyreduce: break; case 184: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 675 "./util/configparser.y" { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2866,7 +2843,7 @@ yyreduce: break; case 185: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 684 "./util/configparser.y" { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2878,7 +2855,7 @@ yyreduce: break; case 186: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 693 "./util/configparser.y" { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2891,7 +2868,7 @@ yyreduce: break; case 187: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 703 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2902,7 +2879,7 @@ yyreduce: break; case 188: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 711 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2918,7 +2895,7 @@ yyreduce: break; case 189: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 724 "./util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2930,7 +2907,7 @@ yyreduce: break; case 190: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 733 "./util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2941,7 +2918,7 @@ yyreduce: break; case 191: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 741 "./util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2953,7 +2930,7 @@ yyreduce: break; case 192: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 750 "./util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2964,7 +2941,7 @@ yyreduce: break; case 193: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 758 "./util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2980,7 +2957,7 @@ yyreduce: break; case 194: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 771 "./util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); @@ -2990,7 +2967,7 @@ yyreduce: break; case 195: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 778 "./util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3003,7 +2980,7 @@ yyreduce: break; case 196: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 788 "./util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3016,7 +2993,7 @@ yyreduce: break; case 197: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 798 "./util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3029,7 +3006,7 @@ yyreduce: break; case 198: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 808 "./util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3042,7 +3019,7 @@ yyreduce: break; case 199: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 818 "./util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3055,7 +3032,7 @@ yyreduce: break; case 200: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 828 "./util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3068,7 +3045,7 @@ yyreduce: break; case 201: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 838 "./util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3081,7 +3058,7 @@ yyreduce: break; case 202: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 848 "./util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3091,7 +3068,7 @@ yyreduce: break; case 203: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 855 "./util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3101,7 +3078,7 @@ yyreduce: break; case 204: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 862 "./util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3113,7 +3090,7 @@ yyreduce: break; case 205: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 871 "./util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3125,7 +3102,7 @@ yyreduce: break; case 206: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 880 "./util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3137,7 +3114,7 @@ yyreduce: break; case 207: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 889 "./util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3147,7 +3124,7 @@ yyreduce: break; case 208: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 896 "./util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3160,7 +3137,7 @@ yyreduce: break; case 209: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 906 "./util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); @@ -3180,7 +3157,7 @@ yyreduce: break; case 210: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 923 "./util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3190,7 +3167,7 @@ yyreduce: break; case 211: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 930 "./util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3211,7 +3188,7 @@ yyreduce: break; case 212: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 948 "./util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3227,7 +3204,7 @@ yyreduce: break; case 213: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 961 "./util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3243,7 +3220,7 @@ yyreduce: break; case 214: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 974 "./util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3255,7 +3232,7 @@ yyreduce: break; case 215: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 983 "./util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3267,7 +3244,7 @@ yyreduce: break; case 216: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 992 "./util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3279,7 +3256,7 @@ yyreduce: break; case 217: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1001 "./util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3292,7 +3269,7 @@ yyreduce: break; case 218: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1011 "./util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3305,7 +3282,7 @@ yyreduce: break; case 219: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1021 "./util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3317,7 +3294,7 @@ yyreduce: break; case 220: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1030 "./util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3329,7 +3306,7 @@ yyreduce: break; case 221: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1039 "./util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3339,7 +3316,7 @@ yyreduce: break; case 222: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1046 "./util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3351,7 +3328,7 @@ yyreduce: break; case 223: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1055 "./util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3363,7 +3340,7 @@ yyreduce: break; case 224: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1064 "./util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3375,7 +3352,7 @@ yyreduce: break; case 225: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1073 "./util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3386,7 +3363,7 @@ yyreduce: break; case 226: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1081 "./util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3402,7 +3379,7 @@ yyreduce: break; case 227: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1094 "./util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3413,7 +3390,7 @@ yyreduce: break; case 228: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1102 "./util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); @@ -3438,7 +3415,7 @@ yyreduce: break; case 229: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1124 "./util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3448,7 +3425,7 @@ yyreduce: break; case 230: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1131 "./util/configparser.y" { char* ptr; @@ -3466,7 +3443,7 @@ yyreduce: break; case 231: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1146 "./util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3479,7 +3456,7 @@ yyreduce: break; case 232: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1156 "./util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3492,7 +3469,7 @@ yyreduce: break; case 233: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1166 "./util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3502,7 +3479,7 @@ yyreduce: break; case 234: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1173 "./util/configparser.y" { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3512,7 +3489,7 @@ yyreduce: break; case 235: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1180 "./util/configparser.y" { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3524,7 +3501,7 @@ yyreduce: break; case 236: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1189 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3537,7 +3514,7 @@ yyreduce: break; case 237: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1199 "./util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3547,7 +3524,7 @@ yyreduce: break; case 238: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1206 "./util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3557,7 +3534,7 @@ yyreduce: break; case 239: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1213 "./util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3569,7 +3546,7 @@ yyreduce: break; case 240: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1222 "./util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3582,7 +3559,7 @@ yyreduce: break; case 241: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1232 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3595,7 +3572,7 @@ yyreduce: break; case 242: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1242 "./util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3605,7 +3582,7 @@ yyreduce: break; case 243: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1249 "./util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3615,7 +3592,7 @@ yyreduce: break; case 244: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1256 "./util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3627,7 +3604,7 @@ yyreduce: break; case 245: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1265 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); @@ -3635,7 +3612,7 @@ yyreduce: break; case 255: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1276 "./util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3648,7 +3625,7 @@ yyreduce: break; case 256: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1286 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3660,7 +3637,7 @@ yyreduce: break; case 257: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1295 "./util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3670,7 +3647,7 @@ yyreduce: break; case 258: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1302 "./util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3680,7 +3657,7 @@ yyreduce: break; case 259: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1309 "./util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3690,7 +3667,7 @@ yyreduce: break; case 260: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1316 "./util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3700,7 +3677,7 @@ yyreduce: break; case 261: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1323 "./util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3710,7 +3687,7 @@ yyreduce: break; case 262: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1330 "./util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); @@ -3718,7 +3695,7 @@ yyreduce: break; case 277: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1347 "./util/configparser.y" { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3729,7 +3706,7 @@ yyreduce: break; case 278: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1355 "./util/configparser.y" { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3739,7 +3716,7 @@ yyreduce: break; case 279: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1362 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3750,7 +3727,7 @@ yyreduce: break; case 280: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1370 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3761,7 +3738,7 @@ yyreduce: break; case 281: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1378 "./util/configparser.y" { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3771,7 +3748,7 @@ yyreduce: break; case 282: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1385 "./util/configparser.y" { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3781,7 +3758,7 @@ yyreduce: break; case 283: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1392 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3793,7 +3770,7 @@ yyreduce: break; case 284: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1401 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3805,7 +3782,7 @@ yyreduce: break; case 285: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1410 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3817,7 +3794,7 @@ yyreduce: break; case 286: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1419 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3829,7 +3806,7 @@ yyreduce: break; case 287: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1428 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3841,7 +3818,7 @@ yyreduce: break; case 288: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1437 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3853,7 +3830,7 @@ yyreduce: break; case 289: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1446 "./util/configparser.y" { OUTYY(("\nP(python:)\n")); @@ -3861,7 +3838,7 @@ yyreduce: break; case 293: -/* Line 1787 of yacc.c */ +/* Line 1792 of yacc.c */ #line 1455 "./util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3871,8 +3848,8 @@ yyreduce: break; -/* Line 1787 of yacc.c */ -#line 3876 "util/configparser.c" +/* Line 1792 of yacc.c */ +#line 3853 "util/configparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4035,7 +4012,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -4101,9 +4080,8 @@ yyreturn: } -/* Line 2048 of yacc.c */ +/* Line 2055 of yacc.c */ #line 1460 "./util/configparser.y" /* parse helper routines could be here */ - diff --git a/external/unbound/util/configparser.h b/external/unbound/util/configparser.h index b0e07227b..0ee72661d 100644 --- a/external/unbound/util/configparser.h +++ b/external/unbound/util/configparser.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 2.6.1. */ +/* A Bison parser, made by GNU Bison 2.7. */ /* Bison interface for Yacc-like parsers in C @@ -30,8 +30,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef YY_UTIL_CONFIGPARSER_H -# define YY_UTIL_CONFIGPARSER_H +#ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED +# define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -347,13 +347,13 @@ extern int yydebug; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { -/* Line 2049 of yacc.c */ +/* Line 2058 of yacc.c */ #line 64 "./util/configparser.y" char* str; -/* Line 2049 of yacc.c */ +/* Line 2058 of yacc.c */ #line 358 "util/configparser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 @@ -377,4 +377,4 @@ int yyparse (); #endif #endif /* ! YYPARSE_PARAM */ -#endif /* !YY_UTIL_CONFIGPARSER_H */ +#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED */ diff --git a/external/unbound/util/data/dname.c b/external/unbound/util/data/dname.c index 76f2e6458..d43bbf6d2 100644 --- a/external/unbound/util/data/dname.c +++ b/external/unbound/util/data/dname.c @@ -114,8 +114,8 @@ query_dname_compare(register uint8_t* d1, register uint8_t* d2) while(lab1--) { /* compare bytes first for speed */ if(*d1 != *d2 && - tolower((int)*d1) != tolower((int)*d2)) { - if(tolower((int)*d1) < tolower((int)*d2)) + tolower((unsigned char)*d1) != tolower((unsigned char)*d2)) { + if(tolower((unsigned char)*d1) < tolower((unsigned char)*d2)) return -1; return 1; } @@ -138,7 +138,7 @@ query_dname_tolower(uint8_t* dname) while(labellen) { dname++; while(labellen--) { - *dname = (uint8_t)tolower((int)*dname); + *dname = (uint8_t)tolower((unsigned char)*dname); dname++; } labellen = *dname; @@ -167,7 +167,7 @@ pkt_dname_tolower(sldns_buffer* pkt, uint8_t* dname) if(dname+lablen >= sldns_buffer_end(pkt)) return; while(lablen--) { - *dname = (uint8_t)tolower((int)*dname); + *dname = (uint8_t)tolower((unsigned char)*dname); dname++; } if(dname >= sldns_buffer_end(pkt)) @@ -256,8 +256,8 @@ dname_pkt_compare(sldns_buffer* pkt, uint8_t* d1, uint8_t* d2) log_assert(len1 == len2 && len1 != 0); /* compare labels */ while(len1--) { - if(tolower((int)*d1++) != tolower((int)*d2++)) { - if(tolower((int)d1[-1]) < tolower((int)d2[-1])) + if(tolower((unsigned char)*d1++) != tolower((unsigned char)*d2++)) { + if(tolower((unsigned char)d1[-1]) < tolower((unsigned char)d2[-1])) return -1; return 1; } @@ -282,7 +282,7 @@ dname_query_hash(uint8_t* dname, hashvalue_t h) labuf[0] = lablen; i=0; while(lablen--) - labuf[++i] = (uint8_t)tolower((int)*dname++); + labuf[++i] = (uint8_t)tolower((unsigned char)*dname++); h = hashlittle(labuf, labuf[0] + 1, h); lablen = *dname++; } @@ -310,7 +310,7 @@ dname_pkt_hash(sldns_buffer* pkt, uint8_t* dname, hashvalue_t h) labuf[0] = lablen; i=0; while(lablen--) - labuf[++i] = (uint8_t)tolower((int)*dname++); + labuf[++i] = (uint8_t)tolower((unsigned char)*dname++); h = hashlittle(labuf, labuf[0] + 1, h); lablen = *dname++; } @@ -423,8 +423,8 @@ static int memlowercmp(uint8_t* p1, uint8_t* p2, uint8_t len) { while(len--) { - if(*p1 != *p2 && tolower((int)*p1) != tolower((int)*p2)) { - if(tolower((int)*p1) < tolower((int)*p2)) + if(*p1 != *p2 && tolower((unsigned char)*p1) != tolower((unsigned char)*p2)) { + if(tolower((unsigned char)*p1) < tolower((unsigned char)*p2)) return -1; return 1; } @@ -480,10 +480,10 @@ dname_lab_cmp(uint8_t* d1, int labs1, uint8_t* d2, int labs2, int* mlabs) * lastdiff = c; * lastmlabs = atlabel; } apart from d1++,d2++ */ while(len1) { - if(*d1 != *d2 && tolower((int)*d1) - != tolower((int)*d2)) { - if(tolower((int)*d1) < - tolower((int)*d2)) { + if(*d1 != *d2 && tolower((unsigned char)*d1) + != tolower((unsigned char)*d2)) { + if(tolower((unsigned char)*d1) < + tolower((unsigned char)*d2)) { lastdiff = -1; lastmlabs = atlabel; d1 += len1; @@ -561,7 +561,7 @@ void dname_str(uint8_t* dname, char* str) return; } while(lablen--) { - if(isalnum((int)*dname) + if(isalnum((unsigned char)*dname) || *dname == '-' || *dname == '_' || *dname == '*') *s++ = *(char*)dname++; diff --git a/external/unbound/util/data/msgreply.c b/external/unbound/util/data/msgreply.c index 126e7bef4..68bcfd09e 100644 --- a/external/unbound/util/data/msgreply.c +++ b/external/unbound/util/data/msgreply.c @@ -576,10 +576,12 @@ reply_info_delete(void* d, void* ATTR_UNUSED(arg)) } hashvalue_t -query_info_hash(struct query_info *q) +query_info_hash(struct query_info *q, uint16_t flags) { hashvalue_t h = 0xab; h = hashlittle(&q->qtype, sizeof(q->qtype), h); + if(q->qtype == LDNS_RR_TYPE_AAAA && (flags&BIT_CD)) + h++; h = hashlittle(&q->qclass, sizeof(q->qclass), h); h = dname_query_hash(q->qname, h); return h; @@ -771,15 +773,14 @@ log_dns_msg(const char* str, struct query_info* qinfo, struct reply_info* rep) region, 65535, 1)) { log_info("%s: log_dns_msg: out of memory", str); } else { - char* str = sldns_wire2str_pkt(sldns_buffer_begin(buf), + char* s = sldns_wire2str_pkt(sldns_buffer_begin(buf), sldns_buffer_limit(buf)); - if(!str) { + if(!s) { log_info("%s: log_dns_msg: ldns tostr failed", str); } else { - log_info("%s %s", - str, (char*)sldns_buffer_begin(buf)); + log_info("%s %s", str, s); } - free(str); + free(s); } sldns_buffer_free(buf); regional_destroy(region); diff --git a/external/unbound/util/data/msgreply.h b/external/unbound/util/data/msgreply.h index ccbd0d748..e8d6d762e 100644 --- a/external/unbound/util/data/msgreply.h +++ b/external/unbound/util/data/msgreply.h @@ -305,8 +305,9 @@ void query_entry_delete(void *q, void* arg); /** delete reply_info data structure */ void reply_info_delete(void* d, void* arg); -/** calculate hash value of query_info, lowercases the qname */ -hashvalue_t query_info_hash(struct query_info *q); +/** calculate hash value of query_info, lowercases the qname, + * uses CD flag for AAAA qtype */ +hashvalue_t query_info_hash(struct query_info *q, uint16_t flags); /** * Setup query info entry diff --git a/external/unbound/util/fptr_wlist.c b/external/unbound/util/fptr_wlist.c index 3a5fc5f06..5a77432c7 100644 --- a/external/unbound/util/fptr_wlist.c +++ b/external/unbound/util/fptr_wlist.c @@ -280,7 +280,7 @@ fptr_whitelist_modenv_detach_subs(void (*fptr)( int fptr_whitelist_modenv_attach_sub(int (*fptr)( struct module_qstate* qstate, struct query_info* qinfo, - uint16_t qflags, int prime, struct module_qstate** newq)) + uint16_t qflags, int prime, int valrec, struct module_qstate** newq)) { if(fptr == &mesh_attach_sub) return 1; return 0; @@ -296,7 +296,7 @@ fptr_whitelist_modenv_kill_sub(void (*fptr)(struct module_qstate* newq)) int fptr_whitelist_modenv_detect_cycle(int (*fptr)( struct module_qstate* qstate, struct query_info* qinfo, - uint16_t flags, int prime)) + uint16_t flags, int prime, int valrec)) { if(fptr == &mesh_detect_cycle) return 1; return 0; diff --git a/external/unbound/util/fptr_wlist.h b/external/unbound/util/fptr_wlist.h index 62692ba8b..10de5d816 100644 --- a/external/unbound/util/fptr_wlist.h +++ b/external/unbound/util/fptr_wlist.h @@ -233,7 +233,7 @@ int fptr_whitelist_modenv_detach_subs(void (*fptr)( */ int fptr_whitelist_modenv_attach_sub(int (*fptr)( struct module_qstate* qstate, struct query_info* qinfo, - uint16_t qflags, int prime, struct module_qstate** newq)); + uint16_t qflags, int prime, int valrec, struct module_qstate** newq)); /** * Check function pointer whitelist for module_env kill_sub callback values. @@ -251,7 +251,7 @@ int fptr_whitelist_modenv_kill_sub(void (*fptr)(struct module_qstate* newq)); */ int fptr_whitelist_modenv_detect_cycle(int (*fptr)( struct module_qstate* qstate, struct query_info* qinfo, - uint16_t flags, int prime)); + uint16_t flags, int prime, int valrec)); /** * Check function pointer whitelist for module init call values. diff --git a/external/unbound/util/iana_ports.inc b/external/unbound/util/iana_ports.inc index 6754521b3..d318477e5 100644 --- a/external/unbound/util/iana_ports.inc +++ b/external/unbound/util/iana_ports.inc @@ -2061,6 +2061,7 @@ 2423, 2424, 2425, +2426, 2427, 2428, 2429, @@ -3964,6 +3965,7 @@ 4785, 4789, 4790, +4791, 4800, 4801, 4802, @@ -4225,6 +4227,7 @@ 5463, 5464, 5465, +5474, 5500, 5501, 5502, @@ -5351,9 +5354,11 @@ 35004, 35355, 36001, +36411, 36865, 37475, 37654, +38002, 38201, 38202, 38203, diff --git a/external/unbound/util/mini_event.h b/external/unbound/util/mini_event.h index 58bbc8073..1a5bcb445 100644 --- a/external/unbound/util/mini_event.h +++ b/external/unbound/util/mini_event.h @@ -58,6 +58,21 @@ #define HAVE_EVENT_BASE_FREE #endif +/* redefine to use our own namespace so that on platforms where + * linkers crosslink library-private symbols with other symbols, it works */ +#define event_init minievent_init +#define event_get_version minievent_get_version +#define event_get_method minievent_get_method +#define event_base_dispatch minievent_base_dispatch +#define event_base_loopexit minievent_base_loopexit +#define event_base_free minievent_base_free +#define event_set minievent_set +#define event_base_set minievent_base_set +#define event_add minievent_add +#define event_del minievent_del +#define signal_add minisignal_add +#define signal_del minisignal_del + /** event timeout */ #define EV_TIMEOUT 0x01 /** event fd readable */ diff --git a/external/unbound/util/module.h b/external/unbound/util/module.h index f95ff6dc8..b9dde36e2 100644 --- a/external/unbound/util/module.h +++ b/external/unbound/util/module.h @@ -256,13 +256,14 @@ struct module_env { * @param qinfo: what to query for (copied). * @param qflags: what flags to use (RD, CD flag or not). * @param prime: if it is a (stub) priming query. + * @param valrec: validation lookup recursion, does not need validation * @param newq: If the new subquery needs initialisation, it is * returned, otherwise NULL is returned. * @return: false on error, true if success (and init may be needed). */ int (*attach_sub)(struct module_qstate* qstate, struct query_info* qinfo, uint16_t qflags, int prime, - struct module_qstate** newq); + int valrec, struct module_qstate** newq); /** * Kill newly attached sub. If attach_sub returns newq for @@ -280,13 +281,15 @@ struct module_env { * @param qinfo: query info for dependency. * @param flags: query flags of dependency, RD/CD flags. * @param prime: if dependency is a priming query or not. + * @param valrec: validation lookup recursion, does not need validation * @return true if the name,type,class exists and the given * qstate mesh exists as a dependency of that name. Thus * if qstate becomes dependent on name,type,class then a * cycle is created. */ int (*detect_cycle)(struct module_qstate* qstate, - struct query_info* qinfo, uint16_t flags, int prime); + struct query_info* qinfo, uint16_t flags, int prime, + int valrec); /** region for temporary usage. May be cleared after operate() call. */ struct regional* scratch; @@ -397,6 +400,9 @@ struct module_qstate { uint16_t query_flags; /** if this is a (stub or root) priming query (with hints) */ int is_priming; + /** if this is a validation recursion query that does not get + * validation itself */ + int is_valrec; /** comm_reply contains server replies */ struct comm_reply* reply; diff --git a/external/unbound/util/net_help.c b/external/unbound/util/net_help.c index 30d543e00..8c2bac737 100644 --- a/external/unbound/util/net_help.c +++ b/external/unbound/util/net_help.c @@ -613,12 +613,17 @@ void* listen_sslctx_create(char* key, char* pem, char* verifypem) log_crypto_err("could not SSL_CTX_new"); return NULL; } - /* no SSLv2 because has defects */ + /* no SSLv2, SSLv3 because has defects */ if(!(SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2)){ log_crypto_err("could not set SSL_OP_NO_SSLv2"); SSL_CTX_free(ctx); return NULL; } + if(!(SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3)){ + log_crypto_err("could not set SSL_OP_NO_SSLv3"); + SSL_CTX_free(ctx); + return NULL; + } if(!SSL_CTX_use_certificate_file(ctx, pem, SSL_FILETYPE_PEM)) { log_err("error for cert file: %s", pem); log_crypto_err("error in SSL_CTX use_certificate_file"); @@ -668,6 +673,11 @@ void* connect_sslctx_create(char* key, char* pem, char* verifypem) SSL_CTX_free(ctx); return NULL; } + if(!(SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3)) { + log_crypto_err("could not set SSL_OP_NO_SSLv3"); + SSL_CTX_free(ctx); + return NULL; + } if(key && key[0]) { if(!SSL_CTX_use_certificate_file(ctx, pem, SSL_FILETYPE_PEM)) { log_err("error in client certificate %s", pem); @@ -689,7 +699,7 @@ void* connect_sslctx_create(char* key, char* pem, char* verifypem) } } if(verifypem && verifypem[0]) { - if(!SSL_CTX_load_verify_locations(ctx, verifypem, NULL) != 1) { + if(!SSL_CTX_load_verify_locations(ctx, verifypem, NULL)) { log_crypto_err("error in SSL_CTX verify"); SSL_CTX_free(ctx); return NULL; diff --git a/external/unbound/util/winsock_event.h b/external/unbound/util/winsock_event.h index 40892c14b..f64265743 100644 --- a/external/unbound/util/winsock_event.h +++ b/external/unbound/util/winsock_event.h @@ -90,6 +90,21 @@ #define HAVE_EVENT_BASE_FREE #endif +/* redefine the calls to different names so that there is no name + * collision with other code that uses libevent names. (that uses libunbound)*/ +#define event_init winsockevent_init +#define event_get_version winsockevent_get_version +#define event_get_method winsockevent_get_method +#define event_base_dispatch winsockevent_base_dispatch +#define event_base_loopexit winsockevent_base_loopexit +#define event_base_free winsockevent_base_free +#define event_set winsockevent_set +#define event_base_set winsockevent_base_set +#define event_add winsockevent_add +#define event_del winsockevent_del +#define signal_add winsocksignal_add +#define signal_del winsocksignal_del + /** event timeout */ #define EV_TIMEOUT 0x01 /** event fd readable */ |