import unbound 1.4.21vendor/unbound/1.4.21

1 files changed, 502 insertions, 488 deletions

diff --git a/util/configparser.c b/util/configparser.c
index 70de0ccb3e31..f5d04f216efe 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -253,7 +253,8 @@ extern int yydebug;
      VAR_FORWARD_FIRST = 381,
      VAR_STUB_FIRST = 382,
      VAR_MINIMAL_RESPONSES = 383,
-     VAR_RRSET_ROUNDROBIN = 384
+     VAR_RRSET_ROUNDROBIN = 384,
+     VAR_MAX_UDP_SIZE = 385
    };
 #endif
 /* Tokens.  */
@@ -384,6 +385,7 @@ extern int yydebug;
 #define VAR_STUB_FIRST 382
 #define VAR_MINIMAL_RESPONSES 383
 #define VAR_RRSET_ROUNDROBIN 384
+#define VAR_MAX_UDP_SIZE 385
 
 
 
@@ -397,7 +399,7 @@ typedef union YYSTYPE
 
 
 /* Line 350 of yacc.c  */
-#line 401 "util/configparser.c"
+#line 403 "util/configparser.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -425,7 +427,7 @@ int yyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 353 of yacc.c  */
-#line 429 "util/configparser.c"
+#line 431 "util/configparser.c"
 
 #ifdef short
 # undef short
@@ -645,20 +647,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   237
+#define YYLAST   239
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  130
+#define YYNTOKENS  131
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  133
+#define YYNNTS  134
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  253
+#define YYNRULES  255
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  371
+#define YYNSTATES  374
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   384
+#define YYMAXUTOK   385
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -704,7 +706,7 @@ static const yytype_uint8 yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129
+     125,   126,   127,   128,   129,   130
 };
 
 #if YYDEBUG
@@ -723,120 +725,121 @@ static const yytype_uint16 yyprhs[] =
      164,   166,   168,   170,   172,   174,   176,   178,   180,   182,
      184,   186,   188,   190,   192,   194,   196,   198,   200,   202,
      204,   206,   208,   210,   212,   214,   216,   218,   220,   222,
-     224,   226,   229,   230,   232,   234,   236,   238,   240,   242,
-     245,   246,   248,   250,   252,   254,   257,   260,   263,   266,
-     269,   272,   275,   278,   281,   284,   287,   290,   293,   296,
-     299,   302,   305,   308,   311,   314,   317,   320,   323,   326,
-     329,   332,   335,   338,   341,   344,   347,   350,   353,   356,
-     359,   362,   365,   368,   371,   374,   377,   380,   383,   386,
-     389,   392,   395,   398,   401,   404,   407,   410,   413,   416,
-     419,   422,   425,   428,   431,   434,   437,   440,   443,   446,
-     449,   452,   455,   458,   461,   464,   467,   470,   473,   476,
-     480,   483,   486,   489,   492,   495,   498,   501,   504,   507,
-     510,   513,   516,   519,   522,   525,   528,   531,   534,   538,
-     541,   544,   547,   550,   553,   556,   559,   562,   565,   568,
-     571,   574,   577,   579,   582,   583,   585,   587,   589,   591,
-     593,   595,   597,   600,   603,   606,   609,   612,   615,   618,
-     620,   623,   624,   626
+     224,   226,   228,   231,   232,   234,   236,   238,   240,   242,
+     244,   247,   248,   250,   252,   254,   256,   259,   262,   265,
+     268,   271,   274,   277,   280,   283,   286,   289,   292,   295,
+     298,   301,   304,   307,   310,   313,   316,   319,   322,   325,
+     328,   331,   334,   337,   340,   343,   346,   349,   352,   355,
+     358,   361,   364,   367,   370,   373,   376,   379,   382,   385,
+     388,   391,   394,   397,   400,   403,   406,   409,   412,   415,
+     418,   421,   424,   427,   430,   433,   436,   439,   442,   445,
+     448,   451,   454,   457,   460,   463,   466,   469,   472,   475,
+     478,   482,   485,   488,   491,   494,   497,   500,   503,   506,
+     509,   512,   515,   518,   521,   524,   527,   530,   533,   536,
+     540,   543,   546,   549,   552,   555,   558,   561,   564,   567,
+     570,   573,   576,   579,   582,   584,   587,   588,   590,   592,
+     594,   596,   598,   600,   602,   605,   608,   611,   614,   617,
+     620,   623,   625,   628,   629,   631
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     131,     0,    -1,    -1,   131,   132,    -1,   133,   134,    -1,
-     136,   137,    -1,   139,   140,    -1,   259,   260,    -1,   249,
-     250,    -1,    11,    -1,   134,   135,    -1,    -1,   142,    -1,
-     143,    -1,   147,    -1,   150,    -1,   156,    -1,   157,    -1,
-     158,    -1,   159,    -1,   148,    -1,   169,    -1,   170,    -1,
-     171,    -1,   172,    -1,   173,    -1,   190,    -1,   191,    -1,
-     192,    -1,   194,    -1,   195,    -1,   153,    -1,   196,    -1,
-     197,    -1,   200,    -1,   198,    -1,   199,    -1,   201,    -1,
-     202,    -1,   203,    -1,   214,    -1,   182,    -1,   183,    -1,
-     184,    -1,   185,    -1,   204,    -1,   217,    -1,   178,    -1,
-     180,    -1,   218,    -1,   223,    -1,   224,    -1,   225,    -1,
-     154,    -1,   189,    -1,   232,    -1,   233,    -1,   179,    -1,
-     228,    -1,   166,    -1,   149,    -1,   174,    -1,   215,    -1,
-     221,    -1,   205,    -1,   216,    -1,   235,    -1,   236,    -1,
-     155,    -1,   144,    -1,   165,    -1,   208,    -1,   145,    -1,
-     151,    -1,   152,    -1,   175,    -1,   176,    -1,   234,    -1,
-     207,    -1,   209,    -1,   210,    -1,   146,    -1,   237,    -1,
-     193,    -1,   213,    -1,   167,    -1,   181,    -1,   219,    -1,
-     220,    -1,   222,    -1,   227,    -1,   177,    -1,   229,    -1,
-     230,    -1,   231,    -1,   186,    -1,   188,    -1,   211,    -1,
-     212,    -1,   187,    -1,   206,    -1,   226,    -1,   168,    -1,
-     160,    -1,   161,    -1,   162,    -1,   163,    -1,   164,    -1,
-     238,    -1,   239,    -1,    38,    -1,   137,   138,    -1,    -1,
-     240,    -1,   241,    -1,   242,    -1,   244,    -1,   243,    -1,
-      44,    -1,   140,   141,    -1,    -1,   245,    -1,   246,    -1,
-     247,    -1,   248,    -1,    13,    10,    -1,    12,    10,    -1,
-      76,    10,    -1,    79,    10,    -1,    96,    10,    -1,    14,
-      10,    -1,    16,    10,    -1,    67,    10,    -1,    15,    10,
-      -1,    80,    10,    -1,    81,    10,    -1,    31,    10,    -1,
-      60,    10,    -1,    75,    10,    -1,    17,    10,    -1,    18,
-      10,    -1,    19,    10,    -1,    20,    10,    -1,   121,    10,
-      -1,   122,    10,    -1,   123,    10,    -1,   124,    10,    -1,
-     125,    10,    -1,    77,    10,    -1,    66,    10,    -1,   101,
-      10,    -1,   120,    10,    -1,    21,    10,    -1,    22,    10,
-      -1,    23,    10,    -1,    24,    10,    -1,    25,    10,    -1,
-      68,    10,    -1,    82,    10,    -1,    83,    10,    -1,   109,
-      10,    -1,    54,    10,    -1,    64,    10,    -1,    55,    10,
-      -1,   102,    10,    -1,    48,    10,    -1,    49,    10,    -1,
-      50,    10,    -1,    51,    10,    -1,   113,    10,    -1,   117,
-      10,    -1,   114,    10,    -1,    61,    10,    -1,    26,    10,
-      -1,    27,    10,    -1,    28,    10,    -1,    98,    10,    -1,
-      29,    10,    -1,    30,    10,    -1,    32,    10,    -1,    33,
-      10,    -1,    35,    10,    -1,    36,    10,    -1,    34,    10,
-      -1,    41,    10,    -1,    42,    10,    -1,    43,    10,    -1,
-      52,    10,    -1,    71,    10,    -1,   118,    10,    -1,    85,
-      10,    -1,    78,    10,    -1,    86,    10,    -1,    87,    10,
-      -1,   115,    10,    -1,   116,    10,    -1,   100,    10,    -1,
-      47,    10,    -1,    69,    10,    -1,    72,    10,    10,    -1,
-      53,    10,    -1,    56,    10,    -1,   105,    10,    -1,   106,
-      10,    -1,    70,    10,    -1,   107,    10,    -1,    57,    10,
-      -1,    58,    10,    -1,    59,    10,    -1,   119,    10,    -1,
-     108,    10,    -1,    65,    10,    -1,   111,    10,    -1,   112,
-      10,    -1,   110,    10,    -1,    62,    10,    -1,    63,    10,
-      -1,    84,    10,    -1,    73,    10,    10,    -1,    74,    10,
-      -1,    97,    10,    -1,   128,    10,    -1,   129,    10,    -1,
-      37,    10,    -1,    39,    10,    -1,    40,    10,    -1,   127,
-      10,    -1,    99,    10,    -1,    37,    10,    -1,    45,    10,
-      -1,    46,    10,    -1,   126,    10,    -1,    88,    -1,   250,
-     251,    -1,    -1,   252,    -1,   254,    -1,   253,    -1,   255,
-      -1,   256,    -1,   257,    -1,   258,    -1,    89,    10,    -1,
-      91,    10,    -1,    90,    10,    -1,    92,    10,    -1,    93,
-      10,    -1,    94,    10,    -1,    95,    10,    -1,   103,    -1,
-     260,   261,    -1,    -1,   262,    -1,   104,    10,    -1
+     132,     0,    -1,    -1,   132,   133,    -1,   134,   135,    -1,
+     137,   138,    -1,   140,   141,    -1,   261,   262,    -1,   251,
+     252,    -1,    11,    -1,   135,   136,    -1,    -1,   143,    -1,
+     144,    -1,   148,    -1,   151,    -1,   157,    -1,   158,    -1,
+     159,    -1,   160,    -1,   149,    -1,   170,    -1,   171,    -1,
+     172,    -1,   173,    -1,   174,    -1,   191,    -1,   192,    -1,
+     193,    -1,   195,    -1,   196,    -1,   154,    -1,   197,    -1,
+     198,    -1,   201,    -1,   199,    -1,   200,    -1,   202,    -1,
+     203,    -1,   204,    -1,   215,    -1,   183,    -1,   184,    -1,
+     185,    -1,   186,    -1,   205,    -1,   218,    -1,   179,    -1,
+     181,    -1,   219,    -1,   224,    -1,   225,    -1,   226,    -1,
+     155,    -1,   190,    -1,   233,    -1,   234,    -1,   180,    -1,
+     229,    -1,   167,    -1,   150,    -1,   175,    -1,   216,    -1,
+     222,    -1,   206,    -1,   217,    -1,   236,    -1,   237,    -1,
+     156,    -1,   145,    -1,   166,    -1,   209,    -1,   146,    -1,
+     152,    -1,   153,    -1,   176,    -1,   177,    -1,   235,    -1,
+     208,    -1,   210,    -1,   211,    -1,   147,    -1,   238,    -1,
+     194,    -1,   214,    -1,   168,    -1,   182,    -1,   220,    -1,
+     221,    -1,   223,    -1,   228,    -1,   178,    -1,   230,    -1,
+     231,    -1,   232,    -1,   187,    -1,   189,    -1,   212,    -1,
+     213,    -1,   188,    -1,   207,    -1,   227,    -1,   169,    -1,
+     161,    -1,   162,    -1,   163,    -1,   164,    -1,   165,    -1,
+     239,    -1,   240,    -1,   241,    -1,    38,    -1,   138,   139,
+      -1,    -1,   242,    -1,   243,    -1,   244,    -1,   246,    -1,
+     245,    -1,    44,    -1,   141,   142,    -1,    -1,   247,    -1,
+     248,    -1,   249,    -1,   250,    -1,    13,    10,    -1,    12,
+      10,    -1,    76,    10,    -1,    79,    10,    -1,    96,    10,
+      -1,    14,    10,    -1,    16,    10,    -1,    67,    10,    -1,
+      15,    10,    -1,    80,    10,    -1,    81,    10,    -1,    31,
+      10,    -1,    60,    10,    -1,    75,    10,    -1,    17,    10,
+      -1,    18,    10,    -1,    19,    10,    -1,    20,    10,    -1,
+     121,    10,    -1,   122,    10,    -1,   123,    10,    -1,   124,
+      10,    -1,   125,    10,    -1,    77,    10,    -1,    66,    10,
+      -1,   101,    10,    -1,   120,    10,    -1,    21,    10,    -1,
+      22,    10,    -1,    23,    10,    -1,    24,    10,    -1,    25,
+      10,    -1,    68,    10,    -1,    82,    10,    -1,    83,    10,
+      -1,   109,    10,    -1,    54,    10,    -1,    64,    10,    -1,
+      55,    10,    -1,   102,    10,    -1,    48,    10,    -1,    49,
+      10,    -1,    50,    10,    -1,    51,    10,    -1,   113,    10,
+      -1,   117,    10,    -1,   114,    10,    -1,    61,    10,    -1,
+      26,    10,    -1,    27,    10,    -1,    28,    10,    -1,    98,
+      10,    -1,    29,    10,    -1,    30,    10,    -1,    32,    10,
+      -1,    33,    10,    -1,    35,    10,    -1,    36,    10,    -1,
+      34,    10,    -1,    41,    10,    -1,    42,    10,    -1,    43,
+      10,    -1,    52,    10,    -1,    71,    10,    -1,   118,    10,
+      -1,    85,    10,    -1,    78,    10,    -1,    86,    10,    -1,
+      87,    10,    -1,   115,    10,    -1,   116,    10,    -1,   100,
+      10,    -1,    47,    10,    -1,    69,    10,    -1,    72,    10,
+      10,    -1,    53,    10,    -1,    56,    10,    -1,   105,    10,
+      -1,   106,    10,    -1,    70,    10,    -1,   107,    10,    -1,
+      57,    10,    -1,    58,    10,    -1,    59,    10,    -1,   119,
+      10,    -1,   108,    10,    -1,    65,    10,    -1,   111,    10,
+      -1,   112,    10,    -1,   110,    10,    -1,    62,    10,    -1,
+      63,    10,    -1,    84,    10,    -1,    73,    10,    10,    -1,
+      74,    10,    -1,    97,    10,    -1,   128,    10,    -1,   129,
+      10,    -1,   130,    10,    -1,    37,    10,    -1,    39,    10,
+      -1,    40,    10,    -1,   127,    10,    -1,    99,    10,    -1,
+      37,    10,    -1,    45,    10,    -1,    46,    10,    -1,   126,
+      10,    -1,    88,    -1,   252,   253,    -1,    -1,   254,    -1,
+     256,    -1,   255,    -1,   257,    -1,   258,    -1,   259,    -1,
+     260,    -1,    89,    10,    -1,    91,    10,    -1,    90,    10,
+      -1,    92,    10,    -1,    93,    10,    -1,    94,    10,    -1,
+      95,    10,    -1,   103,    -1,   262,   263,    -1,    -1,   264,
+      -1,   104,    10,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   110,   110,   110,   111,   111,   112,   112,   113,   117,
-     122,   123,   124,   124,   124,   125,   125,   126,   126,   126,
-     127,   127,   127,   128,   128,   128,   129,   129,   130,   130,
-     131,   131,   132,   132,   133,   133,   134,   134,   135,   135,
-     136,   136,   137,   137,   137,   138,   138,   138,   139,   139,
-     139,   140,   140,   141,   141,   142,   142,   143,   143,   144,
-     144,   144,   145,   145,   146,   146,   147,   147,   147,   148,
-     148,   149,   149,   150,   150,   151,   151,   151,   152,   152,
-     153,   153,   154,   154,   155,   155,   156,   156,   157,   157,
-     157,   158,   158,   159,   159,   159,   160,   160,   160,   161,
-     161,   161,   162,   162,   162,   163,   163,   163,   164,   164,
-     166,   178,   179,   180,   180,   180,   180,   180,   182,   194,
-     195,   196,   196,   196,   196,   198,   207,   216,   227,   236,
-     245,   254,   267,   282,   291,   300,   309,   318,   327,   336,
-     345,   354,   363,   372,   381,   390,   397,   404,   413,   422,
-     436,   445,   454,   461,   468,   475,   483,   490,   497,   504,
-     511,   519,   527,   535,   542,   549,   558,   567,   574,   581,
-     589,   597,   610,   621,   629,   642,   651,   660,   668,   681,
-     690,   698,   707,   715,   728,   735,   745,   755,   765,   775,
-     785,   795,   805,   812,   819,   828,   837,   846,   853,   863,
-     877,   884,   902,   915,   928,   937,   946,   955,   965,   975,
-     984,   993,  1000,  1009,  1018,  1027,  1035,  1048,  1056,  1078,
-    1085,  1100,  1110,  1120,  1130,  1137,  1144,  1153,  1163,  1173,
-    1180,  1187,  1196,  1201,  1202,  1203,  1203,  1203,  1204,  1204,
-    1204,  1205,  1207,  1217,  1226,  1233,  1240,  1247,  1254,  1261,
-    1266,  1267,  1268,  1270
+       0,   111,   111,   111,   112,   112,   113,   113,   114,   118,
+     123,   124,   125,   125,   125,   126,   126,   127,   127,   127,
+     128,   128,   128,   129,   129,   129,   130,   130,   131,   131,
+     132,   132,   133,   133,   134,   134,   135,   135,   136,   136,
+     137,   137,   138,   138,   138,   139,   139,   139,   140,   140,
+     140,   141,   141,   142,   142,   143,   143,   144,   144,   145,
+     145,   145,   146,   146,   147,   147,   148,   148,   148,   149,
+     149,   150,   150,   151,   151,   152,   152,   152,   153,   153,
+     154,   154,   155,   155,   156,   156,   157,   157,   158,   158,
+     158,   159,   159,   160,   160,   160,   161,   161,   161,   162,
+     162,   162,   163,   163,   163,   164,   164,   164,   165,   165,
+     165,   167,   179,   180,   181,   181,   181,   181,   181,   183,
+     195,   196,   197,   197,   197,   197,   199,   208,   217,   228,
+     237,   246,   255,   268,   283,   292,   301,   310,   319,   328,
+     337,   346,   355,   364,   373,   382,   391,   398,   405,   414,
+     423,   437,   446,   455,   462,   469,   476,   484,   491,   498,
+     505,   512,   520,   528,   536,   543,   550,   559,   568,   575,
+     582,   590,   598,   611,   622,   630,   643,   652,   661,   669,
+     682,   691,   699,   708,   716,   729,   736,   746,   756,   766,
+     776,   786,   796,   806,   813,   820,   829,   838,   847,   854,
+     864,   878,   885,   903,   916,   929,   938,   947,   956,   966,
+     976,   985,   994,  1001,  1010,  1019,  1028,  1036,  1049,  1057,
+    1079,  1086,  1101,  1111,  1121,  1128,  1138,  1145,  1152,  1161,
+    1171,  1181,  1188,  1195,  1204,  1209,  1210,  1211,  1211,  1211,
+    1212,  1212,  1212,  1213,  1215,  1225,  1234,  1241,  1248,  1255,
+    1262,  1269,  1274,  1275,  1276,  1278
 };
 #endif
 
@@ -886,17 +889,17 @@ static const char *const yytname[] =
   "VAR_LOG_QUERIES", "VAR_TCP_UPSTREAM", "VAR_SSL_UPSTREAM",
   "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT",
   "VAR_FORWARD_FIRST", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES",
-  "VAR_RRSET_ROUNDROBIN", "$accept", "toplevelvars", "toplevelvar",
-  "serverstart", "contents_server", "content_server", "stubstart",
-  "contents_stub", "content_stub", "forwardstart", "contents_forward",
-  "content_forward", "server_num_threads", "server_verbosity",
-  "server_statistics_interval", "server_statistics_cumulative",
-  "server_extended_statistics", "server_port", "server_interface",
-  "server_outgoing_interface", "server_outgoing_range",
-  "server_outgoing_port_permit", "server_outgoing_port_avoid",
-  "server_outgoing_num_tcp", "server_incoming_num_tcp",
-  "server_interface_automatic", "server_do_ip4", "server_do_ip6",
-  "server_do_udp", "server_do_tcp", "server_tcp_upstream",
+  "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "$accept", "toplevelvars",
+  "toplevelvar", "serverstart", "contents_server", "content_server",
+  "stubstart", "contents_stub", "content_stub", "forwardstart",
+  "contents_forward", "content_forward", "server_num_threads",
+  "server_verbosity", "server_statistics_interval",
+  "server_statistics_cumulative", "server_extended_statistics",
+  "server_port", "server_interface", "server_outgoing_interface",
+  "server_outgoing_range", "server_outgoing_port_permit",
+  "server_outgoing_port_avoid", "server_outgoing_num_tcp",
+  "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4",
+  "server_do_ip6", "server_do_udp", "server_do_tcp", "server_tcp_upstream",
   "server_ssl_upstream", "server_ssl_service_key",
   "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize",
   "server_use_syslog", "server_log_time_ascii", "server_log_queries",
@@ -930,13 +933,13 @@ static const char *const yytname[] =
   "server_del_holddown", "server_keep_missing", "server_key_cache_size",
   "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone",
   "server_local_data", "server_local_data_ptr", "server_minimal_responses",
-  "server_rrset_roundrobin", "stub_name", "stub_host", "stub_addr",
-  "stub_first", "stub_prime", "forward_name", "forward_host",
-  "forward_addr", "forward_first", "rcstart", "contents_rc", "content_rc",
-  "rc_control_enable", "rc_control_port", "rc_control_interface",
-  "rc_server_key_file", "rc_server_cert_file", "rc_control_key_file",
-  "rc_control_cert_file", "pythonstart", "contents_py", "content_py",
-  "py_script", YY_NULL
+  "server_rrset_roundrobin", "server_max_udp_size", "stub_name",
+  "stub_host", "stub_addr", "stub_first", "stub_prime", "forward_name",
+  "forward_host", "forward_addr", "forward_first", "rcstart",
+  "contents_rc", "content_rc", "rc_control_enable", "rc_control_port",
+  "rc_control_interface", "rc_server_key_file", "rc_server_cert_file",
+  "rc_control_key_file", "rc_control_cert_file", "pythonstart",
+  "contents_py", "content_py", "py_script", YY_NULL
 };
 #endif
 
@@ -957,26 +960,27 @@ static const yytype_uint16 yytoknum[] =
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   130,   131,   131,   132,   132,   132,   132,   132,   133,
-     134,   134,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     136,   137,   137,   138,   138,   138,   138,   138,   139,   140,
-     140,   141,   141,   141,   141,   142,   143,   144,   145,   146,
+       0,   131,   132,   132,   133,   133,   133,   133,   133,   134,
+     135,   135,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   137,   138,   138,   139,   139,   139,   139,   139,   140,
+     141,   141,   142,   142,   142,   142,   143,   144,   145,   146,
      147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
      157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
      167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
@@ -987,9 +991,9 @@ static const yytype_uint16 yyr1[] =
      217,   218,   219,   220,   221,   222,   223,   224,   225,   226,
      227,   228,   229,   230,   231,   232,   233,   234,   235,   236,
      237,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   250,   251,   251,   251,   251,   251,
-     251,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   260,   261,   262
+     247,   248,   249,   250,   251,   252,   252,   253,   253,   253,
+     253,   253,   253,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   262,   263,   264
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1006,21 +1010,21 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     0,     1,     1,     1,     1,     1,     1,     2,
-       0,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
+       2,     0,     1,     1,     1,     1,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     1,
-       2,     0,     1,     2
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     1,     2,     0,     1,     2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -1028,8 +1032,8 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       2,     0,     1,     9,   110,   118,   232,   249,     3,    11,
-     112,   120,   234,   251,     4,     5,     6,     8,     7,     0,
+       2,     0,     1,     9,   111,   119,   234,   251,     3,    11,
+     113,   121,   236,   253,     4,     5,     6,     8,     7,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1039,52 +1043,52 @@ static const yytype_uint8 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    10,    12,    13,
-      69,    72,    81,    14,    20,    60,    15,    73,    74,    31,
-      53,    68,    16,    17,    18,    19,   103,   104,   105,   106,
-     107,    70,    59,    85,   102,    21,    22,    23,    24,    25,
-      61,    75,    76,    91,    47,    57,    48,    86,    41,    42,
-      43,    44,    95,    99,    96,    54,    26,    27,    28,    83,
-      29,    30,    32,    33,    35,    36,    34,    37,    38,    39,
-      45,    64,   100,    78,    71,    79,    80,    97,    98,    84,
-      40,    62,    65,    46,    49,    87,    88,    63,    89,    50,
-      51,    52,   101,    90,    58,    92,    93,    94,    55,    56,
-      77,    66,    67,    82,   108,   109,     0,     0,     0,     0,
-       0,   111,   113,   114,   115,   117,   116,     0,     0,     0,
-       0,   119,   121,   122,   123,   124,     0,     0,     0,     0,
-       0,     0,     0,   233,   235,   237,   236,   238,   239,   240,
-     241,     0,   250,   252,   126,   125,   130,   133,   131,   139,
-     140,   141,   142,   152,   153,   154,   155,   156,   173,   174,
-     175,   177,   178,   136,   179,   180,   183,   181,   182,   184,
-     185,   186,   197,   165,   166,   167,   168,   187,   200,   161,
-     163,   201,   206,   207,   208,   137,   172,   215,   216,   162,
-     211,   149,   132,   157,   198,   204,   188,     0,     0,   219,
-     138,   127,   148,   191,   128,   134,   135,   158,   159,   217,
-     190,   192,   193,   129,   220,   176,   196,   150,   164,   202,
-     203,   205,   210,   160,   214,   212,   213,   169,   171,   194,
-     195,   170,   189,   209,   151,   143,   144,   145,   146,   147,
-     221,   222,   223,   224,   225,   227,   226,   228,   229,   230,
-     231,   242,   244,   243,   245,   246,   247,   248,   253,   199,
-     218
+       0,     0,     0,     0,     0,     0,     0,     0,    10,    12,
+      13,    69,    72,    81,    14,    20,    60,    15,    73,    74,
+      31,    53,    68,    16,    17,    18,    19,   103,   104,   105,
+     106,   107,    70,    59,    85,   102,    21,    22,    23,    24,
+      25,    61,    75,    76,    91,    47,    57,    48,    86,    41,
+      42,    43,    44,    95,    99,    96,    54,    26,    27,    28,
+      83,    29,    30,    32,    33,    35,    36,    34,    37,    38,
+      39,    45,    64,   100,    78,    71,    79,    80,    97,    98,
+      84,    40,    62,    65,    46,    49,    87,    88,    63,    89,
+      50,    51,    52,   101,    90,    58,    92,    93,    94,    55,
+      56,    77,    66,    67,    82,   108,   109,   110,     0,     0,
+       0,     0,     0,   112,   114,   115,   116,   118,   117,     0,
+       0,     0,     0,   120,   122,   123,   124,   125,     0,     0,
+       0,     0,     0,     0,     0,   235,   237,   239,   238,   240,
+     241,   242,   243,     0,   252,   254,   127,   126,   131,   134,
+     132,   140,   141,   142,   143,   153,   154,   155,   156,   157,
+     174,   175,   176,   178,   179,   137,   180,   181,   184,   182,
+     183,   185,   186,   187,   198,   166,   167,   168,   169,   188,
+     201,   162,   164,   202,   207,   208,   209,   138,   173,   216,
+     217,   163,   212,   150,   133,   158,   199,   205,   189,     0,
+       0,   220,   139,   128,   149,   192,   129,   135,   136,   159,
+     160,   218,   191,   193,   194,   130,   221,   177,   197,   151,
+     165,   203,   204,   206,   211,   161,   215,   213,   214,   170,
+     172,   195,   196,   171,   190,   210,   152,   144,   145,   146,
+     147,   148,   222,   223,   224,   225,   226,   227,   229,   228,
+     230,   231,   232,   233,   244,   246,   245,   247,   248,   249,
+     250,   255,   200,   219
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     8,     9,    14,   117,    10,    15,   221,    11,
-      16,   231,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
-     222,   223,   224,   225,   226,   232,   233,   234,   235,    12,
-      17,   243,   244,   245,   246,   247,   248,   249,   250,    13,
-      18,   252,   253
+      -1,     1,     8,     9,    14,   118,    10,    15,   223,    11,
+      16,   233,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   224,   225,   226,   227,   228,   234,   235,   236,   237,
+      12,    17,   245,   246,   247,   248,   249,   250,   251,   252,
+      13,    18,   254,   255
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1094,17 +1098,16 @@ static const yytype_int16 yypact[] =
 {
      -80,    76,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -12,    40,    46,    32,   -79,    16,
-      17,    18,    22,    23,    24,    68,    71,    72,   105,   108,
-     109,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   153,   155,   156,   158,   159,
-     160,   161,   163,   164,   165,   166,   167,   168,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+      17,    18,    22,    23,    24,    68,    71,    72,   105,   109,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
+     149,   150,   151,   152,   153,   155,   156,   158,   159,   160,
+     161,   163,   164,   165,   166,   167,   168,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
+     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
@@ -1113,23 +1116,24 @@ static const yytype_int16 yypact[] =
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   209,   210,   211,   212,
-     213,   -80,   -80,   -80,   -80,   -80,   -80,   214,   215,   216,
-     217,   -80,   -80,   -80,   -80,   -80,   218,   219,   220,   221,
-     222,   223,   224,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   225,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   211,   212,
+     213,   214,   215,   -80,   -80,   -80,   -80,   -80,   -80,   216,
+     217,   218,   219,   -80,   -80,   -80,   -80,   -80,   220,   221,
+     222,   223,   224,   225,   226,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   227,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   226,   227,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   228,
+     229,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80
+     -80,   -80,   -80,   -80
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -1148,7 +1152,7 @@ static const yytype_int8 yypgoto[] =
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
      -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
-     -80,   -80,   -80
+     -80,   -80,   -80,   -80
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1159,28 +1163,28 @@ static const yytype_uint16 yytable[] =
 {
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,   251,   254,   255,   256,    44,
-      45,    46,   257,   258,   259,    47,    48,    49,    50,    51,
+      39,    40,    41,    42,    43,   253,   256,   257,   258,    44,
+      45,    46,   259,   260,   261,    47,    48,    49,    50,    51,
       52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,     2,   216,   260,   217,
-     218,   261,   262,   227,    88,    89,    90,     3,    91,    92,
-      93,   228,   229,    94,    95,    96,    97,    98,    99,   100,
+      82,    83,    84,    85,    86,    87,     2,   218,   262,   219,
+     220,   263,   264,   229,    88,    89,    90,     3,    91,    92,
+      93,   230,   231,    94,    95,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,     4,   263,   115,   116,   264,   265,
-       5,   236,   237,   238,   239,   240,   241,   242,   266,   267,
-     268,   269,   270,   271,   272,   273,   274,   275,   276,   219,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,     6,   301,   302,   220,   303,   304,
-     305,   306,   230,   307,   308,   309,   310,   311,   312,     7,
-     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
-     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
-     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
-     353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
-     363,   364,   365,   366,   367,   368,   369,   370
+     111,   112,   113,   114,     4,   265,   115,   116,   117,   266,
+       5,   238,   239,   240,   241,   242,   243,   244,   267,   268,
+     269,   270,   271,   272,   273,   274,   275,   276,   277,   221,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,     6,   302,   303,   222,   304,   305,
+     306,   307,   232,   308,   309,   310,   311,   312,   313,     7,
+     314,   315,   316,   317,   318,   319,   320,   321,   322,   323,
+     324,   325,   326,   327,   328,   329,   330,   331,   332,   333,
+     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
+     344,   345,   346,   347,   348,   349,   350,   351,   352,   353,
+     354,   355,   356,   357,   358,   359,   360,   361,   362,   363,
+     364,   365,   366,   367,   368,   369,   370,   371,   372,   373
 };
 
 #define yypact_value_is_default(yystate) \
@@ -1202,7 +1206,7 @@ static const yytype_uint8 yycheck[] =
       40,    10,    10,    37,    96,    97,    98,    11,   100,   101,
      102,    45,    46,   105,   106,   107,   108,   109,   110,   111,
      112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,    38,    10,   128,   129,    10,    10,
+     122,   123,   124,   125,    38,    10,   128,   129,   130,    10,
       44,    89,    90,    91,    92,    93,    94,    95,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    99,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1214,15 +1218,15 @@ static const yytype_uint8 yycheck[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   131,     0,    11,    38,    44,    88,   103,   132,   133,
-     136,   139,   249,   259,   134,   137,   140,   250,   260,    12,
+       0,   132,     0,    11,    38,    44,    88,   103,   133,   134,
+     137,   140,   251,   261,   135,   138,   141,   252,   262,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
       23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
       33,    34,    35,    36,    41,    42,    43,    47,    48,    49,
@@ -1232,7 +1236,7 @@ static const yytype_uint16 yystos[] =
       80,    81,    82,    83,    84,    85,    86,    87,    96,    97,
       98,   100,   101,   102,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   128,   129,   135,   142,   143,
+     121,   122,   123,   124,   125,   128,   129,   130,   136,   143,
      144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
      154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
      164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
@@ -1242,11 +1246,11 @@ static const yytype_uint16 yystos[] =
      204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
      214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
      224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
-     234,   235,   236,   237,   238,   239,    37,    39,    40,    99,
-     127,   138,   240,   241,   242,   243,   244,    37,    45,    46,
-     126,   141,   245,   246,   247,   248,    89,    90,    91,    92,
-      93,    94,    95,   251,   252,   253,   254,   255,   256,   257,
-     258,   104,   261,   262,    10,    10,    10,    10,    10,    10,
+     234,   235,   236,   237,   238,   239,   240,   241,    37,    39,
+      40,    99,   127,   139,   242,   243,   244,   245,   246,    37,
+      45,    46,   126,   142,   247,   248,   249,   250,    89,    90,
+      91,    92,    93,    94,    95,   253,   254,   255,   256,   257,
+     258,   259,   260,   104,   263,   264,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1258,7 +1262,7 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10
+      10,    10,    10,    10
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2083,15 +2087,15 @@ yyreduce:
     {
         case 9:
 /* Line 1787 of yacc.c  */
-#line 118 "util/configparser.y"
+#line 119 "util/configparser.y"
     { 
 		OUTYY(("\nP(server:)\n")); 
 	}
     break;
 
-  case 110:
+  case 111:
 /* Line 1787 of yacc.c  */
-#line 167 "util/configparser.y"
+#line 168 "util/configparser.y"
     {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n")); 
@@ -2104,9 +2108,9 @@ yyreduce:
 	}
     break;
 
-  case 118:
+  case 119:
 /* Line 1787 of yacc.c  */
-#line 183 "util/configparser.y"
+#line 184 "util/configparser.y"
     {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n")); 
@@ -2119,9 +2123,9 @@ yyreduce:
 	}
     break;
 
-  case 125:
+  case 126:
 /* Line 1787 of yacc.c  */
-#line 199 "util/configparser.y"
+#line 200 "util/configparser.y"
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); 
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2131,9 +2135,9 @@ yyreduce:
 	}
     break;
 
-  case 126:
+  case 127:
 /* Line 1787 of yacc.c  */
-#line 208 "util/configparser.y"
+#line 209 "util/configparser.y"
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); 
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2143,9 +2147,9 @@ yyreduce:
 	}
     break;
 
-  case 127:
+  case 128:
 /* Line 1787 of yacc.c  */
-#line 217 "util/configparser.y"
+#line 218 "util/configparser.y"
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); 
 		if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0)
@@ -2157,9 +2161,9 @@ yyreduce:
 	}
     break;
 
-  case 128:
+  case 129:
 /* Line 1787 of yacc.c  */
-#line 228 "util/configparser.y"
+#line 229 "util/configparser.y"
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2169,9 +2173,9 @@ yyreduce:
 	}
     break;
 
-  case 129:
+  case 130:
 /* Line 1787 of yacc.c  */
-#line 237 "util/configparser.y"
+#line 238 "util/configparser.y"
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2181,9 +2185,9 @@ yyreduce:
 	}
     break;
 
-  case 130:
+  case 131:
 /* Line 1787 of yacc.c  */
-#line 246 "util/configparser.y"
+#line 247 "util/configparser.y"
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2193,9 +2197,9 @@ yyreduce:
 	}
     break;
 
-  case 131:
+  case 132:
 /* Line 1787 of yacc.c  */
-#line 255 "util/configparser.y"
+#line 256 "util/configparser.y"
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -2209,9 +2213,9 @@ yyreduce:
 	}
     break;
 
-  case 132:
+  case 133:
 /* Line 1787 of yacc.c  */
-#line 268 "util/configparser.y"
+#line 269 "util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2227,9 +2231,9 @@ yyreduce:
 	}
     break;
 
-  case 133:
+  case 134:
 /* Line 1787 of yacc.c  */
-#line 283 "util/configparser.y"
+#line 284 "util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2239,9 +2243,9 @@ yyreduce:
 	}
     break;
 
-  case 134:
+  case 135:
 /* Line 1787 of yacc.c  */
-#line 292 "util/configparser.y"
+#line 293 "util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, 
@@ -2251,9 +2255,9 @@ yyreduce:
 	}
     break;
 
-  case 135:
+  case 136:
 /* Line 1787 of yacc.c  */
-#line 301 "util/configparser.y"
+#line 302 "util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, 
@@ -2263,9 +2267,9 @@ yyreduce:
 	}
     break;
 
-  case 136:
+  case 137:
 /* Line 1787 of yacc.c  */
-#line 310 "util/configparser.y"
+#line 311 "util/configparser.y"
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2275,9 +2279,9 @@ yyreduce:
 	}
     break;
 
-  case 137:
+  case 138:
 /* Line 1787 of yacc.c  */
-#line 319 "util/configparser.y"
+#line 320 "util/configparser.y"
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2287,9 +2291,9 @@ yyreduce:
 	}
     break;
 
-  case 138:
+  case 139:
 /* Line 1787 of yacc.c  */
-#line 328 "util/configparser.y"
+#line 329 "util/configparser.y"
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2299,9 +2303,9 @@ yyreduce:
 	}
     break;
 
-  case 139:
+  case 140:
 /* Line 1787 of yacc.c  */
-#line 337 "util/configparser.y"
+#line 338 "util/configparser.y"
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2311,9 +2315,9 @@ yyreduce:
 	}
     break;
 
-  case 140:
+  case 141:
 /* Line 1787 of yacc.c  */
-#line 346 "util/configparser.y"
+#line 347 "util/configparser.y"
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2323,9 +2327,9 @@ yyreduce:
 	}
     break;
 
-  case 141:
+  case 142:
 /* Line 1787 of yacc.c  */
-#line 355 "util/configparser.y"
+#line 356 "util/configparser.y"
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2335,9 +2339,9 @@ yyreduce:
 	}
     break;
 
-  case 142:
+  case 143:
 /* Line 1787 of yacc.c  */
-#line 364 "util/configparser.y"
+#line 365 "util/configparser.y"
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2347,9 +2351,9 @@ yyreduce:
 	}
     break;
 
-  case 143:
+  case 144:
 /* Line 1787 of yacc.c  */
-#line 373 "util/configparser.y"
+#line 374 "util/configparser.y"
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2359,9 +2363,9 @@ yyreduce:
 	}
     break;
 
-  case 144:
+  case 145:
 /* Line 1787 of yacc.c  */
-#line 382 "util/configparser.y"
+#line 383 "util/configparser.y"
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2371,9 +2375,9 @@ yyreduce:
 	}
     break;
 
-  case 145:
+  case 146:
 /* Line 1787 of yacc.c  */
-#line 391 "util/configparser.y"
+#line 392 "util/configparser.y"
     {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->ssl_service_key);
@@ -2381,9 +2385,9 @@ yyreduce:
 	}
     break;
 
-  case 146:
+  case 147:
 /* Line 1787 of yacc.c  */
-#line 398 "util/configparser.y"
+#line 399 "util/configparser.y"
     {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
@@ -2391,9 +2395,9 @@ yyreduce:
 	}
     break;
 
-  case 147:
+  case 148:
 /* Line 1787 of yacc.c  */
-#line 405 "util/configparser.y"
+#line 406 "util/configparser.y"
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2403,9 +2407,9 @@ yyreduce:
 	}
     break;
 
-  case 148:
+  case 149:
 /* Line 1787 of yacc.c  */
-#line 414 "util/configparser.y"
+#line 415 "util/configparser.y"
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2415,9 +2419,9 @@ yyreduce:
 	}
     break;
 
-  case 149:
+  case 150:
 /* Line 1787 of yacc.c  */
-#line 423 "util/configparser.y"
+#line 424 "util/configparser.y"
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2432,9 +2436,9 @@ yyreduce:
 	}
     break;
 
-  case 150:
+  case 151:
 /* Line 1787 of yacc.c  */
-#line 437 "util/configparser.y"
+#line 438 "util/configparser.y"
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2444,9 +2448,9 @@ yyreduce:
 	}
     break;
 
-  case 151:
+  case 152:
 /* Line 1787 of yacc.c  */
-#line 446 "util/configparser.y"
+#line 447 "util/configparser.y"
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2456,9 +2460,9 @@ yyreduce:
 	}
     break;
 
-  case 152:
+  case 153:
 /* Line 1787 of yacc.c  */
-#line 455 "util/configparser.y"
+#line 456 "util/configparser.y"
     {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->chrootdir);
@@ -2466,9 +2470,9 @@ yyreduce:
 	}
     break;
 
-  case 153:
+  case 154:
 /* Line 1787 of yacc.c  */
-#line 462 "util/configparser.y"
+#line 463 "util/configparser.y"
     {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->username);
@@ -2476,9 +2480,9 @@ yyreduce:
 	}
     break;
 
-  case 154:
+  case 155:
 /* Line 1787 of yacc.c  */
-#line 469 "util/configparser.y"
+#line 470 "util/configparser.y"
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->directory);
@@ -2486,9 +2490,9 @@ yyreduce:
 	}
     break;
 
-  case 155:
+  case 156:
 /* Line 1787 of yacc.c  */
-#line 476 "util/configparser.y"
+#line 477 "util/configparser.y"
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->logfile);
@@ -2497,9 +2501,9 @@ yyreduce:
 	}
     break;
 
-  case 156:
+  case 157:
 /* Line 1787 of yacc.c  */
-#line 484 "util/configparser.y"
+#line 485 "util/configparser.y"
     {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->pidfile);
@@ -2507,9 +2511,9 @@ yyreduce:
 	}
     break;
 
-  case 157:
+  case 158:
 /* Line 1787 of yacc.c  */
-#line 491 "util/configparser.y"
+#line 492 "util/configparser.y"
     {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str)))
@@ -2517,9 +2521,9 @@ yyreduce:
 	}
     break;
 
-  case 158:
+  case 159:
 /* Line 1787 of yacc.c  */
-#line 498 "util/configparser.y"
+#line 499 "util/configparser.y"
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->dlv_anchor_file);
@@ -2527,9 +2531,9 @@ yyreduce:
 	}
     break;
 
-  case 159:
+  case 160:
 /* Line 1787 of yacc.c  */
-#line 505 "util/configparser.y"
+#line 506 "util/configparser.y"
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2537,9 +2541,9 @@ yyreduce:
 	}
     break;
 
-  case 160:
+  case 161:
 /* Line 1787 of yacc.c  */
-#line 512 "util/configparser.y"
+#line 513 "util/configparser.y"
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2548,9 +2552,9 @@ yyreduce:
 	}
     break;
 
-  case 161:
+  case 162:
 /* Line 1787 of yacc.c  */
-#line 520 "util/configparser.y"
+#line 521 "util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2559,9 +2563,9 @@ yyreduce:
 	}
     break;
 
-  case 162:
+  case 163:
 /* Line 1787 of yacc.c  */
-#line 528 "util/configparser.y"
+#line 529 "util/configparser.y"
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2570,9 +2574,9 @@ yyreduce:
 	}
     break;
 
-  case 163:
+  case 164:
 /* Line 1787 of yacc.c  */
-#line 536 "util/configparser.y"
+#line 537 "util/configparser.y"
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2580,9 +2584,9 @@ yyreduce:
 	}
     break;
 
-  case 164:
+  case 165:
 /* Line 1787 of yacc.c  */
-#line 543 "util/configparser.y"
+#line 544 "util/configparser.y"
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[(2) - (2)].str)))
@@ -2590,9 +2594,9 @@ yyreduce:
 	}
     break;
 
-  case 165:
+  case 166:
 /* Line 1787 of yacc.c  */
-#line 550 "util/configparser.y"
+#line 551 "util/configparser.y"
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2602,9 +2606,9 @@ yyreduce:
 	}
     break;
 
-  case 166:
+  case 167:
 /* Line 1787 of yacc.c  */
-#line 559 "util/configparser.y"
+#line 560 "util/configparser.y"
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2614,9 +2618,9 @@ yyreduce:
 	}
     break;
 
-  case 167:
+  case 168:
 /* Line 1787 of yacc.c  */
-#line 568 "util/configparser.y"
+#line 569 "util/configparser.y"
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->identity);
@@ -2624,9 +2628,9 @@ yyreduce:
 	}
     break;
 
-  case 168:
+  case 169:
 /* Line 1787 of yacc.c  */
-#line 575 "util/configparser.y"
+#line 576 "util/configparser.y"
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->version);
@@ -2634,9 +2638,9 @@ yyreduce:
 	}
     break;
 
-  case 169:
+  case 170:
 /* Line 1787 of yacc.c  */
-#line 582 "util/configparser.y"
+#line 583 "util/configparser.y"
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_rcvbuf))
@@ -2645,9 +2649,9 @@ yyreduce:
 	}
     break;
 
-  case 170:
+  case 171:
 /* Line 1787 of yacc.c  */
-#line 590 "util/configparser.y"
+#line 591 "util/configparser.y"
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_sndbuf))
@@ -2656,9 +2660,9 @@ yyreduce:
 	}
     break;
 
-  case 171:
+  case 172:
 /* Line 1787 of yacc.c  */
-#line 598 "util/configparser.y"
+#line 599 "util/configparser.y"
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2672,9 +2676,9 @@ yyreduce:
 	}
     break;
 
-  case 172:
+  case 173:
 /* Line 1787 of yacc.c  */
-#line 611 "util/configparser.y"
+#line 612 "util/configparser.y"
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2686,9 +2690,9 @@ yyreduce:
 	}
     break;
 
-  case 173:
+  case 174:
 /* Line 1787 of yacc.c  */
-#line 622 "util/configparser.y"
+#line 623 "util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size))
@@ -2697,9 +2701,9 @@ yyreduce:
 	}
     break;
 
-  case 174:
+  case 175:
 /* Line 1787 of yacc.c  */
-#line 630 "util/configparser.y"
+#line 631 "util/configparser.y"
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2713,9 +2717,9 @@ yyreduce:
 	}
     break;
 
-  case 175:
+  case 176:
 /* Line 1787 of yacc.c  */
-#line 643 "util/configparser.y"
+#line 644 "util/configparser.y"
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2725,9 +2729,9 @@ yyreduce:
 	}
     break;
 
-  case 176:
+  case 177:
 /* Line 1787 of yacc.c  */
-#line 652 "util/configparser.y"
+#line 653 "util/configparser.y"
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2737,9 +2741,9 @@ yyreduce:
 	}
     break;
 
-  case 177:
+  case 178:
 /* Line 1787 of yacc.c  */
-#line 661 "util/configparser.y"
+#line 662 "util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size))
@@ -2748,9 +2752,9 @@ yyreduce:
 	}
     break;
 
-  case 178:
+  case 179:
 /* Line 1787 of yacc.c  */
-#line 669 "util/configparser.y"
+#line 670 "util/configparser.y"
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2764,9 +2768,9 @@ yyreduce:
 	}
     break;
 
-  case 179:
+  case 180:
 /* Line 1787 of yacc.c  */
-#line 682 "util/configparser.y"
+#line 683 "util/configparser.y"
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2776,9 +2780,9 @@ yyreduce:
 	}
     break;
 
-  case 180:
+  case 181:
 /* Line 1787 of yacc.c  */
-#line 691 "util/configparser.y"
+#line 692 "util/configparser.y"
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
@@ -2787,9 +2791,9 @@ yyreduce:
 	}
     break;
 
-  case 181:
+  case 182:
 /* Line 1787 of yacc.c  */
-#line 699 "util/configparser.y"
+#line 700 "util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2799,9 +2803,9 @@ yyreduce:
 	}
     break;
 
-  case 182:
+  case 183:
 /* Line 1787 of yacc.c  */
-#line 708 "util/configparser.y"
+#line 709 "util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
@@ -2810,9 +2814,9 @@ yyreduce:
 	}
     break;
 
-  case 183:
+  case 184:
 /* Line 1787 of yacc.c  */
-#line 716 "util/configparser.y"
+#line 717 "util/configparser.y"
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2826,9 +2830,9 @@ yyreduce:
 	}
     break;
 
-  case 184:
+  case 185:
 /* Line 1787 of yacc.c  */
-#line 729 "util/configparser.y"
+#line 730 "util/configparser.y"
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
@@ -2836,9 +2840,9 @@ yyreduce:
 	}
     break;
 
-  case 185:
+  case 186:
 /* Line 1787 of yacc.c  */
-#line 736 "util/configparser.y"
+#line 737 "util/configparser.y"
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2849,9 +2853,9 @@ yyreduce:
 	}
     break;
 
-  case 186:
+  case 187:
 /* Line 1787 of yacc.c  */
-#line 746 "util/configparser.y"
+#line 747 "util/configparser.y"
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2862,9 +2866,9 @@ yyreduce:
 	}
     break;
 
-  case 187:
+  case 188:
 /* Line 1787 of yacc.c  */
-#line 756 "util/configparser.y"
+#line 757 "util/configparser.y"
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2875,9 +2879,9 @@ yyreduce:
 	}
     break;
 
-  case 188:
+  case 189:
 /* Line 1787 of yacc.c  */
-#line 766 "util/configparser.y"
+#line 767 "util/configparser.y"
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2888,9 +2892,9 @@ yyreduce:
 	}
     break;
 
-  case 189:
+  case 190:
 /* Line 1787 of yacc.c  */
-#line 776 "util/configparser.y"
+#line 777 "util/configparser.y"
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2901,9 +2905,9 @@ yyreduce:
 	}
     break;
 
-  case 190:
+  case 191:
 /* Line 1787 of yacc.c  */
-#line 786 "util/configparser.y"
+#line 787 "util/configparser.y"
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2914,9 +2918,9 @@ yyreduce:
 	}
     break;
 
-  case 191:
+  case 192:
 /* Line 1787 of yacc.c  */
-#line 796 "util/configparser.y"
+#line 797 "util/configparser.y"
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2927,9 +2931,9 @@ yyreduce:
 	}
     break;
 
-  case 192:
+  case 193:
 /* Line 1787 of yacc.c  */
-#line 806 "util/configparser.y"
+#line 807 "util/configparser.y"
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str)))
@@ -2937,9 +2941,9 @@ yyreduce:
 	}
     break;
 
-  case 193:
+  case 194:
 /* Line 1787 of yacc.c  */
-#line 813 "util/configparser.y"
+#line 814 "util/configparser.y"
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str)))
@@ -2947,9 +2951,9 @@ yyreduce:
 	}
     break;
 
-  case 194:
+  case 195:
 /* Line 1787 of yacc.c  */
-#line 820 "util/configparser.y"
+#line 821 "util/configparser.y"
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2959,9 +2963,9 @@ yyreduce:
 	}
     break;
 
-  case 195:
+  case 196:
 /* Line 1787 of yacc.c  */
-#line 829 "util/configparser.y"
+#line 830 "util/configparser.y"
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2971,9 +2975,9 @@ yyreduce:
 	}
     break;
 
-  case 196:
+  case 197:
 /* Line 1787 of yacc.c  */
-#line 838 "util/configparser.y"
+#line 839 "util/configparser.y"
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2983,9 +2987,9 @@ yyreduce:
 	}
     break;
 
-  case 197:
+  case 198:
 /* Line 1787 of yacc.c  */
-#line 847 "util/configparser.y"
+#line 848 "util/configparser.y"
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str)))
@@ -2993,9 +2997,9 @@ yyreduce:
 	}
     break;
 
-  case 198:
+  case 199:
 /* Line 1787 of yacc.c  */
-#line 854 "util/configparser.y"
+#line 855 "util/configparser.y"
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3006,9 +3010,9 @@ yyreduce:
 	}
     break;
 
-  case 199:
+  case 200:
 /* Line 1787 of yacc.c  */
-#line 864 "util/configparser.y"
+#line 865 "util/configparser.y"
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
 		if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 &&
@@ -3023,9 +3027,9 @@ yyreduce:
 	}
     break;
 
-  case 200:
+  case 201:
 /* Line 1787 of yacc.c  */
-#line 878 "util/configparser.y"
+#line 879 "util/configparser.y"
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->module_conf);
@@ -3033,9 +3037,9 @@ yyreduce:
 	}
     break;
 
-  case 201:
+  case 202:
 /* Line 1787 of yacc.c  */
-#line 885 "util/configparser.y"
+#line 886 "util/configparser.y"
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3054,9 +3058,9 @@ yyreduce:
 	}
     break;
 
-  case 202:
+  case 203:
 /* Line 1787 of yacc.c  */
-#line 903 "util/configparser.y"
+#line 904 "util/configparser.y"
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3070,9 +3074,9 @@ yyreduce:
 	}
     break;
 
-  case 203:
+  case 204:
 /* Line 1787 of yacc.c  */
-#line 916 "util/configparser.y"
+#line 917 "util/configparser.y"
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3086,9 +3090,9 @@ yyreduce:
 	}
     break;
 
-  case 204:
+  case 205:
 /* Line 1787 of yacc.c  */
-#line 929 "util/configparser.y"
+#line 930 "util/configparser.y"
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3098,9 +3102,9 @@ yyreduce:
 	}
     break;
 
-  case 205:
+  case 206:
 /* Line 1787 of yacc.c  */
-#line 938 "util/configparser.y"
+#line 939 "util/configparser.y"
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3110,9 +3114,9 @@ yyreduce:
 	}
     break;
 
-  case 206:
+  case 207:
 /* Line 1787 of yacc.c  */
-#line 947 "util/configparser.y"
+#line 948 "util/configparser.y"
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3122,9 +3126,9 @@ yyreduce:
 	}
     break;
 
-  case 207:
+  case 208:
 /* Line 1787 of yacc.c  */
-#line 956 "util/configparser.y"
+#line 957 "util/configparser.y"
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3135,9 +3139,9 @@ yyreduce:
 	}
     break;
 
-  case 208:
+  case 209:
 /* Line 1787 of yacc.c  */
-#line 966 "util/configparser.y"
+#line 967 "util/configparser.y"
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3148,9 +3152,9 @@ yyreduce:
 	}
     break;
 
-  case 209:
+  case 210:
 /* Line 1787 of yacc.c  */
-#line 976 "util/configparser.y"
+#line 977 "util/configparser.y"
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3160,9 +3164,9 @@ yyreduce:
 	}
     break;
 
-  case 210:
+  case 211:
 /* Line 1787 of yacc.c  */
-#line 985 "util/configparser.y"
+#line 986 "util/configparser.y"
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3172,9 +3176,9 @@ yyreduce:
 	}
     break;
 
-  case 211:
+  case 212:
 /* Line 1787 of yacc.c  */
-#line 994 "util/configparser.y"
+#line 995 "util/configparser.y"
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
@@ -3182,9 +3186,9 @@ yyreduce:
 	}
     break;
 
-  case 212:
+  case 213:
 /* Line 1787 of yacc.c  */
-#line 1001 "util/configparser.y"
+#line 1002 "util/configparser.y"
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3194,9 +3198,9 @@ yyreduce:
 	}
     break;
 
-  case 213:
+  case 214:
 /* Line 1787 of yacc.c  */
-#line 1010 "util/configparser.y"
+#line 1011 "util/configparser.y"
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3206,9 +3210,9 @@ yyreduce:
 	}
     break;
 
-  case 214:
+  case 215:
 /* Line 1787 of yacc.c  */
-#line 1019 "util/configparser.y"
+#line 1020 "util/configparser.y"
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3218,9 +3222,9 @@ yyreduce:
 	}
     break;
 
-  case 215:
+  case 216:
 /* Line 1787 of yacc.c  */
-#line 1028 "util/configparser.y"
+#line 1029 "util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size))
@@ -3229,9 +3233,9 @@ yyreduce:
 	}
     break;
 
-  case 216:
+  case 217:
 /* Line 1787 of yacc.c  */
-#line 1036 "util/configparser.y"
+#line 1037 "util/configparser.y"
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3245,9 +3249,9 @@ yyreduce:
 	}
     break;
 
-  case 217:
+  case 218:
 /* Line 1787 of yacc.c  */
-#line 1049 "util/configparser.y"
+#line 1050 "util/configparser.y"
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size))
@@ -3256,9 +3260,9 @@ yyreduce:
 	}
     break;
 
-  case 218:
+  case 219:
 /* Line 1787 of yacc.c  */
-#line 1057 "util/configparser.y"
+#line 1058 "util/configparser.y"
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
 		if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 &&
@@ -3281,9 +3285,9 @@ yyreduce:
 	}
     break;
 
-  case 219:
+  case 220:
 /* Line 1787 of yacc.c  */
-#line 1079 "util/configparser.y"
+#line 1080 "util/configparser.y"
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str)))
@@ -3291,9 +3295,9 @@ yyreduce:
 	}
     break;
 
-  case 220:
+  case 221:
 /* Line 1787 of yacc.c  */
-#line 1086 "util/configparser.y"
+#line 1087 "util/configparser.y"
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
@@ -3309,9 +3313,9 @@ yyreduce:
 	}
     break;
 
-  case 221:
+  case 222:
 /* Line 1787 of yacc.c  */
-#line 1101 "util/configparser.y"
+#line 1102 "util/configparser.y"
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3322,9 +3326,9 @@ yyreduce:
 	}
     break;
 
-  case 222:
+  case 223:
 /* Line 1787 of yacc.c  */
-#line 1111 "util/configparser.y"
+#line 1112 "util/configparser.y"
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3335,9 +3339,19 @@ yyreduce:
 	}
     break;
 
-  case 223:
+  case 224:
+/* Line 1787 of yacc.c  */
+#line 1122 "util/configparser.y"
+    {
+		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[(2) - (2)].str)));
+		cfg_parser->cfg->max_udp_size = atoi((yyvsp[(2) - (2)].str));
+		free((yyvsp[(2) - (2)].str));
+	}
+    break;
+
+  case 225:
 /* Line 1787 of yacc.c  */
-#line 1121 "util/configparser.y"
+#line 1129 "util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -3348,9 +3362,9 @@ yyreduce:
 	}
     break;
 
-  case 224:
+  case 226:
 /* Line 1787 of yacc.c  */
-#line 1131 "util/configparser.y"
+#line 1139 "util/configparser.y"
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str)))
@@ -3358,9 +3372,9 @@ yyreduce:
 	}
     break;
 
-  case 225:
+  case 227:
 /* Line 1787 of yacc.c  */
-#line 1138 "util/configparser.y"
+#line 1146 "util/configparser.y"
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str)))
@@ -3368,9 +3382,9 @@ yyreduce:
 	}
     break;
 
-  case 226:
+  case 228:
 /* Line 1787 of yacc.c  */
-#line 1145 "util/configparser.y"
+#line 1153 "util/configparser.y"
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3380,9 +3394,9 @@ yyreduce:
 	}
     break;
 
-  case 227:
+  case 229:
 /* Line 1787 of yacc.c  */
-#line 1154 "util/configparser.y"
+#line 1162 "util/configparser.y"
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3393,9 +3407,9 @@ yyreduce:
 	}
     break;
 
-  case 228:
+  case 230:
 /* Line 1787 of yacc.c  */
-#line 1164 "util/configparser.y"
+#line 1172 "util/configparser.y"
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -3406,9 +3420,9 @@ yyreduce:
 	}
     break;
 
-  case 229:
+  case 231:
 /* Line 1787 of yacc.c  */
-#line 1174 "util/configparser.y"
+#line 1182 "util/configparser.y"
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str)))
@@ -3416,9 +3430,9 @@ yyreduce:
 	}
     break;
 
-  case 230:
+  case 232:
 /* Line 1787 of yacc.c  */
-#line 1181 "util/configparser.y"
+#line 1189 "util/configparser.y"
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str)))
@@ -3426,9 +3440,9 @@ yyreduce:
 	}
     break;
 
-  case 231:
+  case 233:
 /* Line 1787 of yacc.c  */
-#line 1188 "util/configparser.y"
+#line 1196 "util/configparser.y"
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3438,17 +3452,17 @@ yyreduce:
 	}
     break;
 
-  case 232:
+  case 234:
 /* Line 1787 of yacc.c  */
-#line 1197 "util/configparser.y"
+#line 1205 "util/configparser.y"
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
     break;
 
-  case 242:
+  case 244:
 /* Line 1787 of yacc.c  */
-#line 1208 "util/configparser.y"
+#line 1216 "util/configparser.y"
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3459,9 +3473,9 @@ yyreduce:
 	}
     break;
 
-  case 243:
+  case 245:
 /* Line 1787 of yacc.c  */
-#line 1218 "util/configparser.y"
+#line 1226 "util/configparser.y"
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3471,9 +3485,9 @@ yyreduce:
 	}
     break;
 
-  case 244:
+  case 246:
 /* Line 1787 of yacc.c  */
-#line 1227 "util/configparser.y"
+#line 1235 "util/configparser.y"
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str)))
@@ -3481,9 +3495,9 @@ yyreduce:
 	}
     break;
 
-  case 245:
+  case 247:
 /* Line 1787 of yacc.c  */
-#line 1234 "util/configparser.y"
+#line 1242 "util/configparser.y"
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->server_key_file);
@@ -3491,9 +3505,9 @@ yyreduce:
 	}
     break;
 
-  case 246:
+  case 248:
 /* Line 1787 of yacc.c  */
-#line 1241 "util/configparser.y"
+#line 1249 "util/configparser.y"
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->server_cert_file);
@@ -3501,9 +3515,9 @@ yyreduce:
 	}
     break;
 
-  case 247:
+  case 249:
 /* Line 1787 of yacc.c  */
-#line 1248 "util/configparser.y"
+#line 1256 "util/configparser.y"
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->control_key_file);
@@ -3511,9 +3525,9 @@ yyreduce:
 	}
     break;
 
-  case 248:
+  case 250:
 /* Line 1787 of yacc.c  */
-#line 1255 "util/configparser.y"
+#line 1263 "util/configparser.y"
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->control_cert_file);
@@ -3521,17 +3535,17 @@ yyreduce:
 	}
     break;
 
-  case 249:
+  case 251:
 /* Line 1787 of yacc.c  */
-#line 1262 "util/configparser.y"
+#line 1270 "util/configparser.y"
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
     break;
 
-  case 253:
+  case 255:
 /* Line 1787 of yacc.c  */
-#line 1271 "util/configparser.y"
+#line 1279 "util/configparser.y"
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str)));
 		free(cfg_parser->cfg->python_script);
@@ -3541,7 +3555,7 @@ yyreduce:
 
 
 /* Line 1787 of yacc.c  */
-#line 3545 "util/configparser.c"
+#line 3559 "util/configparser.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -3771,7 +3785,7 @@ yyreturn:
 
 
 /* Line 2048 of yacc.c  */
-#line 1276 "util/configparser.y"
+#line 1284 "util/configparser.y"
 
 
 /* parse helper routines could be here */