Changelog for #200 and bison, flex regenerate.

- Merge PR #200 from yarikk: add ip-dscp option to specify the DSCP
  tag for outgoing packets.

diff --git a/doc/Changelog b/doc/Changelog
index 0551486bc9cb613bfdfac2df6f1522bf5c7c2e0d..fcc7dca282ad00918410b620ccd10331c50d6c54 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+24 March 2020: Wouter
+       - Merge PR #200 from yarikk: add ip-dscp option to specify the DSCP
+         tag for outgoing packets.
+
 23 March 2020: Wouter
        - Fix compile on Solaris for unbound-checkconf.
 

diff --git a/util/configlexer.c b/util/configlexer.c
index 2037992d4fea716f435e4f8eddd76fd898aa4a6e..194569a64a035d0a1197ecd6aad687a51bc84751 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1,7 +1,7 @@
 #include "config.h"
 #include "util/configyyrename.h"
 
-#line 3 "<stdout>"
+#line 2 "<stdout>"
 
 #define  YY_INT_ALIGNED short int
 
@@ -9,8 +9,8 @@
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -48,7 +48,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -56,7 +55,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -87,63 +85,61 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else  /* ! __cplusplus */
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
 
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#endif /* ! C99 */
 
-#define YY_USE_CONST
+#endif /* ! FLEXINT_H */
 
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
+/* begin standard C++ headers. */
 
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
-
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
-
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
-
+#define YY_NEW_FILE yyrestart( yyin  )
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -160,15 +156,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t yyleng;
+extern int yyleng;
 
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-
+    
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -183,7 +180,6 @@ extern FILE *yyin, *yyout;
                YY_DO_BEFORE_ACTION; /* set up yytext again */ \
                } \
        while ( 0 )
-
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -198,12 +194,12 @@ struct yy_buffer_state
        /* Size of input buffer in bytes, not including room for EOB
         * characters.
         */
-       yy_size_t yy_buf_size;
+       int yy_buf_size;
 
        /* Number of characters read into yy_ch_buf, not including EOB
         * characters.
         */
-       yy_size_t yy_n_chars;
+       int yy_n_chars;
 
        /* Whether we "own" the buffer - i.e., we know we created it,
         * and can realloc() it to grow it, and should free() it to
@@ -226,7 +222,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
        /* Whether to try to fill the input buffer when we reach the
         * end of it.
         */
@@ -254,7 +250,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -265,7 +261,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
-
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
@@ -273,11 +268,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;           /* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars;         /* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;                /* whether we need to initialize */
 static int yy_start = 0;       /* start state number */
 
@@ -286,71 +281,68 @@ static int yy_start = 0;  /* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
 #define yy_new_buffer yy_create_buffer
-
 #define yy_set_interactive(is_interactive) \
        { \
        if ( ! YY_CURRENT_BUFFER ){ \
         yyensure_buffer_stack (); \
                YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
        } \
        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
        }
-
 #define yy_set_bol(at_bol) \
        { \
        if ( ! YY_CURRENT_BUFFER ){\
         yyensure_buffer_stack (); \
                YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
        } \
        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
        }
-
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
 extern int yylineno;
-
 int yylineno = 1;
 
 extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
@@ -358,11 +350,10 @@ static void yy_fatal_error (yyconst char msg[]  );
 #define YY_DO_BEFORE_ACTION \
        (yytext_ptr) = yy_bp; \
        (yytext_ptr) -= (yy_more_len); \
-       yyleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+       yyleng = (int) (yy_cp - (yytext_ptr)); \
        (yy_hold_char) = *yy_cp; \
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
-
 #define YY_NUM_RULES 310
 #define YY_END_OF_BUFFER 311
 /* This struct is not used in this scanner,
@@ -372,7 +363,7 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[3049] =
+static const flex_int16_t yy_accept[3049] =
     {   0,
         1,    1,  292,  292,  296,  296,  300,  300,  304,  304,
         1,    1,  311,  308,    1,  290,  290,  309,    2,  309,
@@ -711,7 +702,7 @@ static yyconst flex_int16_t yy_accept[3049] =
       308,  308,  308,  308,  308,  238,  242,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
@@ -743,7 +734,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[41] =
+static const YY_CHAR yy_meta[41] =
     {   0,
         1,    2,    3,    4,    5,    1,    6,    1,    1,    1,
         1,    1,    7,    1,    1,    1,    1,    1,    1,    1,
@@ -751,7 +742,7 @@ static yyconst flex_int32_t yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[3063] =
+static const flex_int16_t yy_base[3063] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
        90,  112, 2327, 1999,   81, 5940, 5940, 5940,   96,   52,
@@ -1092,7 +1083,7 @@ static yyconst flex_int16_t yy_base[3063] =
      5925, 5932
     } ;
 
-static yyconst flex_int16_t yy_def[3063] =
+static const flex_int16_t yy_def[3063] =
     {   0,
      3048,    1, 3049, 3049, 3050, 3050, 3051, 3051, 3052, 3052,
      3053, 3053, 3048, 3054, 3048, 3048, 3048, 3048, 3055, 3054,
@@ -1433,7 +1424,7 @@ static yyconst flex_int16_t yy_def[3063] =
      3048, 3048
     } ;
 
-static yyconst flex_int16_t yy_nxt[5981] =
+static const flex_int16_t yy_nxt[5981] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   14,   18,   20,   21,   22,   23,   24,   25,   26,
@@ -2094,7 +2085,7 @@ static yyconst flex_int16_t yy_nxt[5981] =
      3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048, 3048
     } ;
 
-static yyconst flex_int16_t yy_chk[5981] =
+static const flex_int16_t yy_chk[5981] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2877,7 +2868,7 @@ static void config_start_include(const char* filename)
        config_include_stack = s;
        cfg_parser->filename = nm;
        cfg_parser->line = 1;
-       yy_switch_to_buffer(yy_create_buffer(input,YY_BUF_SIZE));
+       yy_switch_to_buffer(yy_create_buffer(input, YY_BUF_SIZE));
 }
 
 static void config_start_include_glob(const char* filename)
@@ -2946,11 +2937,12 @@ static void config_end_include(void)
 #define yy_set_bol(at_bol) \
         { \
                if ( ! yy_current_buffer ) \
-                       yy_current_buffer = yy_create_buffer(yyin,YY_BUF_SIZE ); \
+                       yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
                yy_current_buffer->yy_ch_buf[0] = ((at_bol)?'\n':' '); \
         }
 #endif
 
+#line 2943 "<stdout>"
 #define YY_NO_INPUT 1
 #line 184 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -2959,8 +2951,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
+#line 2952 "<stdout>"
 
-#line 2962 "<stdout>"
+#line 2954 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -2981,36 +2974,36 @@ static void config_end_include(void)
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy (void );
+int yylex_destroy ( void );
 
-int yyget_debug (void );
+int yyget_debug ( void );
 
-void yyset_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE yyget_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in (void );
+FILE *yyget_in ( void );
 
-void yyset_in  (FILE * in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *yyget_out (void );
+FILE *yyget_out ( void );
 
-void yyset_out  (FILE * out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t yyget_leng (void );
+                       int yyget_leng ( void );
 
-char *yyget_text (void );
+char *yyget_text ( void );
 
-int yyget_lineno (void );
+int yyget_lineno ( void );
 
-void yyset_lineno (int line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -3018,33 +3011,41 @@ void yyset_lineno (int line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int yywrap (void );
+extern int yywrap ( void );
+#endif
 #endif
+
+#ifndef YY_NO_UNPUT
+    
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
 #else
-static int input (void );
+static int input ( void );
 #endif
 
 #endif
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -3052,7 +3053,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -3063,7 +3064,7 @@ static int input (void );
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \
-               yy_size_t n; \
+               int n; \
                for ( n = 0; n < max_size && \
                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \
@@ -3076,7 +3077,7 @@ static int input (void );
        else \
                { \
                errno=0; \
-               while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+               while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
                        { \
                        if( errno != EINTR) \
                                { \
@@ -3131,7 +3132,7 @@ extern int yylex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
 #endif
 
 #define YY_RULE_SETUP \
@@ -3141,14 +3142,10 @@ extern int yylex (void);
  */
 YY_DECL
 {
-       register yy_state_type yy_current_state;
-       register char *yy_cp, *yy_bp;
-       register int yy_act;
+       yy_state_type yy_current_state;
+       char *yy_cp, *yy_bp;
+       int yy_act;
     
-#line 204 "./util/configlexer.lex"
-
-#line 3149 "<stdout>"
-
        if ( !(yy_init) )
                {
                (yy_init) = 1;
@@ -3169,18 +3166,23 @@ YY_DECL
                if ( ! YY_CURRENT_BUFFER ) {
                        yyensure_buffer_stack ();
                        YY_CURRENT_BUFFER_LVALUE =
-                               yy_create_buffer(yyin,YY_BUF_SIZE );
+                               yy_create_buffer( yyin, YY_BUF_SIZE );
                }
 
-               yy_load_buffer_state( );
+               yy_load_buffer_state(  );
                }
 
-       while ( 1 )             /* loops until end-of-file is reached */
+       {
+#line 204 "./util/configlexer.lex"
+
+#line 3176 "<stdout>"
+
+       while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
                {
                (yy_more_len) = 0;
                if ( (yy_more_flag) )
                        {
-                       (yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
+                       (yy_more_len) = (int) ((yy_c_buf_p) - (yytext_ptr));
                        (yy_more_flag) = 0;
                        }
                yy_cp = (yy_c_buf_p);
@@ -3197,7 +3199,7 @@ YY_DECL
 yy_match:
                do
                        {
-                       register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+                       YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
                        if ( yy_accept[yy_current_state] )
                                {
                                (yy_last_accepting_state) = yy_current_state;
@@ -3207,9 +3209,9 @@ yy_match:
                                {
                                yy_current_state = (int) yy_def[yy_current_state];
                                if ( yy_current_state >= 3049 )
-                                       yy_c = yy_meta[(unsigned int) yy_c];
+                                       yy_c = yy_meta[yy_c];
                                }
-                       yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+                       yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
                        ++yy_cp;
                        }
                while ( yy_base[yy_current_state] != 5940 );
@@ -4889,7 +4891,7 @@ YY_RULE_SETUP
 #line 603 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 4891 "<stdout>"
+#line 4892 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -4965,7 +4967,7 @@ ECHO;
                                {
                                (yy_did_buffer_switch_on_eof) = 0;
 
-                               if ( yywrap( ) )
+                               if ( yywrap(  ) )
                                        {
                                        /* Note: because we've taken care in
                                         * yy_get_next_buffer() to have set up
@@ -5018,6 +5020,7 @@ ECHO;
                        "fatal flex scanner internal error--no action found" );
        } /* end of action switch */
                } /* end of scanning one token */
+       } /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -5029,9 +5032,9 @@ ECHO;
  */
 static int yy_get_next_buffer (void)
 {
-       register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-       register char *source = (yytext_ptr);
-       register int number_to_move, i;
+       char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+       char *source = (yytext_ptr);
+       int number_to_move, i;
        int ret_val;
 
        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -5060,7 +5063,7 @@ static int yy_get_next_buffer (void)
        /* Try to read more data. */
 
        /* First move last chars to start of buffer. */
-       number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+       number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
        for ( i = 0; i < number_to_move; ++i )
                *(dest++) = *(source++);
@@ -5073,21 +5076,21 @@ static int yy_get_next_buffer (void)
 
        else
                {
-                       yy_size_t num_to_read =
+                       int num_to_read =
                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
                while ( num_to_read <= 0 )
                        { /* Not enough room in the buffer - grow it. */
 
                        /* just a shorter name for the current buffer */
-                       YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+                       YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
                        int yy_c_buf_p_offset =
                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
 
                        if ( b->yy_is_our_buffer )
                                {
-                               yy_size_t new_size = b->yy_buf_size * 2;
+                               int new_size = b->yy_buf_size * 2;
 
                                if ( new_size <= 0 )
                                        b->yy_buf_size += b->yy_buf_size / 8;
@@ -5096,11 +5099,12 @@ static int yy_get_next_buffer (void)
 
                                b->yy_ch_buf = (char *)
                                        /* Include room in for 2 EOB chars. */
-                                       yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+                                       yyrealloc( (void *) b->yy_ch_buf,
+                                                        (yy_size_t) (b->yy_buf_size + 2)  );
                                }
                        else
                                /* Can't grow it, we don't own it. */
-                               b->yy_ch_buf = 0;
+                               b->yy_ch_buf = NULL;
 
                        if ( ! b->yy_ch_buf )
                                YY_FATAL_ERROR(
@@ -5128,7 +5132,7 @@ static int yy_get_next_buffer (void)
                if ( number_to_move == YY_MORE_ADJ )
                        {
                        ret_val = EOB_ACT_END_OF_FILE;
-                       yyrestart(yyin  );
+                       yyrestart( yyin  );
                        }
 
                else
@@ -5142,12 +5146,15 @@ static int yy_get_next_buffer (void)
        else
                ret_val = EOB_ACT_CONTINUE_SCAN;
 
-       if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+       if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
                /* Extend the array by 50%, plus the number we really need. */
-               yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-               YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+               int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+               YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+                       (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
                if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
                        YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+               /* "- 2" to take care of EOB's */
+               YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
        }
 
        (yy_n_chars) += number_to_move;
@@ -5163,14 +5170,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-       register yy_state_type yy_current_state;
-       register char *yy_cp;
+       yy_state_type yy_current_state;
+       char *yy_cp;
     
        yy_current_state = (yy_start);
 
        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
                {
-               register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+               YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
                if ( yy_accept[yy_current_state] )
                        {
                        (yy_last_accepting_state) = yy_current_state;
@@ -5180,9 +5187,9 @@ static int yy_get_next_buffer (void)
                        {
                        yy_current_state = (int) yy_def[yy_current_state];
                        if ( yy_current_state >= 3049 )
-                               yy_c = yy_meta[(unsigned int) yy_c];
+                               yy_c = yy_meta[yy_c];
                        }
-               yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+               yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
                }
 
        return yy_current_state;
@@ -5195,10 +5202,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-       register int yy_is_jam;
-       register char *yy_cp = (yy_c_buf_p);
+       int yy_is_jam;
+       char *yy_cp = (yy_c_buf_p);
 
-       register YY_CHAR yy_c = 1;
+       YY_CHAR yy_c = 1;
        if ( yy_accept[yy_current_state] )
                {
                (yy_last_accepting_state) = yy_current_state;
@@ -5208,14 +5215,18 @@ static int yy_get_next_buffer (void)
                {
                yy_current_state = (int) yy_def[yy_current_state];
                if ( yy_current_state >= 3049 )
-                       yy_c = yy_meta[(unsigned int) yy_c];
+                       yy_c = yy_meta[yy_c];
                }
-       yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+       yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
        yy_is_jam = (yy_current_state == 3048);
 
-       return yy_is_jam ? 0 : yy_current_state;
+               return yy_is_jam ? 0 : yy_current_state;
 }
 
+#ifndef YY_NO_UNPUT
+
+#endif
+
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
     static int yyinput (void)
@@ -5240,7 +5251,7 @@ static int yy_get_next_buffer (void)
 
                else
                        { /* need more input */
-                       yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+                       int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
                        ++(yy_c_buf_p);
 
                        switch ( yy_get_next_buffer(  ) )
@@ -5257,13 +5268,13 @@ static int yy_get_next_buffer (void)
                                         */
 
                                        /* Reset buffer status. */
-                                       yyrestart(yyin );
+                                       yyrestart( yyin );
 
                                        /*FALLTHROUGH*/
 
                                case EOB_ACT_END_OF_FILE:
                                        {
-                                       if ( yywrap( ) )
+                                       if ( yywrap(  ) )
                                                return 0;
 
                                        if ( ! (yy_did_buffer_switch_on_eof) )
@@ -5301,11 +5312,11 @@ static int yy_get_next_buffer (void)
        if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
                YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
+            yy_create_buffer( yyin, YY_BUF_SIZE );
        }
 
-       yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-       yy_load_buffer_state( );
+       yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+       yy_load_buffer_state(  );
 }
 
 /** Switch to a different input buffer.
@@ -5333,7 +5344,7 @@ static int yy_get_next_buffer (void)
                }
 
        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-       yy_load_buffer_state( );
+       yy_load_buffer_state(  );
 
        /* We don't actually know whether we did this switch during
         * EOF (yywrap()) processing, but the only time this flag
@@ -5361,7 +5372,7 @@ static void yy_load_buffer_state  (void)
 {
        YY_BUFFER_STATE b;
     
-       b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+       b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
        if ( ! b )
                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -5370,13 +5381,13 @@ static void yy_load_buffer_state  (void)
        /* yy_ch_buf has to be 2 characters longer than the size given because
         * we need to put in 2 end-of-buffer characters.
         */
-       b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+       b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
        if ( ! b->yy_ch_buf )
                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
        b->yy_is_our_buffer = 1;
 
-       yy_init_buffer(b,file );
+       yy_init_buffer( b, file );
 
        return b;
 }
@@ -5395,15 +5406,11 @@ static void yy_load_buffer_state  (void)
                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
        if ( b->yy_is_our_buffer )
-               yyfree((void *) b->yy_ch_buf  );
+               yyfree( (void *) b->yy_ch_buf  );
 
-       yyfree((void *) b  );
+       yyfree( (void *) b  );
 }
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
@@ -5413,7 +5420,7 @@ extern int isatty (int );
 {
        int oerrno = errno;
     
-       yy_flush_buffer(b );
+       yy_flush_buffer( b );
 
        b->yy_input_file = file;
        b->yy_fill_buffer = 1;
@@ -5456,7 +5463,7 @@ extern int isatty (int );
        b->yy_buffer_status = YY_BUFFER_NEW;
 
        if ( b == YY_CURRENT_BUFFER )
-               yy_load_buffer_state( );
+               yy_load_buffer_state(  );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -5487,7 +5494,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
        YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
        /* copied from yy_switch_to_buffer. */
-       yy_load_buffer_state( );
+       yy_load_buffer_state(  );
        (yy_did_buffer_switch_on_eof) = 1;
 }
 
@@ -5506,7 +5513,7 @@ void yypop_buffer_state (void)
                --(yy_buffer_stack_top);
 
        if (YY_CURRENT_BUFFER) {
-               yy_load_buffer_state( );
+               yy_load_buffer_state(  );
                (yy_did_buffer_switch_on_eof) = 1;
        }
 }
@@ -5524,15 +5531,15 @@ static void yyensure_buffer_stack (void)
                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
                 * immediate realloc on the next call.
          */
-               num_to_alloc = 1;
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
                (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
                                                                );
                if ( ! (yy_buffer_stack) )
                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-                                                                 
+
                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-                               
+
                (yy_buffer_stack_max) = num_to_alloc;
                (yy_buffer_stack_top) = 0;
                return;
@@ -5541,7 +5548,7 @@ static void yyensure_buffer_stack (void)
        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
                /* Increase the buffer to prepare for a possible push. */
-               int grow_size = 8 /* arbitrary grow size */;
+               yy_size_t grow_size = 8 /* arbitrary grow size */;
 
                num_to_alloc = (yy_buffer_stack_max) + grow_size;
                (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
@@ -5561,7 +5568,7 @@ static void yyensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
@@ -5571,23 +5578,23 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
             base[size-2] != YY_END_OF_BUFFER_CHAR ||
             base[size-1] != YY_END_OF_BUFFER_CHAR )
                /* They forgot to leave room for the EOB's. */
-               return 0;
+               return NULL;
 
-       b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+       b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
        if ( ! b )
                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-       b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
+       b->yy_buf_size = (int) (size - 2);      /* "- 2" to take care of EOB's */
        b->yy_buf_pos = b->yy_ch_buf = base;
        b->yy_is_our_buffer = 0;
-       b->yy_input_file = 0;
+       b->yy_input_file = NULL;
        b->yy_n_chars = b->yy_buf_size;
        b->yy_is_interactive = 0;
        b->yy_at_bol = 1;
        b->yy_fill_buffer = 0;
        b->yy_buffer_status = YY_BUFFER_NEW;
 
-       yy_switch_to_buffer(b  );
+       yy_switch_to_buffer( b  );
 
        return b;
 }
@@ -5600,28 +5607,29 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
     
-       return yy_scan_bytes(yystr,strlen(yystr) );
+       return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
        YY_BUFFER_STATE b;
        char *buf;
-       yy_size_t n, i;
+       yy_size_t n;
+       int i;
     
        /* Get memory for full buffer, including space for trailing EOB's. */
-       n = _yybytes_len + 2;
-       buf = (char *) yyalloc(n  );
+       n = (yy_size_t) (_yybytes_len + 2);
+       buf = (char *) yyalloc( n  );
        if ( ! buf )
                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -5630,7 +5638,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 
        buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-       b = yy_scan_buffer(buf,n );
+       b = yy_scan_buffer( buf, n );
        if ( ! b )
                YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -5646,9 +5654,9 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
 {
-       (void) fprintf( stderr, "%s\n", msg );
+                       fprintf( stderr, "%s\n", msg );
        exit( YY_EXIT_FAILURE );
 }
 
@@ -5676,7 +5684,7 @@ static void yy_fatal_error (yyconst char* msg )
  */
 int yyget_lineno  (void)
 {
-        
+    
     return yylineno;
 }
 
@@ -5699,7 +5707,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t yyget_leng  (void)
+int yyget_leng  (void)
 {
         return yyleng;
 }
@@ -5714,29 +5722,29 @@ char *yyget_text  (void)
 }
 
 /** Set the current line number.
- * @param line_number
+ * @param _line_number line number
  * 
  */
-void yyset_lineno (int  line_number )
+void yyset_lineno (int  _line_number )
 {
     
-    yylineno = line_number;
+    yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
  * 
  * @see yy_switch_to_buffer
  */
-void yyset_in (FILE *  in_str )
+void yyset_in (FILE *  _in_str )
 {
-        yyin = in_str ;
+        yyin = _in_str ;
 }
 
-void yyset_out (FILE *  out_str )
+void yyset_out (FILE *  _out_str )
 {
-        yyout = out_str ;
+        yyout = _out_str ;
 }
 
 int yyget_debug  (void)
@@ -5744,9 +5752,9 @@ int yyget_debug  (void)
         return yy_flex_debug;
 }
 
-void yyset_debug (int  bdebug )
+void yyset_debug (int  _bdebug )
 {
-        yy_flex_debug = bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
@@ -5755,10 +5763,10 @@ static int yy_init_globals (void)
      * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
+    (yy_c_buf_p) = NULL;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -5767,8 +5775,8 @@ static int yy_init_globals (void)
     yyin = stdin;
     yyout = stdout;
 #else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -5783,7 +5791,7 @@ int yylex_destroy  (void)
     
     /* Pop the buffer stack, destroying each element. */
        while(YY_CURRENT_BUFFER){
-               yy_delete_buffer(YY_CURRENT_BUFFER  );
+               yy_delete_buffer( YY_CURRENT_BUFFER  );
                YY_CURRENT_BUFFER_LVALUE = NULL;
                yypop_buffer_state();
        }
@@ -5804,18 +5812,19 @@ int yylex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
-       register int i;
+               
+       int i;
        for ( i = 0; i < n; ++i )
                s1[i] = s2[i];
 }
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
 {
-       register int n;
+       int n;
        for ( n = 0; s[n]; ++n )
                ;
 
@@ -5825,11 +5834,12 @@ static int yy_flex_strlen (yyconst char * s )
 
 void *yyalloc (yy_size_t  size )
 {
-       return (void *) malloc( size );
+                       return malloc(size);
 }
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
 {
+               
        /* The cast to (char *) in the following accommodates both
         * implementations that use char* generic pointers, and those
         * that use void* generic pointers.  It works with the latter
@@ -5837,12 +5847,12 @@ void *yyrealloc  (void * ptr, yy_size_t  size )
         * any pointer type to void*, and deal with argument conversions
         * as though doing an assignment.
         */
-       return (void *) realloc( (char *) ptr, size );
+       return realloc(ptr, size);
 }
 
 void yyfree (void * ptr )
 {
-       free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
+                       free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
@@ -5850,4 +5860,3 @@ void yyfree (void * ptr )
 #line 603 "./util/configlexer.lex"
 
 
-

diff --git a/util/configparser.c b/util/configparser.c
index 5938b1940453967bfbd0eb009e9cbf52cafcd0d7..657f9957920be2b9f7030df59babfea3b20c0b40 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -43,11 +41,14 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "3.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,301 +56,368 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+/* Push parsers.  */
+#define YYPUSH 0
 
+/* Pull parsers.  */
+#define YYPULL 1
 
 
-/* Tokens.  */
+
+
+/* First part of user prologue.  */
+#line 38 "./util/configparser.y"
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#include "util/configyyrename.h"
+#include "util/config_file.h"
+#include "util/net_help.h"
+
+int ub_c_lex(void);
+void ub_c_error(const char *message);
+
+static void validate_respip_action(const char* action);
+
+/* these need to be global, otherwise they cannot be used inside yacc */
+extern struct config_parser_state* cfg_parser;
+
+#if 0
+#define OUTYY(s)  printf s /* used ONLY when debugging */
+#else
+#define OUTYY(s)
+#endif
+
+
+#line 99 "util/configparser.c"
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
+#  else
+#   define YY_NULLPTR ((void*)0)
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Use api.header.include to #include this header
+   instead of duplicating it here.  */
+#ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
+# define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     SPACE = 258,
-     LETTER = 259,
-     NEWLINE = 260,
-     COMMENT = 261,
-     COLON = 262,
-     ANY = 263,
-     ZONESTR = 264,
-     STRING_ARG = 265,
-     VAR_SERVER = 266,
-     VAR_VERBOSITY = 267,
-     VAR_NUM_THREADS = 268,
-     VAR_PORT = 269,
-     VAR_OUTGOING_RANGE = 270,
-     VAR_INTERFACE = 271,
-     VAR_PREFER_IP4 = 272,
-     VAR_DO_IP4 = 273,
-     VAR_DO_IP6 = 274,
-     VAR_PREFER_IP6 = 275,
-     VAR_DO_UDP = 276,
-     VAR_DO_TCP = 277,
-     VAR_TCP_MSS = 278,
-     VAR_OUTGOING_TCP_MSS = 279,
-     VAR_TCP_IDLE_TIMEOUT = 280,
-     VAR_EDNS_TCP_KEEPALIVE = 281,
-     VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282,
-     VAR_CHROOT = 283,
-     VAR_USERNAME = 284,
-     VAR_DIRECTORY = 285,
-     VAR_LOGFILE = 286,
-     VAR_PIDFILE = 287,
-     VAR_MSG_CACHE_SIZE = 288,
-     VAR_MSG_CACHE_SLABS = 289,
-     VAR_NUM_QUERIES_PER_THREAD = 290,
-     VAR_RRSET_CACHE_SIZE = 291,
-     VAR_RRSET_CACHE_SLABS = 292,
-     VAR_OUTGOING_NUM_TCP = 293,
-     VAR_INFRA_HOST_TTL = 294,
-     VAR_INFRA_LAME_TTL = 295,
-     VAR_INFRA_CACHE_SLABS = 296,
-     VAR_INFRA_CACHE_NUMHOSTS = 297,
-     VAR_INFRA_CACHE_LAME_SIZE = 298,
-     VAR_NAME = 299,
-     VAR_STUB_ZONE = 300,
-     VAR_STUB_HOST = 301,
-     VAR_STUB_ADDR = 302,
-     VAR_TARGET_FETCH_POLICY = 303,
-     VAR_HARDEN_SHORT_BUFSIZE = 304,
-     VAR_HARDEN_LARGE_QUERIES = 305,
-     VAR_FORWARD_ZONE = 306,
-     VAR_FORWARD_HOST = 307,
-     VAR_FORWARD_ADDR = 308,
-     VAR_DO_NOT_QUERY_ADDRESS = 309,
-     VAR_HIDE_IDENTITY = 310,
-     VAR_HIDE_VERSION = 311,
-     VAR_IDENTITY = 312,
-     VAR_VERSION = 313,
-     VAR_HARDEN_GLUE = 314,
-     VAR_MODULE_CONF = 315,
-     VAR_TRUST_ANCHOR_FILE = 316,
-     VAR_TRUST_ANCHOR = 317,
-     VAR_VAL_OVERRIDE_DATE = 318,
-     VAR_BOGUS_TTL = 319,
-     VAR_VAL_CLEAN_ADDITIONAL = 320,
-     VAR_VAL_PERMISSIVE_MODE = 321,
-     VAR_INCOMING_NUM_TCP = 322,
-     VAR_MSG_BUFFER_SIZE = 323,
-     VAR_KEY_CACHE_SIZE = 324,
-     VAR_KEY_CACHE_SLABS = 325,
-     VAR_TRUSTED_KEYS_FILE = 326,
-     VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327,
-     VAR_USE_SYSLOG = 328,
-     VAR_OUTGOING_INTERFACE = 329,
-     VAR_ROOT_HINTS = 330,
-     VAR_DO_NOT_QUERY_LOCALHOST = 331,
-     VAR_CACHE_MAX_TTL = 332,
-     VAR_HARDEN_DNSSEC_STRIPPED = 333,
-     VAR_ACCESS_CONTROL = 334,
-     VAR_LOCAL_ZONE = 335,
-     VAR_LOCAL_DATA = 336,
-     VAR_INTERFACE_AUTOMATIC = 337,
-     VAR_STATISTICS_INTERVAL = 338,
-     VAR_DO_DAEMONIZE = 339,
-     VAR_USE_CAPS_FOR_ID = 340,
-     VAR_STATISTICS_CUMULATIVE = 341,
-     VAR_OUTGOING_PORT_PERMIT = 342,
-     VAR_OUTGOING_PORT_AVOID = 343,
-     VAR_DLV_ANCHOR_FILE = 344,
-     VAR_DLV_ANCHOR = 345,
-     VAR_NEG_CACHE_SIZE = 346,
-     VAR_HARDEN_REFERRAL_PATH = 347,
-     VAR_PRIVATE_ADDRESS = 348,
-     VAR_PRIVATE_DOMAIN = 349,
-     VAR_REMOTE_CONTROL = 350,
-     VAR_CONTROL_ENABLE = 351,
-     VAR_CONTROL_INTERFACE = 352,
-     VAR_CONTROL_PORT = 353,
-     VAR_SERVER_KEY_FILE = 354,
-     VAR_SERVER_CERT_FILE = 355,
-     VAR_CONTROL_KEY_FILE = 356,
-     VAR_CONTROL_CERT_FILE = 357,
-     VAR_CONTROL_USE_CERT = 358,
-     VAR_EXTENDED_STATISTICS = 359,
-     VAR_LOCAL_DATA_PTR = 360,
-     VAR_JOSTLE_TIMEOUT = 361,
-     VAR_STUB_PRIME = 362,
-     VAR_UNWANTED_REPLY_THRESHOLD = 363,
-     VAR_LOG_TIME_ASCII = 364,
-     VAR_DOMAIN_INSECURE = 365,
-     VAR_PYTHON = 366,
-     VAR_PYTHON_SCRIPT = 367,
-     VAR_VAL_SIG_SKEW_MIN = 368,
-     VAR_VAL_SIG_SKEW_MAX = 369,
-     VAR_CACHE_MIN_TTL = 370,
-     VAR_VAL_LOG_LEVEL = 371,
-     VAR_AUTO_TRUST_ANCHOR_FILE = 372,
-     VAR_KEEP_MISSING = 373,
-     VAR_ADD_HOLDDOWN = 374,
-     VAR_DEL_HOLDDOWN = 375,
-     VAR_SO_RCVBUF = 376,
-     VAR_EDNS_BUFFER_SIZE = 377,
-     VAR_PREFETCH = 378,
-     VAR_PREFETCH_KEY = 379,
-     VAR_SO_SNDBUF = 380,
-     VAR_SO_REUSEPORT = 381,
-     VAR_HARDEN_BELOW_NXDOMAIN = 382,
-     VAR_IGNORE_CD_FLAG = 383,
-     VAR_LOG_QUERIES = 384,
-     VAR_LOG_REPLIES = 385,
-     VAR_LOG_LOCAL_ACTIONS = 386,
-     VAR_TCP_UPSTREAM = 387,
-     VAR_SSL_UPSTREAM = 388,
-     VAR_SSL_SERVICE_KEY = 389,
-     VAR_SSL_SERVICE_PEM = 390,
-     VAR_SSL_PORT = 391,
-     VAR_FORWARD_FIRST = 392,
-     VAR_STUB_SSL_UPSTREAM = 393,
-     VAR_FORWARD_SSL_UPSTREAM = 394,
-     VAR_TLS_CERT_BUNDLE = 395,
-     VAR_STUB_FIRST = 396,
-     VAR_MINIMAL_RESPONSES = 397,
-     VAR_RRSET_ROUNDROBIN = 398,
-     VAR_MAX_UDP_SIZE = 399,
-     VAR_DELAY_CLOSE = 400,
-     VAR_UNBLOCK_LAN_ZONES = 401,
-     VAR_INSECURE_LAN_ZONES = 402,
-     VAR_INFRA_CACHE_MIN_RTT = 403,
-     VAR_DNS64_PREFIX = 404,
-     VAR_DNS64_SYNTHALL = 405,
-     VAR_DNS64_IGNORE_AAAA = 406,
-     VAR_DNSTAP = 407,
-     VAR_DNSTAP_ENABLE = 408,
-     VAR_DNSTAP_SOCKET_PATH = 409,
-     VAR_DNSTAP_IP = 410,
-     VAR_DNSTAP_TLS = 411,
-     VAR_DNSTAP_TLS_SERVER_NAME = 412,
-     VAR_DNSTAP_TLS_CERT_BUNDLE = 413,
-     VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414,
-     VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415,
-     VAR_DNSTAP_SEND_IDENTITY = 416,
-     VAR_DNSTAP_SEND_VERSION = 417,
-     VAR_DNSTAP_IDENTITY = 418,
-     VAR_DNSTAP_VERSION = 419,
-     VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420,
-     VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421,
-     VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422,
-     VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423,
-     VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424,
-     VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425,
-     VAR_RESPONSE_IP_TAG = 426,
-     VAR_RESPONSE_IP = 427,
-     VAR_RESPONSE_IP_DATA = 428,
-     VAR_HARDEN_ALGO_DOWNGRADE = 429,
-     VAR_IP_TRANSPARENT = 430,
-     VAR_IP_DSCP = 431,
-     VAR_DISABLE_DNSSEC_LAME_CHECK = 432,
-     VAR_IP_RATELIMIT = 433,
-     VAR_IP_RATELIMIT_SLABS = 434,
-     VAR_IP_RATELIMIT_SIZE = 435,
-     VAR_RATELIMIT = 436,
-     VAR_RATELIMIT_SLABS = 437,
-     VAR_RATELIMIT_SIZE = 438,
-     VAR_RATELIMIT_FOR_DOMAIN = 439,
-     VAR_RATELIMIT_BELOW_DOMAIN = 440,
-     VAR_IP_RATELIMIT_FACTOR = 441,
-     VAR_RATELIMIT_FACTOR = 442,
-     VAR_SEND_CLIENT_SUBNET = 443,
-     VAR_CLIENT_SUBNET_ZONE = 444,
-     VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445,
-     VAR_CLIENT_SUBNET_OPCODE = 446,
-     VAR_MAX_CLIENT_SUBNET_IPV4 = 447,
-     VAR_MAX_CLIENT_SUBNET_IPV6 = 448,
-     VAR_MIN_CLIENT_SUBNET_IPV4 = 449,
-     VAR_MIN_CLIENT_SUBNET_IPV6 = 450,
-     VAR_MAX_ECS_TREE_SIZE_IPV4 = 451,
-     VAR_MAX_ECS_TREE_SIZE_IPV6 = 452,
-     VAR_CAPS_WHITELIST = 453,
-     VAR_CACHE_MAX_NEGATIVE_TTL = 454,
-     VAR_PERMIT_SMALL_HOLDDOWN = 455,
-     VAR_QNAME_MINIMISATION = 456,
-     VAR_QNAME_MINIMISATION_STRICT = 457,
-     VAR_IP_FREEBIND = 458,
-     VAR_DEFINE_TAG = 459,
-     VAR_LOCAL_ZONE_TAG = 460,
-     VAR_ACCESS_CONTROL_TAG = 461,
-     VAR_LOCAL_ZONE_OVERRIDE = 462,
-     VAR_ACCESS_CONTROL_TAG_ACTION = 463,
-     VAR_ACCESS_CONTROL_TAG_DATA = 464,
-     VAR_VIEW = 465,
-     VAR_ACCESS_CONTROL_VIEW = 466,
-     VAR_VIEW_FIRST = 467,
-     VAR_SERVE_EXPIRED = 468,
-     VAR_SERVE_EXPIRED_TTL = 469,
-     VAR_SERVE_EXPIRED_TTL_RESET = 470,
-     VAR_SERVE_EXPIRED_REPLY_TTL = 471,
-     VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472,
-     VAR_FAKE_DSA = 473,
-     VAR_FAKE_SHA1 = 474,
-     VAR_LOG_IDENTITY = 475,
-     VAR_HIDE_TRUSTANCHOR = 476,
-     VAR_TRUST_ANCHOR_SIGNALING = 477,
-     VAR_AGGRESSIVE_NSEC = 478,
-     VAR_USE_SYSTEMD = 479,
-     VAR_SHM_ENABLE = 480,
-     VAR_SHM_KEY = 481,
-     VAR_ROOT_KEY_SENTINEL = 482,
-     VAR_DNSCRYPT = 483,
-     VAR_DNSCRYPT_ENABLE = 484,
-     VAR_DNSCRYPT_PORT = 485,
-     VAR_DNSCRYPT_PROVIDER = 486,
-     VAR_DNSCRYPT_SECRET_KEY = 487,
-     VAR_DNSCRYPT_PROVIDER_CERT = 488,
-     VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 489,
-     VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 490,
-     VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 491,
-     VAR_DNSCRYPT_NONCE_CACHE_SIZE = 492,
-     VAR_DNSCRYPT_NONCE_CACHE_SLABS = 493,
-     VAR_IPSECMOD_ENABLED = 494,
-     VAR_IPSECMOD_HOOK = 495,
-     VAR_IPSECMOD_IGNORE_BOGUS = 496,
-     VAR_IPSECMOD_MAX_TTL = 497,
-     VAR_IPSECMOD_WHITELIST = 498,
-     VAR_IPSECMOD_STRICT = 499,
-     VAR_CACHEDB = 500,
-     VAR_CACHEDB_BACKEND = 501,
-     VAR_CACHEDB_SECRETSEED = 502,
-     VAR_CACHEDB_REDISHOST = 503,
-     VAR_CACHEDB_REDISPORT = 504,
-     VAR_CACHEDB_REDISTIMEOUT = 505,
-     VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 506,
-     VAR_FOR_UPSTREAM = 507,
-     VAR_AUTH_ZONE = 508,
-     VAR_ZONEFILE = 509,
-     VAR_MASTER = 510,
-     VAR_URL = 511,
-     VAR_FOR_DOWNSTREAM = 512,
-     VAR_FALLBACK_ENABLED = 513,
-     VAR_TLS_ADDITIONAL_PORT = 514,
-     VAR_LOW_RTT = 515,
-     VAR_LOW_RTT_PERMIL = 516,
-     VAR_FAST_SERVER_PERMIL = 517,
-     VAR_FAST_SERVER_NUM = 518,
-     VAR_ALLOW_NOTIFY = 519,
-     VAR_TLS_WIN_CERT = 520,
-     VAR_TCP_CONNECTION_LIMIT = 521,
-     VAR_FORWARD_NO_CACHE = 522,
-     VAR_STUB_NO_CACHE = 523,
-     VAR_LOG_SERVFAIL = 524,
-     VAR_DENY_ANY = 525,
-     VAR_UNKNOWN_SERVER_TIME_LIMIT = 526,
-     VAR_LOG_TAG_QUERYREPLY = 527,
-     VAR_STREAM_WAIT_SIZE = 528,
-     VAR_TLS_CIPHERS = 529,
-     VAR_TLS_CIPHERSUITES = 530,
-     VAR_IPSET = 531,
-     VAR_IPSET_NAME_V4 = 532,
-     VAR_IPSET_NAME_V6 = 533,
-     VAR_TLS_SESSION_TICKET_KEYS = 534,
-     VAR_RPZ = 535,
-     VAR_TAGS = 536,
-     VAR_RPZ_ACTION_OVERRIDE = 537,
-     VAR_RPZ_CNAME_OVERRIDE = 538,
-     VAR_RPZ_LOG = 539,
-     VAR_RPZ_LOG_NAME = 540
-   };
+  enum yytokentype
+  {
+    SPACE = 258,
+    LETTER = 259,
+    NEWLINE = 260,
+    COMMENT = 261,
+    COLON = 262,
+    ANY = 263,
+    ZONESTR = 264,
+    STRING_ARG = 265,
+    VAR_SERVER = 266,
+    VAR_VERBOSITY = 267,
+    VAR_NUM_THREADS = 268,
+    VAR_PORT = 269,
+    VAR_OUTGOING_RANGE = 270,
+    VAR_INTERFACE = 271,
+    VAR_PREFER_IP4 = 272,
+    VAR_DO_IP4 = 273,
+    VAR_DO_IP6 = 274,
+    VAR_PREFER_IP6 = 275,
+    VAR_DO_UDP = 276,
+    VAR_DO_TCP = 277,
+    VAR_TCP_MSS = 278,
+    VAR_OUTGOING_TCP_MSS = 279,
+    VAR_TCP_IDLE_TIMEOUT = 280,
+    VAR_EDNS_TCP_KEEPALIVE = 281,
+    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282,
+    VAR_CHROOT = 283,
+    VAR_USERNAME = 284,
+    VAR_DIRECTORY = 285,
+    VAR_LOGFILE = 286,
+    VAR_PIDFILE = 287,
+    VAR_MSG_CACHE_SIZE = 288,
+    VAR_MSG_CACHE_SLABS = 289,
+    VAR_NUM_QUERIES_PER_THREAD = 290,
+    VAR_RRSET_CACHE_SIZE = 291,
+    VAR_RRSET_CACHE_SLABS = 292,
+    VAR_OUTGOING_NUM_TCP = 293,
+    VAR_INFRA_HOST_TTL = 294,
+    VAR_INFRA_LAME_TTL = 295,
+    VAR_INFRA_CACHE_SLABS = 296,
+    VAR_INFRA_CACHE_NUMHOSTS = 297,
+    VAR_INFRA_CACHE_LAME_SIZE = 298,
+    VAR_NAME = 299,
+    VAR_STUB_ZONE = 300,
+    VAR_STUB_HOST = 301,
+    VAR_STUB_ADDR = 302,
+    VAR_TARGET_FETCH_POLICY = 303,
+    VAR_HARDEN_SHORT_BUFSIZE = 304,
+    VAR_HARDEN_LARGE_QUERIES = 305,
+    VAR_FORWARD_ZONE = 306,
+    VAR_FORWARD_HOST = 307,
+    VAR_FORWARD_ADDR = 308,
+    VAR_DO_NOT_QUERY_ADDRESS = 309,
+    VAR_HIDE_IDENTITY = 310,
+    VAR_HIDE_VERSION = 311,
+    VAR_IDENTITY = 312,
+    VAR_VERSION = 313,
+    VAR_HARDEN_GLUE = 314,
+    VAR_MODULE_CONF = 315,
+    VAR_TRUST_ANCHOR_FILE = 316,
+    VAR_TRUST_ANCHOR = 317,
+    VAR_VAL_OVERRIDE_DATE = 318,
+    VAR_BOGUS_TTL = 319,
+    VAR_VAL_CLEAN_ADDITIONAL = 320,
+    VAR_VAL_PERMISSIVE_MODE = 321,
+    VAR_INCOMING_NUM_TCP = 322,
+    VAR_MSG_BUFFER_SIZE = 323,
+    VAR_KEY_CACHE_SIZE = 324,
+    VAR_KEY_CACHE_SLABS = 325,
+    VAR_TRUSTED_KEYS_FILE = 326,
+    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327,
+    VAR_USE_SYSLOG = 328,
+    VAR_OUTGOING_INTERFACE = 329,
+    VAR_ROOT_HINTS = 330,
+    VAR_DO_NOT_QUERY_LOCALHOST = 331,
+    VAR_CACHE_MAX_TTL = 332,
+    VAR_HARDEN_DNSSEC_STRIPPED = 333,
+    VAR_ACCESS_CONTROL = 334,
+    VAR_LOCAL_ZONE = 335,
+    VAR_LOCAL_DATA = 336,
+    VAR_INTERFACE_AUTOMATIC = 337,
+    VAR_STATISTICS_INTERVAL = 338,
+    VAR_DO_DAEMONIZE = 339,
+    VAR_USE_CAPS_FOR_ID = 340,
+    VAR_STATISTICS_CUMULATIVE = 341,
+    VAR_OUTGOING_PORT_PERMIT = 342,
+    VAR_OUTGOING_PORT_AVOID = 343,
+    VAR_DLV_ANCHOR_FILE = 344,
+    VAR_DLV_ANCHOR = 345,
+    VAR_NEG_CACHE_SIZE = 346,
+    VAR_HARDEN_REFERRAL_PATH = 347,
+    VAR_PRIVATE_ADDRESS = 348,
+    VAR_PRIVATE_DOMAIN = 349,
+    VAR_REMOTE_CONTROL = 350,
+    VAR_CONTROL_ENABLE = 351,
+    VAR_CONTROL_INTERFACE = 352,
+    VAR_CONTROL_PORT = 353,
+    VAR_SERVER_KEY_FILE = 354,
+    VAR_SERVER_CERT_FILE = 355,
+    VAR_CONTROL_KEY_FILE = 356,
+    VAR_CONTROL_CERT_FILE = 357,
+    VAR_CONTROL_USE_CERT = 358,
+    VAR_EXTENDED_STATISTICS = 359,
+    VAR_LOCAL_DATA_PTR = 360,
+    VAR_JOSTLE_TIMEOUT = 361,
+    VAR_STUB_PRIME = 362,
+    VAR_UNWANTED_REPLY_THRESHOLD = 363,
+    VAR_LOG_TIME_ASCII = 364,
+    VAR_DOMAIN_INSECURE = 365,
+    VAR_PYTHON = 366,
+    VAR_PYTHON_SCRIPT = 367,
+    VAR_VAL_SIG_SKEW_MIN = 368,
+    VAR_VAL_SIG_SKEW_MAX = 369,
+    VAR_CACHE_MIN_TTL = 370,
+    VAR_VAL_LOG_LEVEL = 371,
+    VAR_AUTO_TRUST_ANCHOR_FILE = 372,
+    VAR_KEEP_MISSING = 373,
+    VAR_ADD_HOLDDOWN = 374,
+    VAR_DEL_HOLDDOWN = 375,
+    VAR_SO_RCVBUF = 376,
+    VAR_EDNS_BUFFER_SIZE = 377,
+    VAR_PREFETCH = 378,
+    VAR_PREFETCH_KEY = 379,
+    VAR_SO_SNDBUF = 380,
+    VAR_SO_REUSEPORT = 381,
+    VAR_HARDEN_BELOW_NXDOMAIN = 382,
+    VAR_IGNORE_CD_FLAG = 383,
+    VAR_LOG_QUERIES = 384,
+    VAR_LOG_REPLIES = 385,
+    VAR_LOG_LOCAL_ACTIONS = 386,
+    VAR_TCP_UPSTREAM = 387,
+    VAR_SSL_UPSTREAM = 388,
+    VAR_SSL_SERVICE_KEY = 389,
+    VAR_SSL_SERVICE_PEM = 390,
+    VAR_SSL_PORT = 391,
+    VAR_FORWARD_FIRST = 392,
+    VAR_STUB_SSL_UPSTREAM = 393,
+    VAR_FORWARD_SSL_UPSTREAM = 394,
+    VAR_TLS_CERT_BUNDLE = 395,
+    VAR_STUB_FIRST = 396,
+    VAR_MINIMAL_RESPONSES = 397,
+    VAR_RRSET_ROUNDROBIN = 398,
+    VAR_MAX_UDP_SIZE = 399,
+    VAR_DELAY_CLOSE = 400,
+    VAR_UNBLOCK_LAN_ZONES = 401,
+    VAR_INSECURE_LAN_ZONES = 402,
+    VAR_INFRA_CACHE_MIN_RTT = 403,
+    VAR_DNS64_PREFIX = 404,
+    VAR_DNS64_SYNTHALL = 405,
+    VAR_DNS64_IGNORE_AAAA = 406,
+    VAR_DNSTAP = 407,
+    VAR_DNSTAP_ENABLE = 408,
+    VAR_DNSTAP_SOCKET_PATH = 409,
+    VAR_DNSTAP_IP = 410,
+    VAR_DNSTAP_TLS = 411,
+    VAR_DNSTAP_TLS_SERVER_NAME = 412,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 413,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415,
+    VAR_DNSTAP_SEND_IDENTITY = 416,
+    VAR_DNSTAP_SEND_VERSION = 417,
+    VAR_DNSTAP_IDENTITY = 418,
+    VAR_DNSTAP_VERSION = 419,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425,
+    VAR_RESPONSE_IP_TAG = 426,
+    VAR_RESPONSE_IP = 427,
+    VAR_RESPONSE_IP_DATA = 428,
+    VAR_HARDEN_ALGO_DOWNGRADE = 429,
+    VAR_IP_TRANSPARENT = 430,
+    VAR_IP_DSCP = 431,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 432,
+    VAR_IP_RATELIMIT = 433,
+    VAR_IP_RATELIMIT_SLABS = 434,
+    VAR_IP_RATELIMIT_SIZE = 435,
+    VAR_RATELIMIT = 436,
+    VAR_RATELIMIT_SLABS = 437,
+    VAR_RATELIMIT_SIZE = 438,
+    VAR_RATELIMIT_FOR_DOMAIN = 439,
+    VAR_RATELIMIT_BELOW_DOMAIN = 440,
+    VAR_IP_RATELIMIT_FACTOR = 441,
+    VAR_RATELIMIT_FACTOR = 442,
+    VAR_SEND_CLIENT_SUBNET = 443,
+    VAR_CLIENT_SUBNET_ZONE = 444,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445,
+    VAR_CLIENT_SUBNET_OPCODE = 446,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 447,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 448,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 449,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 450,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 451,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 452,
+    VAR_CAPS_WHITELIST = 453,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 454,
+    VAR_PERMIT_SMALL_HOLDDOWN = 455,
+    VAR_QNAME_MINIMISATION = 456,
+    VAR_QNAME_MINIMISATION_STRICT = 457,
+    VAR_IP_FREEBIND = 458,
+    VAR_DEFINE_TAG = 459,
+    VAR_LOCAL_ZONE_TAG = 460,
+    VAR_ACCESS_CONTROL_TAG = 461,
+    VAR_LOCAL_ZONE_OVERRIDE = 462,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 463,
+    VAR_ACCESS_CONTROL_TAG_DATA = 464,
+    VAR_VIEW = 465,
+    VAR_ACCESS_CONTROL_VIEW = 466,
+    VAR_VIEW_FIRST = 467,
+    VAR_SERVE_EXPIRED = 468,
+    VAR_SERVE_EXPIRED_TTL = 469,
+    VAR_SERVE_EXPIRED_TTL_RESET = 470,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 471,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472,
+    VAR_FAKE_DSA = 473,
+    VAR_FAKE_SHA1 = 474,
+    VAR_LOG_IDENTITY = 475,
+    VAR_HIDE_TRUSTANCHOR = 476,
+    VAR_TRUST_ANCHOR_SIGNALING = 477,
+    VAR_AGGRESSIVE_NSEC = 478,
+    VAR_USE_SYSTEMD = 479,
+    VAR_SHM_ENABLE = 480,
+    VAR_SHM_KEY = 481,
+    VAR_ROOT_KEY_SENTINEL = 482,
+    VAR_DNSCRYPT = 483,
+    VAR_DNSCRYPT_ENABLE = 484,
+    VAR_DNSCRYPT_PORT = 485,
+    VAR_DNSCRYPT_PROVIDER = 486,
+    VAR_DNSCRYPT_SECRET_KEY = 487,
+    VAR_DNSCRYPT_PROVIDER_CERT = 488,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 489,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 490,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 491,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 492,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 493,
+    VAR_IPSECMOD_ENABLED = 494,
+    VAR_IPSECMOD_HOOK = 495,
+    VAR_IPSECMOD_IGNORE_BOGUS = 496,
+    VAR_IPSECMOD_MAX_TTL = 497,
+    VAR_IPSECMOD_WHITELIST = 498,
+    VAR_IPSECMOD_STRICT = 499,
+    VAR_CACHEDB = 500,
+    VAR_CACHEDB_BACKEND = 501,
+    VAR_CACHEDB_SECRETSEED = 502,
+    VAR_CACHEDB_REDISHOST = 503,
+    VAR_CACHEDB_REDISPORT = 504,
+    VAR_CACHEDB_REDISTIMEOUT = 505,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 506,
+    VAR_FOR_UPSTREAM = 507,
+    VAR_AUTH_ZONE = 508,
+    VAR_ZONEFILE = 509,
+    VAR_MASTER = 510,
+    VAR_URL = 511,
+    VAR_FOR_DOWNSTREAM = 512,
+    VAR_FALLBACK_ENABLED = 513,
+    VAR_TLS_ADDITIONAL_PORT = 514,
+    VAR_LOW_RTT = 515,
+    VAR_LOW_RTT_PERMIL = 516,
+    VAR_FAST_SERVER_PERMIL = 517,
+    VAR_FAST_SERVER_NUM = 518,
+    VAR_ALLOW_NOTIFY = 519,
+    VAR_TLS_WIN_CERT = 520,
+    VAR_TCP_CONNECTION_LIMIT = 521,
+    VAR_FORWARD_NO_CACHE = 522,
+    VAR_STUB_NO_CACHE = 523,
+    VAR_LOG_SERVFAIL = 524,
+    VAR_DENY_ANY = 525,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 526,
+    VAR_LOG_TAG_QUERYREPLY = 527,
+    VAR_STREAM_WAIT_SIZE = 528,
+    VAR_TLS_CIPHERS = 529,
+    VAR_TLS_CIPHERSUITES = 530,
+    VAR_IPSET = 531,
+    VAR_IPSET_NAME_V4 = 532,
+    VAR_IPSET_NAME_V6 = 533,
+    VAR_TLS_SESSION_TICKET_KEYS = 534,
+    VAR_RPZ = 535,
+    VAR_TAGS = 536,
+    VAR_RPZ_ACTION_OVERRIDE = 537,
+    VAR_RPZ_CNAME_OVERRIDE = 538,
+    VAR_RPZ_LOG = 539,
+    VAR_RPZ_LOG_NAME = 540
+  };
 #endif
 /* Tokens.  */
 #define SPACE 258
@@ -636,79 +704,30 @@
 #define VAR_RPZ_LOG 539
 #define VAR_RPZ_LOG_NAME 540
 
-
-
-
-/* Copy the first part of user declarations.  */
-#line 38 "./util/configparser.y"
-
-#include "config.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "util/configyyrename.h"
-#include "util/config_file.h"
-#include "util/net_help.h"
-
-int ub_c_lex(void);
-void ub_c_error(const char *message);
-
-static void validate_respip_action(const char* action);
-
-/* these need to be global, otherwise they cannot be used inside yacc */
-extern struct config_parser_state* cfg_parser;
-
-#if 0
-#define OUTYY(s)  printf s /* used ONLY when debugging */
-#else
-#define OUTYY(s)
-#endif
-
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 66 "./util/configparser.y"
+union YYSTYPE
 {
+#line 66 "./util/configparser.y"
+
        char*   str;
-}
-/* Line 193 of yacc.c.  */
-#line 699 "util/configparser.c"
-       YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 716 "util/configparser.c"
+
+};
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
 
+extern YYSTYPE yylval;
+
+int yyparse (void);
 
-/* Copy the second part of user declarations.  */
+#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */
 
 
-/* Line 216 of yacc.c.  */
-#line 712 "util/configparser.c"
 
 #ifdef short
 # undef short
@@ -722,23 +741,20 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short int yytype_int16;
+typedef short yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -746,12 +762,11 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned int
+#  define YYSIZE_T unsigned
 # endif
 #endif
 
@@ -761,38 +776,60 @@ 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
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#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)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-static int
-YYID (i)
-    int i;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return i;
-}
+#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
+
+
+#define YY_ASSERT(E) ((void) (0 && (E)))
 
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
@@ -811,11 +848,11 @@ YYID (i)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -823,8 +860,8 @@ YYID (i)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -838,25 +875,23 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-            && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -866,14 +901,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-        || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -884,42 +919,46 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)             \
-      do                                       \
-       {                                       \
-         YYSIZE_T yyi;                         \
-         for (yyi = 0; yyi < (Count); yyi++)   \
-           (To)[yyi] = (From)[yyi];            \
-       }                                       \
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)                                       \
-    do                                                                 \
-      {                                                                        \
-       YYSIZE_T yynewbytes;                                            \
-       YYCOPY (&yyptr->Stack, Stack, yysize);                          \
-       Stack = &yyptr->Stack;                                          \
-       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-       yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                        \
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
@@ -931,17 +970,19 @@ union yyalloc
 #define YYNNTS  309
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  596
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  887
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   540
 
-#define YYTRANSLATE(YYX)                                               \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, with out-of-bounds checking.  */
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex.  */
 static const yytype_uint16 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1002,228 +1043,7 @@ static const yytype_uint16 yytranslate[] =
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     4,     7,    10,    13,    16,    19,    22,
-      25,    28,    31,    34,    37,    40,    43,    45,    48,    49,
-      51,    53,    55,    57,    59,    61,    63,    65,    67,    69,
-      71,    73,    75,    77,    79,    81,    83,    85,    87,    89,
-      91,    93,    95,    97,    99,   101,   103,   105,   107,   109,
-     111,   113,   115,   117,   119,   121,   123,   125,   127,   129,
-     131,   133,   135,   137,   139,   141,   143,   145,   147,   149,
-     151,   153,   155,   157,   159,   161,   163,   165,   167,   169,
-     171,   173,   175,   177,   179,   181,   183,   185,   187,   189,
-     191,   193,   195,   197,   199,   201,   203,   205,   207,   209,
-     211,   213,   215,   217,   219,   221,   223,   225,   227,   229,
-     231,   233,   235,   237,   239,   241,   243,   245,   247,   249,
-     251,   253,   255,   257,   259,   261,   263,   265,   267,   269,
-     271,   273,   275,   277,   279,   281,   283,   285,   287,   289,
-     291,   293,   295,   297,   299,   301,   303,   305,   307,   309,
-     311,   313,   315,   317,   319,   321,   323,   325,   327,   329,
-     331,   333,   335,   337,   339,   341,   343,   345,   347,   349,
-     351,   353,   355,   357,   359,   361,   363,   365,   367,   369,
-     371,   373,   375,   377,   379,   381,   383,   385,   387,   389,
-     391,   393,   395,   397,   399,   401,   403,   405,   407,   409,
-     411,   413,   415,   417,   419,   421,   423,   425,   427,   429,
-     431,   433,   435,   437,   440,   441,   443,   445,   447,   449,
-     451,   453,   455,   457,   460,   461,   463,   465,   467,   469,
-     471,   473,   475,   478,   479,   481,   483,   485,   487,   489,
-     491,   493,   495,   498,   499,   501,   503,   505,   507,   509,
-     511,   513,   515,   518,   521,   524,   527,   530,   532,   535,
-     536,   538,   540,   542,   544,   546,   548,   550,   552,   554,
-     556,   559,   562,   565,   568,   571,   574,   577,   580,   583,
-     586,   589,   592,   595,   598,   601,   604,   607,   610,   613,
-     616,   619,   622,   625,   628,   631,   634,   637,   640,   643,
-     646,   649,   652,   655,   658,   661,   664,   667,   670,   673,
-     676,   679,   682,   685,   688,   691,   694,   697,   700,   703,
-     706,   709,   712,   715,   718,   721,   724,   727,   730,   733,
-     736,   739,   742,   745,   748,   751,   754,   757,   760,   763,
-     766,   769,   772,   775,   778,   781,   784,   787,   790,   793,
-     796,   799,   802,   805,   808,   811,   814,   817,   820,   823,
-     826,   829,   832,   835,   838,   841,   844,   847,   850,   853,
-     856,   859,   862,   865,   868,   871,   874,   877,   880,   883,
-     886,   889,   892,   895,   898,   901,   904,   907,   910,   913,
-     916,   920,   923,   926,   929,   932,   935,   938,   941,   944,
-     947,   950,   953,   956,   959,   962,   965,   968,   971,   974,
-     977,   980,   983,   986,   989,   992,   995,   998,  1001,  1004,
-    1008,  1011,  1014,  1017,  1020,  1023,  1026,  1029,  1032,  1035,
-    1038,  1042,  1046,  1051,  1056,  1061,  1065,  1069,  1072,  1075,
-    1078,  1081,  1084,  1087,  1091,  1095,  1098,  1101,  1104,  1107,
-    1110,  1113,  1116,  1119,  1122,  1125,  1128,  1131,  1134,  1137,
-    1140,  1143,  1146,  1149,  1152,  1155,  1158,  1161,  1164,  1167,
-    1170,  1173,  1176,  1179,  1182,  1185,  1188,  1191,  1194,  1197,
-    1200,  1204,  1208,  1212,  1215,  1218,  1221,  1223,  1226,  1227,
-    1229,  1231,  1233,  1235,  1237,  1239,  1241,  1243,  1246,  1249,
-    1252,  1255,  1258,  1261,  1264,  1267,  1269,  1272,  1273,  1275,
-    1277,  1279,  1281,  1283,  1285,  1287,  1289,  1291,  1293,  1295,
-    1297,  1299,  1301,  1303,  1305,  1307,  1309,  1312,  1315,  1318,
-    1321,  1324,  1327,  1330,  1333,  1336,  1339,  1342,  1345,  1348,
-    1351,  1354,  1357,  1360,  1363,  1365,  1368,  1369,  1371,  1374,
-    1377,  1380,  1384,  1388,  1390,  1393,  1394,  1396,  1398,  1400,
-    1402,  1404,  1406,  1408,  1410,  1412,  1414,  1417,  1420,  1423,
-    1426,  1429,  1432,  1435,  1438,  1441,  1444,  1446,  1449,  1450,
-    1452,  1454,  1456,  1458,  1460,  1463,  1466,  1469,  1472,  1475,
-    1479,  1481,  1484,  1485,  1487,  1489,  1492
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     287,     0,    -1,    -1,   287,   288,    -1,   289,   290,    -1,
-     292,   293,    -1,   295,   296,    -1,   560,   561,    -1,   528,
-     529,    -1,   539,   540,    -1,   298,   299,    -1,   568,   569,
-      -1,   581,   582,    -1,   590,   591,    -1,   301,   302,    -1,
-     309,   310,    -1,    11,    -1,   290,   291,    -1,    -1,   312,
-      -1,   313,    -1,   319,    -1,   332,    -1,   338,    -1,   339,
-      -1,   342,    -1,   343,    -1,   340,    -1,   341,    -1,   344,
-      -1,   345,    -1,   346,    -1,   347,    -1,   348,    -1,   330,
-      -1,   370,    -1,   371,    -1,   372,    -1,   373,    -1,   374,
-      -1,   399,    -1,   400,    -1,   401,    -1,   406,    -1,   407,
-      -1,   335,    -1,   408,    -1,   409,    -1,   412,    -1,   410,
-      -1,   411,    -1,   414,    -1,   415,    -1,   416,    -1,   430,
-      -1,   385,    -1,   386,    -1,   388,    -1,   389,    -1,   417,
-      -1,   433,    -1,   379,    -1,   381,    -1,   434,    -1,   440,
-      -1,   441,    -1,   442,    -1,   336,    -1,   398,    -1,   458,
-      -1,   459,    -1,   380,    -1,   453,    -1,   363,    -1,   331,
-      -1,   375,    -1,   431,    -1,   437,    -1,   418,    -1,   432,
-      -1,   461,    -1,   462,    -1,   337,    -1,   314,    -1,   362,
-      -1,   422,    -1,   315,    -1,   333,    -1,   334,    -1,   376,
-      -1,   377,    -1,   460,    -1,   420,    -1,   424,    -1,   425,
-      -1,   316,    -1,   463,    -1,   402,    -1,   429,    -1,   364,
-      -1,   384,    -1,   435,    -1,   436,    -1,   439,    -1,   452,
-      -1,   378,    -1,   454,    -1,   455,    -1,   456,    -1,   390,
-      -1,   397,    -1,   426,    -1,   427,    -1,   391,    -1,   419,
-      -1,   444,    -1,   365,    -1,   366,    -1,   349,    -1,   351,
-      -1,   369,    -1,   352,    -1,   353,    -1,   354,    -1,   464,
-      -1,   465,    -1,   467,    -1,   392,    -1,   403,    -1,   404,
-      -1,   405,    -1,   468,    -1,   469,    -1,   470,    -1,   413,
-      -1,   421,    -1,   393,    -1,   479,    -1,   480,    -1,   395,
-      -1,   483,    -1,   484,    -1,   481,    -1,   482,    -1,   485,
-      -1,   486,    -1,   488,    -1,   487,    -1,   320,    -1,   321,
-      -1,   322,    -1,   323,    -1,   324,    -1,   325,    -1,   326,
-      -1,   327,    -1,   328,    -1,   329,    -1,   423,    -1,   438,
-      -1,   457,    -1,   492,    -1,   394,    -1,   471,    -1,   472,
-      -1,   564,    -1,   473,    -1,   476,    -1,   474,    -1,   475,
-      -1,   477,    -1,   493,    -1,   445,    -1,   446,    -1,   447,
-      -1,   448,    -1,   449,    -1,   450,    -1,   565,    -1,   361,
-      -1,   478,    -1,   566,    -1,   567,    -1,   317,    -1,   318,
-      -1,   451,    -1,   387,    -1,   382,    -1,   383,    -1,   494,
-      -1,   496,    -1,   495,    -1,   497,    -1,   498,    -1,   499,
-      -1,   350,    -1,   443,    -1,   355,    -1,   357,    -1,   489,
-      -1,   491,    -1,   490,    -1,   356,    -1,   589,    -1,   368,
-      -1,   428,    -1,   466,    -1,   367,    -1,   396,    -1,   358,
-      -1,   359,    -1,   360,    -1,    45,    -1,   293,   294,    -1,
-      -1,   500,    -1,   501,    -1,   502,    -1,   506,    -1,   503,
-      -1,   504,    -1,   505,    -1,    51,    -1,   296,   297,    -1,
-      -1,   507,    -1,   508,    -1,   509,    -1,   510,    -1,   511,
-      -1,   512,    -1,   210,    -1,   299,   300,    -1,    -1,   521,
-      -1,   522,    -1,   525,    -1,   527,    -1,   523,    -1,   524,
-      -1,   526,    -1,   253,    -1,   302,   303,    -1,    -1,   513,
-      -1,   514,    -1,   515,    -1,   516,    -1,   518,    -1,   519,
-      -1,   520,    -1,   517,    -1,   281,    10,    -1,   282,    10,
-      -1,   283,    10,    -1,   284,    10,    -1,   285,    10,    -1,
-     280,    -1,   310,   311,    -1,    -1,   513,    -1,   514,    -1,
-     304,    -1,   515,    -1,   516,    -1,   517,    -1,   305,    -1,
-     306,    -1,   307,    -1,   308,    -1,    13,    10,    -1,    12,
-      10,    -1,    83,    10,    -1,    86,    10,    -1,   104,    10,
-      -1,   225,    10,    -1,   226,    10,    -1,    14,    10,    -1,
-     188,    10,    -1,   189,    10,    -1,   190,    10,    -1,   191,
-      10,    -1,   192,    10,    -1,   193,    10,    -1,   194,    10,
-      -1,   195,    10,    -1,   196,    10,    -1,   197,    10,    -1,
-      16,    10,    -1,    74,    10,    -1,    15,    10,    -1,    87,
-      10,    -1,    88,    10,    -1,    38,    10,    -1,    67,    10,
-      -1,    82,    10,    -1,    18,    10,    -1,    19,    10,    -1,
-      21,    10,    -1,    22,    10,    -1,    17,    10,    -1,    20,
-      10,    -1,    23,    10,    -1,    24,    10,    -1,    25,    10,
-      -1,    26,    10,    -1,    27,    10,    -1,   132,    10,    -1,
-     251,    10,    -1,   133,    10,    -1,   134,    10,    -1,   135,
-      10,    -1,   136,    10,    -1,   140,    10,    -1,   265,    10,
-      -1,   259,    10,    -1,   274,    10,    -1,   275,    10,    -1,
-     279,    10,    -1,   224,    10,    -1,    84,    10,    -1,    73,
-      10,    -1,   109,    10,    -1,   129,    10,    -1,   130,    10,
-      -1,   272,    10,    -1,   269,    10,    -1,   131,    10,    -1,
-      28,    10,    -1,    29,    10,    -1,    30,    10,    -1,    31,
-      10,    -1,    32,    10,    -1,    75,    10,    -1,    89,    10,
-      -1,    90,    10,    -1,   117,    10,    -1,    61,    10,    -1,
-      71,    10,    -1,    62,    10,    -1,   222,    10,    -1,   227,
-      10,    -1,   110,    10,    -1,    55,    10,    -1,    56,    10,
-      -1,   221,    10,    -1,    57,    10,    -1,    58,    10,    -1,
-     121,    10,    -1,   125,    10,    -1,   126,    10,    -1,   175,
-      10,    -1,   203,    10,    -1,   176,    10,    -1,   273,    10,
-      -1,   122,    10,    -1,    68,    10,    -1,    33,    10,    -1,
-      34,    10,    -1,    35,    10,    -1,   106,    10,    -1,   145,
-      10,    -1,   146,    10,    -1,   147,    10,    -1,    36,    10,
-      -1,    37,    10,    -1,    39,    10,    -1,    40,    10,    -1,
-      42,    10,    -1,    43,    10,    -1,    41,    10,    -1,   148,
-      10,    -1,    48,    10,    -1,    49,    10,    -1,    50,    10,
-      -1,    59,    10,    -1,    78,    10,    -1,   127,    10,    -1,
-      92,    10,    -1,   174,    10,    -1,    85,    10,    -1,   198,
-      10,    -1,    93,    10,    -1,    94,    10,    -1,   123,    10,
-      -1,   124,    10,    -1,   270,    10,    -1,   108,    10,    -1,
-      54,    10,    -1,    76,    10,    -1,    79,    10,    10,    -1,
-      60,    10,    -1,    63,    10,    -1,   113,    10,    -1,   114,
-      10,    -1,    77,    10,    -1,   199,    10,    -1,   115,    10,
-      -1,    64,    10,    -1,    65,    10,    -1,    66,    10,    -1,
-     223,    10,    -1,   128,    10,    -1,   213,    10,    -1,   214,
-      10,    -1,   215,    10,    -1,   216,    10,    -1,   217,    10,
-      -1,   218,    10,    -1,   219,    10,    -1,   116,    10,    -1,
-      72,    10,    -1,   119,    10,    -1,   120,    10,    -1,   118,
-      10,    -1,   200,    10,    -1,    69,    10,    -1,    70,    10,
-      -1,    91,    10,    -1,    80,    10,    10,    -1,    81,    10,
-      -1,   105,    10,    -1,   142,    10,    -1,   143,    10,    -1,
-     271,    10,    -1,   144,    10,    -1,   149,    10,    -1,   150,
-      10,    -1,   151,    10,    -1,   204,    10,    -1,   205,    10,
-      10,    -1,   206,    10,    10,    -1,   208,    10,    10,    10,
-      -1,   209,    10,    10,    10,    -1,   207,    10,    10,    10,
-      -1,   211,    10,    10,    -1,   171,    10,    10,    -1,   178,
-      10,    -1,   181,    10,    -1,   180,    10,    -1,   183,    10,
-      -1,   179,    10,    -1,   182,    10,    -1,   184,    10,    10,
-      -1,   185,    10,    10,    -1,   186,    10,    -1,   187,    10,
-      -1,   260,    10,    -1,   263,    10,    -1,   262,    10,    -1,
-     201,    10,    -1,   202,    10,    -1,   239,    10,    -1,   241,
-      10,    -1,   240,    10,    -1,   242,    10,    -1,   243,    10,
-      -1,   244,    10,    -1,    44,    10,    -1,    46,    10,    -1,
-      47,    10,    -1,   141,    10,    -1,   268,    10,    -1,   138,
-      10,    -1,   107,    10,    -1,    44,    10,    -1,    52,    10,
-      -1,    53,    10,    -1,   137,    10,    -1,   267,    10,    -1,
-     139,    10,    -1,    44,    10,    -1,   254,    10,    -1,   255,
-      10,    -1,   256,    10,    -1,   264,    10,    -1,   257,    10,
-      -1,   252,    10,    -1,   258,    10,    -1,    44,    10,    -1,
-      80,    10,    10,    -1,   172,    10,    10,    -1,   173,    10,
-      10,    -1,    81,    10,    -1,   105,    10,    -1,   212,    10,
-      -1,    95,    -1,   529,   530,    -1,    -1,   531,    -1,   533,
-      -1,   532,    -1,   535,    -1,   536,    -1,   537,    -1,   538,
-      -1,   534,    -1,    96,    10,    -1,    98,    10,    -1,    97,
-      10,    -1,   103,    10,    -1,    99,    10,    -1,   100,    10,
-      -1,   101,    10,    -1,   102,    10,    -1,   152,    -1,   540,
-     541,    -1,    -1,   542,    -1,   543,    -1,   544,    -1,   545,
-      -1,   546,    -1,   547,    -1,   548,    -1,   549,    -1,   550,
-      -1,   551,    -1,   552,    -1,   553,    -1,   554,    -1,   555,
-      -1,   556,    -1,   557,    -1,   558,    -1,   559,    -1,   153,
-      10,    -1,   154,    10,    -1,   155,    10,    -1,   156,    10,
-      -1,   157,    10,    -1,   158,    10,    -1,   159,    10,    -1,
-     160,    10,    -1,   161,    10,    -1,   162,    10,    -1,   163,
-      10,    -1,   164,    10,    -1,   165,    10,    -1,   166,    10,
-      -1,   167,    10,    -1,   168,    10,    -1,   169,    10,    -1,
-     170,    10,    -1,   111,    -1,   561,   562,    -1,    -1,   563,
-      -1,   112,    10,    -1,   177,    10,    -1,   220,    10,    -1,
-     172,    10,    10,    -1,   173,    10,    10,    -1,   228,    -1,
-     569,   570,    -1,    -1,   571,    -1,   572,    -1,   573,    -1,
-     576,    -1,   574,    -1,   575,    -1,   577,    -1,   578,    -1,
-     579,    -1,   580,    -1,   229,    10,    -1,   230,    10,    -1,
-     231,    10,    -1,   233,    10,    -1,   234,    10,    -1,   232,
-      10,    -1,   235,    10,    -1,   236,    10,    -1,   237,    10,
-      -1,   238,    10,    -1,   245,    -1,   582,   583,    -1,    -1,
-     584,    -1,   585,    -1,   586,    -1,   587,    -1,   588,    -1,
-     246,    10,    -1,   247,    10,    -1,   248,    10,    -1,   249,
-      10,    -1,   250,    10,    -1,   266,    10,    10,    -1,   276,
-      -1,   591,   592,    -1,    -1,   593,    -1,   594,    -1,   277,
-      10,    -1,   278,    10,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   178,   178,   178,   179,   179,   180,   180,   181,   181,
@@ -1289,7 +1109,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -1524,13 +1344,13 @@ static const char *const yytname[] =
   "cachedb_backend_name", "cachedb_secret_seed", "redis_server_host",
   "redis_server_port", "redis_timeout", "server_tcp_connection_limit",
   "ipsetstart", "contents_ipset", "content_ipset", "ipset_name_v4",
-  "ipset_name_v6", 0
+  "ipset_name_v6", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -1565,139 +1385,114 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
-{
-       0,   286,   287,   287,   288,   288,   288,   288,   288,   288,
-     288,   288,   288,   288,   288,   288,   289,   290,   290,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
-     291,   291,   292,   293,   293,   294,   294,   294,   294,   294,
-     294,   294,   295,   296,   296,   297,   297,   297,   297,   297,
-     297,   298,   299,   299,   300,   300,   300,   300,   300,   300,
-     300,   301,   302,   302,   303,   303,   303,   303,   303,   303,
-     303,   303,   304,   305,   306,   307,   308,   309,   310,   310,
-     311,   311,   311,   311,   311,   311,   311,   311,   311,   311,
-     312,   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,   371,
-     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
-     382,   383,   384,   385,   386,   387,   388,   389,   390,   391,
-     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
-     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
-     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,   464,   465,   466,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
-     482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
-     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
-     502,   503,   504,   505,   506,   507,   508,   509,   510,   511,
-     512,   513,   514,   515,   516,   517,   518,   519,   520,   521,
-     522,   523,   524,   525,   526,   527,   528,   529,   529,   530,
-     530,   530,   530,   530,   530,   530,   530,   531,   532,   533,
-     534,   535,   536,   537,   538,   539,   540,   540,   541,   541,
-     541,   541,   541,   541,   541,   541,   541,   541,   541,   541,
-     541,   541,   541,   541,   541,   541,   542,   543,   544,   545,
-     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
-     556,   557,   558,   559,   560,   561,   561,   562,   563,   564,
-     565,   566,   567,   568,   569,   569,   570,   570,   570,   570,
-     570,   570,   570,   570,   570,   570,   571,   572,   573,   574,
-     575,   576,   577,   578,   579,   580,   581,   582,   582,   583,
-     583,   583,   583,   583,   584,   585,   586,   587,   588,   589,
-     590,   591,   591,   592,   592,   593,   594
-};
+#define YYPACT_NINF -270
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-270)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,     2,     0,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     0,     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,
-       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,     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,     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,     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,     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,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     1,     2,     0,
-       1,     1,     1,     1,     1,     1,     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,     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,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       3,     3,     4,     4,     4,     3,     3,     2,     2,     2,
-       2,     2,     2,     3,     3,     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,     3,     3,     2,     2,     2,     1,     2,     0,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     2,     2,     1,     2,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     1,     2,     0,     1,     2,     2,
-       2,     3,     3,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     3,
-       1,     2,     0,     1,     1,     2,     2
+    -270,     0,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,   269,   -42,
+     -37,   -41,   -21,   -43,   -44,   -87,  -106,  -205,  -229,  -269,
+       2,     3,     4,    12,    24,    25,    26,    27,    28,    31,
+      32,    33,    34,    36,    37,    38,    39,    40,    50,    51,
+      52,    53,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    87,    88,    91,    93,    94,    95,    96,
+      97,    98,    99,   100,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   123,   124,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   143,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
+     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,   204,   205,
+     206,   207,   208,   209,   210,   212,   213,   214,   215,   217,
+     219,   222,   234,   236,   237,   238,   239,   240,   241,   242,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   267,   268,   303,   304,   305,   306,   310,   311,
+     312,   354,   355,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,   356,   357,   358,
+     359,   360,   361,   362,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,   366,   370,   371,   396,   397,   398,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,   400,   411,   412,   413,   414,
+     415,   416,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+     417,   418,   419,   420,   421,   422,   423,   424,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,   425,   426,   427,
+     428,   429,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,   469,   471,   487,   488,   489,   490,   491,
+     492,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+     493,   494,   495,   496,   497,   504,   505,   506,   507,   508,
+     509,   511,   512,   513,   514,   515,   516,   517,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,   520,  -270,  -270,
+     523,   526,   527,   535,   536,   537,   539,   540,   541,   542,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,   543,   544,   545,   546,   547,  -270,  -270,  -270,  -270,
+    -270,  -270,   548,   549,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,   550,   551,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,   552,   553,   554,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,   555,   556,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,   557,   558,
+     559,   560,   561,   562,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,   563,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,   564,  -270,  -270,   565,   566,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,   567,   568,   569,  -270,
+    -270,  -270,  -270,  -270,  -270,  -270,  -270
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
        2,     0,     1,    16,   212,   222,   486,   544,   505,   231,
@@ -1791,139 +1586,7 @@ static const yytype_uint16 yydefact[] =
      589,   480,   481,   482,   434,   432,   433
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     1,    15,    16,    28,   233,    17,    29,   434,    18,
-      30,   448,    19,    31,   462,    20,    32,   478,   492,   493,
-     494,   495,   496,    21,    33,   497,   234,   235,   236,   237,
-     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   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,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,   435,   436,   437,   438,   439,   440,
-     441,   449,   450,   451,   452,   453,   454,   479,   480,   481,
-     482,   483,   484,   485,   486,   463,   464,   465,   466,   467,
-     468,   469,    22,    34,   511,   512,   513,   514,   515,   516,
-     517,   518,   519,    23,    35,   538,   539,   540,   541,   542,
-     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
-     553,   554,   555,   556,    24,    36,   558,   559,   422,   423,
-     424,   425,    25,    37,   570,   571,   572,   573,   574,   575,
-     576,   577,   578,   579,   580,    26,    38,   586,   587,   588,
-     589,   590,   591,   426,    27,    39,   594,   595,   596
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -270
-static const yytype_int16 yypact[] =
-{
-    -270,     0,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,   269,   -42,
-     -37,   -41,   -21,   -43,   -44,   -87,  -106,  -205,  -229,  -269,
-       2,     3,     4,    12,    24,    25,    26,    27,    28,    31,
-      32,    33,    34,    36,    37,    38,    39,    40,    50,    51,
-      52,    53,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    87,    88,    91,    93,    94,    95,    96,
-      97,    98,    99,   100,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
-     140,   141,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     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,   204,   205,
-     206,   207,   208,   209,   210,   212,   213,   214,   215,   217,
-     219,   222,   234,   236,   237,   238,   239,   240,   241,   242,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   267,   268,   303,   304,   305,   306,   310,   311,
-     312,   354,   355,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   356,   357,   358,
-     359,   360,   361,   362,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,   366,   370,   371,   396,   397,   398,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,   400,   411,   412,   413,   414,
-     415,   416,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-     417,   418,   419,   420,   421,   422,   423,   424,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   425,   426,   427,
-     428,   429,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,   469,   471,   487,   488,   489,   490,   491,
-     492,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-     493,   494,   495,   496,   497,   504,   505,   506,   507,   508,
-     509,   511,   512,   513,   514,   515,   516,   517,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   520,  -270,  -270,
-     523,   526,   527,   535,   536,   537,   539,   540,   541,   542,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,   543,   544,   545,   546,   547,  -270,  -270,  -270,  -270,
-    -270,  -270,   548,   549,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   550,   551,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,   552,   553,   554,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,   555,   556,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,   557,   558,
-     559,   560,   561,   562,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,   563,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,   564,  -270,  -270,   565,   566,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,   567,   568,   569,  -270,
-    -270,  -270,  -270,  -270,  -270,  -270,  -270
-};
-
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
     -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,
@@ -1959,11 +1622,45 @@ static const yytype_int16 yypgoto[] =
     -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270,  -270
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     1,    15,    16,    28,   233,    17,    29,   434,    18,
+      30,   448,    19,    31,   462,    20,    32,   478,   492,   493,
+     494,   495,   496,    21,    33,   497,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
+     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   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,   371,   372,   373,   374,   375,   376,   377,
+     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
+     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
+     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
+     418,   419,   420,   421,   435,   436,   437,   438,   439,   440,
+     441,   449,   450,   451,   452,   453,   454,   479,   480,   481,
+     482,   483,   484,   485,   486,   463,   464,   465,   466,   467,
+     468,   469,    22,    34,   511,   512,   513,   514,   515,   516,
+     517,   518,   519,    23,    35,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
+     553,   554,   555,   556,    24,    36,   558,   559,   422,   423,
+     424,   425,    25,    37,   570,   571,   572,   573,   574,   575,
+     576,   577,   578,   579,   580,    26,    38,   586,   587,   588,
+     589,   590,   591,   426,    27,    39,   594,   595,   596
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
        2,   470,   427,   455,   428,   429,   557,   442,   592,   593,
@@ -2094,8 +1791,8 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    33,    33,    33,    33
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
        0,   287,     0,    11,    45,    51,    95,   111,   152,   210,
@@ -2189,95 +1886,171 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10
 };
 
-#define yyerrok                (yyerrstatus = 0)
-#define yyclearin      (yychar = YYEMPTY)
-#define YYEMPTY                (-2)
-#define YYEOF          0
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   286,   287,   287,   288,   288,   288,   288,   288,   288,
+     288,   288,   288,   288,   288,   288,   289,   290,   290,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   292,   293,   293,   294,   294,   294,   294,   294,
+     294,   294,   295,   296,   296,   297,   297,   297,   297,   297,
+     297,   298,   299,   299,   300,   300,   300,   300,   300,   300,
+     300,   301,   302,   302,   303,   303,   303,   303,   303,   303,
+     303,   303,   304,   305,   306,   307,   308,   309,   310,   310,
+     311,   311,   311,   311,   311,   311,   311,   311,   311,   311,
+     312,   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,   371,
+     372,   373,   374,   375,   376,   377,   378,   379,   380,   381,
+     382,   383,   384,   385,   386,   387,   388,   389,   390,   391,
+     392,   393,   394,   395,   396,   397,   398,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   409,   410,   411,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,   465,   466,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
+     482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
+     492,   493,   494,   495,   496,   497,   498,   499,   500,   501,
+     502,   503,   504,   505,   506,   507,   508,   509,   510,   511,
+     512,   513,   514,   515,   516,   517,   518,   519,   520,   521,
+     522,   523,   524,   525,   526,   527,   528,   529,   529,   530,
+     530,   530,   530,   530,   530,   530,   530,   531,   532,   533,
+     534,   535,   536,   537,   538,   539,   540,   540,   541,   541,
+     541,   541,   541,   541,   541,   541,   541,   541,   541,   541,
+     541,   541,   541,   541,   541,   541,   542,   543,   544,   545,
+     546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
+     556,   557,   558,   559,   560,   561,   561,   562,   563,   564,
+     565,   566,   567,   568,   569,   569,   570,   570,   570,   570,
+     570,   570,   570,   570,   570,   570,   571,   572,   573,   574,
+     575,   576,   577,   578,   579,   580,   581,   582,   582,   583,
+     583,   583,   583,   583,   584,   585,   586,   587,   588,   589,
+     590,   591,   591,   592,   592,   593,   594
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     0,     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,
+       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,     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,     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,     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,     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,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
+       1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     2,     2,     2,     2,     1,     2,     0,
+       1,     1,     1,     1,     1,     1,     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,     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,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     3,     4,     4,     4,     3,     3,     2,     2,     2,
+       2,     2,     2,     3,     3,     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,     3,     3,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     1,     2,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     1,     2,     0,     1,     2,     2,
+       2,     3,     3,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     3,
+       1,     2,     0,     1,     1,     2,     2
+};
 
-#define YYACCEPT       goto yyacceptlab
-#define YYABORT                goto yyabortlab
-#define YYERROR                goto yyerrorlab
 
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
 
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
-#define YYFAIL         goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                 \
-do                                                             \
-  if (yychar == YYEMPTY && yylen == 1)                         \
-    {                                                          \
-      yychar = (Token);                                                \
-      yylval = (Value);                                                \
-      yytoken = YYTRANSLATE (yychar);                          \
-      YYPOPSTACK (1);                                          \
-      goto yybackup;                                           \
-    }                                                          \
-  else                                                         \
-    {                                                          \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                 \
-    }                                                          \
-while (YYID (0))
-
-
-#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).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#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 YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
 
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                 \
-     fprintf (File, "%d.%d-%d.%d",                     \
-             (Loc).first_line, (Loc).first_column,     \
-             (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -2287,80 +2060,61 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)                       \
-do {                                           \
-  if (yydebug)                                 \
-    YYFPRINTF Args;                            \
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                   \
-do {                                                                     \
-  if (yydebug)                                                           \
-    {                                                                    \
-      YYFPRINTF (stderr, "%s ", Title);                                          \
-      yy_symbol_print (stderr,                                           \
-                 Type, Value); \
-      YYFPRINTF (stderr, "\n");                                                  \
-    }                                                                    \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*-----------------------------------.
+| Print this symbol's value on YYO.  |
+`-----------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
+  FILE *yyoutput = yyo;
+  YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
+    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
-  switch (yytype)
-    {
-      default:
-       break;
-    }
+  YYUSE (yytype);
 }
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO.  |
+`---------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
 static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyo, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
+  yy_symbol_value_print (yyo, yytype, yyvaluep);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -2368,66 +2122,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
-#endif
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                           \
-do {                                                           \
-  if (yydebug)                                                 \
-    yy_stack_print ((Bottom), (Top));                          \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
 static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-            yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                      &(yyvsp[(yyi + 1) - (yynrhs)])
-                                      );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &yyvsp[(yyi + 1) - (yynrhs)]
+                                              );
+      YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)         \
-do {                                   \
-  if (yydebug)                         \
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -2441,7 +2183,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef        YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -2456,7 +2198,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-\f
 
 #if YYERROR_VERBOSE
 
@@ -2465,15 +2206,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -2489,16 +2223,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -2528,242 +2254,245 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-       switch (*++yyp)
-         {
-         case '\'':
-         case ',':
-           goto do_not_strip_quotes;
-
-         case '\\':
-           if (*++yyp != '\\')
-             goto do_not_strip_quotes;
-           /* Fall through.  */
-         default:
-           if (yyres)
-             yyres[yyn] = *yyp;
-           yyn++;
-           break;
-
-         case '"':
-           if (yyres)
-             yyres[yyn] = '\0';
-           return yyn;
-         }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            else
+              goto append;
+
+          append:
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
   if (! yyres)
     return yystrlen (yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
-  int yyn = yypact[yystate];
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+                    yysize = yysize1;
+                  else
+                    return 2;
+                }
+              }
+        }
+    }
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-        constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-                   + sizeof yyexpecting - 1
-                   + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                      * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-        YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-         {
-           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-             {
-               yycount = 1;
-               yysize = yysize0;
-               yyformat[sizeof yyunexpected - 1] = '\0';
-               break;
-             }
-           yyarg[yycount++] = yytname[yyx];
-           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-           yysize_overflow |= (yysize1 < yysize);
-           yysize = yysize1;
-           yyfmt = yystpcpy (yyfmt, yyprefix);
-           yyprefix = yyor;
-         }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+    default: /* Avoid compiler warnings. */
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-       return YYSIZE_MAXIMUM;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+      yysize = yysize1;
+    else
+      return 2;
+  }
 
-      if (yyresult)
-       {
-         /* Avoid sprintf, as that infringes on the user's name space.
-            Don't have undefined behavior even if the translation
-            produced a string with the wrong number of "%s"s.  */
-         char *yyp = yyresult;
-         int yyi = 0;
-         while ((*yyp = *yyf) != '\0')
-           {
-             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-               {
-                 yyp += yytnamerr (yyp, yyarg[yyi++]);
-                 yyf += 2;
-               }
-             else
-               {
-                 yyp++;
-                 yyf++;
-               }
-           }
-       }
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-\f
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-       break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
-\f
-
-/* Prevent warnings from -Wmissing-prototypes.  */
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 
 
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 
-
 /*----------.
 | yyparse.  |
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
-  
-  int yystate;
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
   int yyn;
   int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -2771,156 +2500,127 @@ yyparse ()
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
-
-
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   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;
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
+
 /*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
+| yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
- yynewstate:
+yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate.  |
+`--------------------------------------------------------------------*/
+yysetstate:
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+    goto yyexhaustedlab;
+#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
-#ifdef yyoverflow
+# if defined yyoverflow
       {
-       /* Give user a chance to reallocate the stack.  Use copies of
-          these so that the &'s don't force the real ones into
-          memory.  */
-       YYSTYPE *yyvs1 = yyvs;
-       yytype_int16 *yyss1 = yyss;
-
-
-       /* Each stack pointer address is followed by the size of the
-          data in use in that stack, in bytes.  This used to be a
-          conditional around just the two extra args, but that might
-          be undefined if yyoverflow is a macro.  */
-       yyoverflow (YY_("memory exhausted"),
-                   &yyss1, yysize * sizeof (*yyssp),
-                   &yyvs1, yysize * sizeof (*yyvsp),
-
-                   &yystacksize);
-
-       yyss = yyss1;
-       yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-       goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-       yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-       yytype_int16 *yyss1 = yyss;
-       union yyalloc *yyptr =
-         (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-       if (! yyptr)
-         goto yyexhaustedlab;
-       YYSTACK_RELOCATE (yyss);
-       YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
-       if (yyss1 != yyssa)
-         YYSTACK_FREE (yyss1);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+# undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
-#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                 (unsigned long int) yystacksize));
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-       YYABORT;
+        YYABORT;
     }
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  if (yystate == YYFINAL)
+    YYACCEPT;
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
@@ -2942,30 +2642,27 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-       goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
   goto yynewstate;
 
 
@@ -2980,14 +2677,14 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- Do a reduction.  |
+| yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -3000,11 +2697,12 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 16:
+  case 16:
 #line 189 "./util/configparser.y"
     { 
                OUTYY(("\nP(server:)\n")); 
        }
+#line 2706 "util/configparser.c"
     break;
 
   case 212:
@@ -3019,6 +2717,7 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
+#line 2721 "util/configparser.c"
     break;
 
   case 222:
@@ -3033,6 +2732,7 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
+#line 2736 "util/configparser.c"
     break;
 
   case 231:
@@ -3049,6 +2749,7 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
+#line 2753 "util/configparser.c"
     break;
 
   case 241:
@@ -3068,6 +2769,7 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
+#line 2773 "util/configparser.c"
     break;
 
   case 252:
@@ -3075,10 +2777,10 @@ yyreduce:
     {
                uint8_t* bitlist;
                size_t len = 0;
-               OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[(2) - (2)].str)));
-               bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[(2) - (2)].str),
+               OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str)));
+               bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
                        &len);
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
                if(!bitlist) {
                        yyerror("could not parse tags, (define-tag them first)");
                }
@@ -3088,53 +2790,58 @@ yyreduce:
 
                }
        }
+#line 2794 "util/configparser.c"
     break;
 
   case 253:
 #line 378 "./util/configparser.y"
     {
-               OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "nxdomain")!=0 && strcmp((yyvsp[(2) - (2)].str), "nodata")!=0 &&
-                  strcmp((yyvsp[(2) - (2)].str), "passthru")!=0 && strcmp((yyvsp[(2) - (2)].str), "drop")!=0 &&
-                  strcmp((yyvsp[(2) - (2)].str), "cname")!=0 && strcmp((yyvsp[(2) - (2)].str), "disabled")!=0) {
+               OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
+                  strcmp((yyvsp[0].str), "passthru")!=0 && strcmp((yyvsp[0].str), "drop")!=0 &&
+                  strcmp((yyvsp[0].str), "cname")!=0 && strcmp((yyvsp[0].str), "disabled")!=0) {
                        yyerror("rpz-action-override action: expected nxdomain, "
                                "nodata, passthru, drop, cname or disabled");
-                       free((yyvsp[(2) - (2)].str));
+                       free((yyvsp[0].str));
                        cfg_parser->cfg->auths->rpz_action_override = NULL;
                }
                else {
-                       cfg_parser->cfg->auths->rpz_action_override = (yyvsp[(2) - (2)].str);
+                       cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
                }
        }
+#line 2813 "util/configparser.c"
     break;
 
   case 254:
 #line 395 "./util/configparser.y"
     {
-               OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->auths->rpz_cname);
-               cfg_parser->cfg->auths->rpz_cname = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
        }
+#line 2823 "util/configparser.c"
     break;
 
   case 255:
 #line 403 "./util/configparser.y"
     {
-               OUTYY(("P(rpz_log:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 2835 "util/configparser.c"
     break;
 
   case 256:
 #line 413 "./util/configparser.y"
     {
-               OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->auths->rpz_log_name);
-               cfg_parser->cfg->auths->rpz_log_name = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
        }
+#line 2845 "util/configparser.c"
     break;
 
   case 257:
@@ -3154,273 +2861,292 @@ yyreduce:
                } else 
                        yyerror("out of memory");
        }
+#line 2865 "util/configparser.c"
     break;
 
   case 270:
 #line 444 "./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)
+               OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->num_threads = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 2877 "util/configparser.c"
     break;
 
   case 271:
 #line 453 "./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)
+               OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->verbosity = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 2889 "util/configparser.c"
     break;
 
   case 272:
 #line 462 "./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)
+               OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
+               if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
                        cfg_parser->cfg->stat_interval = 0;
-               else if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               else if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->stat_interval = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 2903 "util/configparser.c"
     break;
 
   case 273:
 #line 473 "./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)
+               OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 2915 "util/configparser.c"
     break;
 
   case 274:
 #line 482 "./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)
+               OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 2927 "util/configparser.c"
     break;
 
   case 275:
 #line 491 "./util/configparser.y"
     {
-               OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 2939 "util/configparser.c"
     break;
 
   case 276:
 #line 500 "./util/configparser.y"
     { 
-               OUTYY(("P(server_shm_key:%s)\n", (yyvsp[(2) - (2)].str))); 
-               if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0)
+               OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
+               if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
                        cfg_parser->cfg->shm_key = 0;
-               else if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               else if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->shm_key = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 2953 "util/configparser.c"
     break;
 
   case 277:
 #line 511 "./util/configparser.y"
     {
-               OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("port number expected");
-               else cfg_parser->cfg->port = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->port = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 2965 "util/configparser.c"
     break;
 
   case 278:
 #line 520 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet, (yyvsp[0].str)))
                        fatal_exit("out of memory adding client-subnet");
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 2980 "util/configparser.c"
     break;
 
   case 279:
 #line 532 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->client_subnet_zone,
-                       (yyvsp[(2) - (2)].str)))
+                       (yyvsp[0].str)))
                        fatal_exit("out of memory adding client-subnet-zone");
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 2996 "util/configparser.c"
     break;
 
   case 280:
 #line 546 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else
                        cfg_parser->cfg->client_subnet_always_forward =
-                               (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+                               (strcmp((yyvsp[0].str), "yes")==0);
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3014 "util/configparser.c"
     break;
 
   case 281:
 #line 561 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
                OUTYY(("P(Deprecated option, ignoring)\n"));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3028 "util/configparser.c"
     break;
 
   case 282:
 #line 572 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("IPv4 subnet length expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 32)
+               else if (atoi((yyvsp[0].str)) > 32)
                        cfg_parser->cfg->max_client_subnet_ipv4 = 32;
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        cfg_parser->cfg->max_client_subnet_ipv4 = 0;
-               else cfg_parser->cfg->max_client_subnet_ipv4 = (uint8_t)atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->max_client_subnet_ipv4 = (uint8_t)atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3048 "util/configparser.c"
     break;
 
   case 283:
 #line 589 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("Ipv6 subnet length expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 128)
+               else if (atoi((yyvsp[0].str)) > 128)
                        cfg_parser->cfg->max_client_subnet_ipv6 = 128;
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        cfg_parser->cfg->max_client_subnet_ipv6 = 0;
-               else cfg_parser->cfg->max_client_subnet_ipv6 = (uint8_t)atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->max_client_subnet_ipv6 = (uint8_t)atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3068 "util/configparser.c"
     break;
 
   case 284:
 #line 606 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("IPv4 subnet length expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 32)
+               else if (atoi((yyvsp[0].str)) > 32)
                        cfg_parser->cfg->min_client_subnet_ipv4 = 32;
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        cfg_parser->cfg->min_client_subnet_ipv4 = 0;
-               else cfg_parser->cfg->min_client_subnet_ipv4 = (uint8_t)atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->min_client_subnet_ipv4 = (uint8_t)atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3088 "util/configparser.c"
     break;
 
   case 285:
 #line 623 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("Ipv6 subnet length expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 128)
+               else if (atoi((yyvsp[0].str)) > 128)
                        cfg_parser->cfg->min_client_subnet_ipv6 = 128;
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        cfg_parser->cfg->min_client_subnet_ipv6 = 0;
-               else cfg_parser->cfg->min_client_subnet_ipv6 = (uint8_t)atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->min_client_subnet_ipv6 = (uint8_t)atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3108 "util/configparser.c"
     break;
 
   case 286:
 #line 640 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("IPv4 ECS tree size expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        cfg_parser->cfg->max_ecs_tree_size_ipv4 = 0;
-               else cfg_parser->cfg->max_ecs_tree_size_ipv4 = (uint32_t)atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->max_ecs_tree_size_ipv4 = (uint32_t)atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3126 "util/configparser.c"
     break;
 
   case 287:
 #line 655 "./util/configparser.y"
     {
        #ifdef CLIENT_SUBNET
-               OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("IPv6 ECS tree size expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        cfg_parser->cfg->max_ecs_tree_size_ipv6 = 0;
-               else cfg_parser->cfg->max_ecs_tree_size_ipv6 = (uint32_t)atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->max_ecs_tree_size_ipv6 = (uint32_t)atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3144 "util/configparser.c"
     break;
 
   case 288:
 #line 670 "./util/configparser.y"
     {
-               OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->num_ifs == 0)
                        cfg_parser->cfg->ifs = calloc(1, sizeof(char*));
                else    cfg_parser->cfg->ifs = realloc(cfg_parser->cfg->ifs,
@@ -3428,14 +3154,15 @@ yyreduce:
                if(!cfg_parser->cfg->ifs)
                        yyerror("out of memory");
                else
-                       cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[(2) - (2)].str);
+                       cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
        }
+#line 3160 "util/configparser.c"
     break;
 
   case 289:
 #line 683 "./util/configparser.y"
     {
-               OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->num_out_ifs == 0)
                        cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*));
                else    cfg_parser->cfg->out_ifs = realloc(
@@ -3445,455 +3172,496 @@ yyreduce:
                        yyerror("out of memory");
                else
                        cfg_parser->cfg->out_ifs[
-                               cfg_parser->cfg->num_out_ifs++] = (yyvsp[(2) - (2)].str);
+                               cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
        }
+#line 3178 "util/configparser.c"
     break;
 
   case 290:
 #line 698 "./util/configparser.y"
     {
-               OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3190 "util/configparser.c"
     break;
 
   case 291:
 #line 707 "./util/configparser.y"
     {
-               OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, 
+               OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
+               if(!cfg_mark_ports((yyvsp[0].str), 1, 
                        cfg_parser->cfg->outgoing_avail_ports, 65536))
                        yyerror("port number or range (\"low-high\") expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3202 "util/configparser.c"
     break;
 
   case 292:
 #line 716 "./util/configparser.y"
     {
-               OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, 
+               OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
+               if(!cfg_mark_ports((yyvsp[0].str), 0, 
                        cfg_parser->cfg->outgoing_avail_ports, 65536))
                        yyerror("port number or range (\"low-high\") expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3214 "util/configparser.c"
     break;
 
   case 293:
 #line 725 "./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)
+               OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3226 "util/configparser.c"
     break;
 
   case 294:
 #line 734 "./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)
+               OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3238 "util/configparser.c"
     break;
 
   case 295:
 #line 743 "./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)
+               OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3250 "util/configparser.c"
     break;
 
   case 296:
 #line 752 "./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)
+               OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3262 "util/configparser.c"
     break;
 
   case 297:
 #line 761 "./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)
+               OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3274 "util/configparser.c"
     break;
 
   case 298:
 #line 770 "./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)
+               OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->do_udp = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3286 "util/configparser.c"
     break;
 
   case 299:
 #line 779 "./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)
+               OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3298 "util/configparser.c"
     break;
 
   case 300:
 #line 788 "./util/configparser.y"
     {
-               OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3310 "util/configparser.c"
     break;
 
   case 301:
 #line 797 "./util/configparser.y"
     {
-               OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3322 "util/configparser.c"
     break;
 
   case 302:
 #line 806 "./util/configparser.y"
     {
-               OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[(2) - (2)].str)));
-                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
+                if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                         yyerror("number expected");
-                else cfg_parser->cfg->tcp_mss = atoi((yyvsp[(2) - (2)].str));
-                free((yyvsp[(2) - (2)].str));
+                else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
+                free((yyvsp[0].str));
        }
+#line 3334 "util/configparser.c"
     break;
 
   case 303:
 #line 815 "./util/configparser.y"
     {
-               OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3346 "util/configparser.c"
     break;
 
   case 304:
 #line 824 "./util/configparser.y"
     {
-               OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 120000)
+               else if (atoi((yyvsp[0].str)) > 120000)
                        cfg_parser->cfg->tcp_idle_timeout = 120000;
-               else if (atoi((yyvsp[(2) - (2)].str)) < 1)
+               else if (atoi((yyvsp[0].str)) < 1)
                        cfg_parser->cfg->tcp_idle_timeout = 1;
-               else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3362 "util/configparser.c"
     break;
 
   case 305:
 #line 837 "./util/configparser.y"
     {
-               OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3374 "util/configparser.c"
     break;
 
   case 306:
 #line 846 "./util/configparser.y"
     {
-               OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 6553500)
+               else if (atoi((yyvsp[0].str)) > 6553500)
                        cfg_parser->cfg->tcp_keepalive_timeout = 6553500;
-               else if (atoi((yyvsp[(2) - (2)].str)) < 1)
+               else if (atoi((yyvsp[0].str)) < 1)
                        cfg_parser->cfg->tcp_keepalive_timeout = 0;
-               else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3390 "util/configparser.c"
     break;
 
   case 307:
 #line 859 "./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)
+               OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3402 "util/configparser.c"
     break;
 
   case 308:
 #line 868 "./util/configparser.y"
     {
-               OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3414 "util/configparser.c"
     break;
 
   case 309:
 #line 877 "./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)
+               OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3426 "util/configparser.c"
     break;
 
   case 310:
 #line 886 "./util/configparser.y"
     {
-               OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->ssl_service_key);
-               cfg_parser->cfg->ssl_service_key = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
        }
+#line 3436 "util/configparser.c"
     break;
 
   case 311:
 #line 893 "./util/configparser.y"
     {
-               OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->ssl_service_pem);
-               cfg_parser->cfg->ssl_service_pem = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
        }
+#line 3446 "util/configparser.c"
     break;
 
   case 312:
 #line 900 "./util/configparser.y"
     {
-               OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("port number expected");
-               else cfg_parser->cfg->ssl_port = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3458 "util/configparser.c"
     break;
 
   case 313:
 #line 909 "./util/configparser.y"
     {
-               OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->tls_cert_bundle);
-               cfg_parser->cfg->tls_cert_bundle = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
        }
+#line 3468 "util/configparser.c"
     break;
 
   case 314:
 #line 916 "./util/configparser.y"
     {
-               OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3480 "util/configparser.c"
     break;
 
   case 315:
 #line 925 "./util/configparser.y"
     {
-               OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
-                       (yyvsp[(2) - (2)].str)))
+                       (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3491 "util/configparser.c"
     break;
 
   case 316:
 #line 933 "./util/configparser.y"
     {
-               OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->tls_ciphers);
-               cfg_parser->cfg->tls_ciphers = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
        }
+#line 3501 "util/configparser.c"
     break;
 
   case 317:
 #line 940 "./util/configparser.y"
     {
-               OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->tls_ciphersuites);
-               cfg_parser->cfg->tls_ciphersuites = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
        }
+#line 3511 "util/configparser.c"
     break;
 
   case 318:
 #line 947 "./util/configparser.y"
     {
-               OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
-                       (yyvsp[(2) - (2)].str)))
+                       (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3522 "util/configparser.c"
     break;
 
   case 319:
 #line 955 "./util/configparser.y"
     {
-               OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3534 "util/configparser.c"
     break;
 
   case 320:
 #line 964 "./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)
+               OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3546 "util/configparser.c"
     break;
 
   case 321:
 #line 973 "./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)
+               OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->use_syslog = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               else cfg_parser->cfg->use_syslog = (strcmp((yyvsp[0].str), "yes")==0);
 #if !defined(HAVE_SYSLOG_H) && !defined(UB_ON_WINDOWS)
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") == 0)
+               if(strcmp((yyvsp[0].str), "yes") == 0)
                        yyerror("no syslog services are available. "
                                "(reconfigure and compile to add)");
 #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3563 "util/configparser.c"
     break;
 
   case 322:
 #line 987 "./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)
+               OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3575 "util/configparser.c"
     break;
 
   case 323:
 #line 996 "./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)
+               OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->log_queries = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3587 "util/configparser.c"
     break;
 
   case 324:
 #line 1005 "./util/configparser.y"
     {
-       OUTYY(("P(server_log_replies:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+       OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
+       if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                yyerror("expected yes or no.");
-       else cfg_parser->cfg->log_replies = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-       free((yyvsp[(2) - (2)].str));
+       else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
+       free((yyvsp[0].str));
   }
+#line 3599 "util/configparser.c"
     break;
 
   case 325:
 #line 1014 "./util/configparser.y"
     {
-       OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+       OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
+       if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                yyerror("expected yes or no.");
-       else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-       free((yyvsp[(2) - (2)].str));
+       else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
+       free((yyvsp[0].str));
   }
+#line 3611 "util/configparser.c"
     break;
 
   case 326:
 #line 1023 "./util/configparser.y"
     {
-               OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3623 "util/configparser.c"
     break;
 
   case 327:
 #line 1032 "./util/configparser.y"
     {
-       OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+       OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
+       if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                yyerror("expected yes or no.");
-       else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-       free((yyvsp[(2) - (2)].str));
+       else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
+       free((yyvsp[0].str));
   }
+#line 3635 "util/configparser.c"
     break;
 
   case 328:
 #line 1041 "./util/configparser.y"
     {
-               OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->chrootdir);
-               cfg_parser->cfg->chrootdir = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->chrootdir = (yyvsp[0].str);
        }
+#line 3645 "util/configparser.c"
     break;
 
   case 329:
 #line 1048 "./util/configparser.y"
     {
-               OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->username);
-               cfg_parser->cfg->username = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->username = (yyvsp[0].str);
        }
+#line 3655 "util/configparser.c"
     break;
 
   case 330:
 #line 1055 "./util/configparser.y"
     {
-               OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->directory);
-               cfg_parser->cfg->directory = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->directory = (yyvsp[0].str);
                /* change there right away for includes relative to this */
-               if((yyvsp[(2) - (2)].str)[0]) {
+               if((yyvsp[0].str)[0]) {
                        char* d;
 #ifdef UB_ON_WINDOWS
                        w_config_adjust_directory(cfg_parser->cfg);
@@ -3912,1078 +3680,1169 @@ yyreduce:
                        }
                }
        }
+#line 3684 "util/configparser.c"
     break;
 
   case 331:
 #line 1081 "./util/configparser.y"
     {
-               OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->logfile);
-               cfg_parser->cfg->logfile = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->logfile = (yyvsp[0].str);
                cfg_parser->cfg->use_syslog = 0;
        }
+#line 3695 "util/configparser.c"
     break;
 
   case 332:
 #line 1089 "./util/configparser.y"
     {
-               OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->pidfile);
-               cfg_parser->cfg->pidfile = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->pidfile = (yyvsp[0].str);
        }
+#line 3705 "util/configparser.c"
     break;
 
   case 333:
 #line 1096 "./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)))
+               OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3715 "util/configparser.c"
     break;
 
   case 334:
 #line 1103 "./util/configparser.y"
     {
-               OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dlv_anchor_file);
-               cfg_parser->cfg->dlv_anchor_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
        }
+#line 3725 "util/configparser.c"
     break;
 
   case 335:
 #line 1110 "./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)))
+               OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3735 "util/configparser.c"
     break;
 
   case 336:
 #line 1117 "./util/configparser.y"
     {
-               OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
-                       auto_trust_anchor_file_list, (yyvsp[(2) - (2)].str)))
+                       auto_trust_anchor_file_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3746 "util/configparser.c"
     break;
 
   case 337:
 #line 1125 "./util/configparser.y"
     {
-               OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
-                       trust_anchor_file_list, (yyvsp[(2) - (2)].str)))
+                       trust_anchor_file_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3757 "util/configparser.c"
     break;
 
   case 338:
 #line 1133 "./util/configparser.y"
     {
-               OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
-                       trusted_keys_file_list, (yyvsp[(2) - (2)].str)))
+                       trusted_keys_file_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3768 "util/configparser.c"
     break;
 
   case 339:
 #line 1141 "./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)))
+               OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3778 "util/configparser.c"
     break;
 
   case 340:
 #line 1148 "./util/configparser.y"
     {
-               OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else
                        cfg_parser->cfg->trust_anchor_signaling =
-                               (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                               (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3792 "util/configparser.c"
     break;
 
   case 341:
 #line 1159 "./util/configparser.y"
     {
-               OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else
                        cfg_parser->cfg->root_key_sentinel =
-                               (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                               (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3806 "util/configparser.c"
     break;
 
   case 342:
 #line 1170 "./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)))
+               OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 3816 "util/configparser.c"
     break;
 
   case 343:
 #line 1177 "./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)
+               OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3828 "util/configparser.c"
     break;
 
   case 344:
 #line 1186 "./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)
+               OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->hide_version = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3840 "util/configparser.c"
     break;
 
   case 345:
 #line 1195 "./util/configparser.y"
     {
-               OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 3852 "util/configparser.c"
     break;
 
   case 346:
 #line 1204 "./util/configparser.y"
     {
-               OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->identity);
-               cfg_parser->cfg->identity = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->identity = (yyvsp[0].str);
        }
+#line 3862 "util/configparser.c"
     break;
 
   case 347:
 #line 1211 "./util/configparser.y"
     {
-               OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->version);
-               cfg_parser->cfg->version = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->version = (yyvsp[0].str);
        }
+#line 3872 "util/configparser.c"
     break;
 
   case 348:
 #line 1218 "./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))
+               OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
                        yyerror("buffer size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3883 "util/configparser.c"
     break;
 
   case 349:
 #line 1226 "./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))
+               OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
                        yyerror("buffer size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3894 "util/configparser.c"
     break;
 
   case 350:
 #line 1234 "./util/configparser.y"
     {
-        OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[(2) - (2)].str)));
-        if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+        OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
+        if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
             yyerror("expected yes or no.");
         else cfg_parser->cfg->so_reuseport =
-            (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-        free((yyvsp[(2) - (2)].str));
+            (strcmp((yyvsp[0].str), "yes")==0);
+        free((yyvsp[0].str));
     }
+#line 3907 "util/configparser.c"
     break;
 
   case 351:
 #line 1244 "./util/configparser.y"
     {
-        OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[(2) - (2)].str)));
-        if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+        OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
+        if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
             yyerror("expected yes or no.");
         else cfg_parser->cfg->ip_transparent =
-            (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-        free((yyvsp[(2) - (2)].str));
+            (strcmp((yyvsp[0].str), "yes")==0);
+        free((yyvsp[0].str));
     }
+#line 3920 "util/configparser.c"
     break;
 
   case 352:
 #line 1254 "./util/configparser.y"
     {
-        OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[(2) - (2)].str)));
-        if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+        OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
+        if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
             yyerror("expected yes or no.");
         else cfg_parser->cfg->ip_freebind =
-            (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-        free((yyvsp[(2) - (2)].str));
+            (strcmp((yyvsp[0].str), "yes")==0);
+        free((yyvsp[0].str));
     }
+#line 3933 "util/configparser.c"
     break;
 
   case 353:
 #line 1264 "./util/configparser.y"
     {
-               OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 63)
+               else if (atoi((yyvsp[0].str)) > 63)
                        yyerror("value too large (max 63)");
-               else if (atoi((yyvsp[(2) - (2)].str)) < 0)
+               else if (atoi((yyvsp[0].str)) < 0)
                        yyerror("value too small (min 0)");
                else
-                       cfg_parser->cfg->ip_dscp = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3950 "util/configparser.c"
     break;
 
   case 354:
 #line 1278 "./util/configparser.y"
     {
-               OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->stream_wait_size))
+               OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
                        yyerror("memory size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 3961 "util/configparser.c"
     break;
 
   case 355:
 #line 1286 "./util/configparser.y"
     {
-               OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) < 12)
+               else if (atoi((yyvsp[0].str)) < 12)
                        yyerror("edns buffer size too small");
-               else if (atoi((yyvsp[(2) - (2)].str)) > 65535)
+               else if (atoi((yyvsp[0].str)) > 65535)
                        cfg_parser->cfg->edns_buffer_size = 65535;
-               else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3977 "util/configparser.c"
     break;
 
   case 356:
 #line 1299 "./util/configparser.y"
     {
-               OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else if (atoi((yyvsp[(2) - (2)].str)) < 4096)
+               else if (atoi((yyvsp[0].str)) < 4096)
                        yyerror("message buffer size too small (use 4096)");
-               else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 3991 "util/configparser.c"
     break;
 
   case 357:
 #line 1310 "./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))
+               OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
                        yyerror("memory size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4002 "util/configparser.c"
     break;
 
   case 358:
 #line 1318 "./util/configparser.y"
     {
-               OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
                else {
-                       cfg_parser->cfg->msg_cache_slabs = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->msg_cache_slabs = atoi((yyvsp[0].str));
                        if(!is_pow2(cfg_parser->cfg->msg_cache_slabs))
                                yyerror("must be a power of 2");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4018 "util/configparser.c"
     break;
 
   case 359:
 #line 1331 "./util/configparser.y"
     {
-               OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4030 "util/configparser.c"
     break;
 
   case 360:
 #line 1340 "./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)
+               OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->jostle_time = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4042 "util/configparser.c"
     break;
 
   case 361:
 #line 1349 "./util/configparser.y"
     {
-               OUTYY(("P(server_delay_close:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->delay_close = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4054 "util/configparser.c"
     break;
 
   case 362:
 #line 1358 "./util/configparser.y"
     {
-               OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->unblock_lan_zones = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4067 "util/configparser.c"
     break;
 
   case 363:
 #line 1368 "./util/configparser.y"
     {
-               OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->insecure_lan_zones = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4080 "util/configparser.c"
     break;
 
   case 364:
 #line 1378 "./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))
+               OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
                        yyerror("memory size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4091 "util/configparser.c"
     break;
 
   case 365:
 #line 1386 "./util/configparser.y"
     {
-               OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
                else {
-                       cfg_parser->cfg->rrset_cache_slabs = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->rrset_cache_slabs = atoi((yyvsp[0].str));
                        if(!is_pow2(cfg_parser->cfg->rrset_cache_slabs))
                                yyerror("must be a power of 2");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4107 "util/configparser.c"
     break;
 
   case 366:
 #line 1399 "./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)
+               OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->host_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4119 "util/configparser.c"
     break;
 
   case 367:
 #line 1408 "./util/configparser.y"
     {
-               OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
                verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
-                       "removed, use infra-host-ttl)", (yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+                       "removed, use infra-host-ttl)", (yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4130 "util/configparser.c"
     break;
 
   case 368:
 #line 1416 "./util/configparser.y"
     {
-               OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4142 "util/configparser.c"
     break;
 
   case 369:
 #line 1425 "./util/configparser.y"
     {
-               OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
                verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
-                       "(option removed, use infra-cache-numhosts)", (yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+                       "(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4153 "util/configparser.c"
     break;
 
   case 370:
 #line 1433 "./util/configparser.y"
     {
-               OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
                else {
-                       cfg_parser->cfg->infra_cache_slabs = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->infra_cache_slabs = atoi((yyvsp[0].str));
                        if(!is_pow2(cfg_parser->cfg->infra_cache_slabs))
                                yyerror("must be a power of 2");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4169 "util/configparser.c"
     break;
 
   case 371:
 #line 1446 "./util/configparser.y"
     {
-               OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4181 "util/configparser.c"
     break;
 
   case 372:
 #line 1455 "./util/configparser.y"
     {
-               OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->target_fetch_policy);
-               cfg_parser->cfg->target_fetch_policy = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
        }
+#line 4191 "util/configparser.c"
     break;
 
   case 373:
 #line 1462 "./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)
+               OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_short_bufsize = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4204 "util/configparser.c"
     break;
 
   case 374:
 #line 1472 "./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)
+               OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_large_queries = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4217 "util/configparser.c"
     break;
 
   case 375:
 #line 1482 "./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)
+               OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_glue = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4230 "util/configparser.c"
     break;
 
   case 376:
 #line 1492 "./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)
+               OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_dnssec_stripped = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4243 "util/configparser.c"
     break;
 
   case 377:
 #line 1502 "./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)
+               OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_below_nxdomain = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4256 "util/configparser.c"
     break;
 
   case 378:
 #line 1512 "./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)
+               OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_referral_path = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4269 "util/configparser.c"
     break;
 
   case 379:
 #line 1522 "./util/configparser.y"
     {
-               OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->harden_algo_downgrade = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4282 "util/configparser.c"
     break;
 
   case 380:
 #line 1532 "./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)
+               OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->use_caps_bits_for_id = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4295 "util/configparser.c"
     break;
 
   case 381:
 #line 1542 "./util/configparser.y"
     {
-               OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 4305 "util/configparser.c"
     break;
 
   case 382:
 #line 1549 "./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)))
+               OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 4315 "util/configparser.c"
     break;
 
   case 383:
 #line 1556 "./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)))
+               OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 4325 "util/configparser.c"
     break;
 
   case 384:
 #line 1563 "./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)
+               OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->prefetch = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4337 "util/configparser.c"
     break;
 
   case 385:
 #line 1572 "./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)
+               OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4349 "util/configparser.c"
     break;
 
   case 386:
 #line 1581 "./util/configparser.y"
     {
-               OUTYY(("P(server_deny_any:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->deny_any = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4361 "util/configparser.c"
     break;
 
   case 387:
 #line 1590 "./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)
+               OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4373 "util/configparser.c"
     break;
 
   case 388:
 #line 1599 "./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)))
+               OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 4383 "util/configparser.c"
     break;
 
   case 389:
 #line 1606 "./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)
+               OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->donotquery_localhost = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4396 "util/configparser.c"
     break;
 
   case 390:
 #line 1616 "./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 &&
-                       strcmp((yyvsp[(3) - (3)].str), "deny_non_local")!=0 &&
-                       strcmp((yyvsp[(3) - (3)].str), "refuse_non_local")!=0 &&
-                       strcmp((yyvsp[(3) - (3)].str), "allow_setrd")!=0 && 
-                       strcmp((yyvsp[(3) - (3)].str), "allow")!=0 && 
-                       strcmp((yyvsp[(3) - (3)].str), "allow_snoop")!=0) {
+               OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
+                       strcmp((yyvsp[0].str), "deny_non_local")!=0 &&
+                       strcmp((yyvsp[0].str), "refuse_non_local")!=0 &&
+                       strcmp((yyvsp[0].str), "allow_setrd")!=0 && 
+                       strcmp((yyvsp[0].str), "allow")!=0 && 
+                       strcmp((yyvsp[0].str), "allow_snoop")!=0) {
                        yyerror("expected deny, refuse, deny_non_local, "
                                "refuse_non_local, allow, allow_setrd or "
                                "allow_snoop in access control action");
-                       free((yyvsp[(2) - (3)].str));
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
                } else {
-                       if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                       if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding acl");
                }
        }
+#line 4419 "util/configparser.c"
     break;
 
   case 391:
 #line 1636 "./util/configparser.y"
     {
-               OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->module_conf);
-               cfg_parser->cfg->module_conf = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->module_conf = (yyvsp[0].str);
        }
+#line 4429 "util/configparser.c"
     break;
 
   case 392:
 #line 1643 "./util/configparser.y"
     {
-               OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(*(yyvsp[(2) - (2)].str) == '\0' || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
+               OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
+               if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
                        cfg_parser->cfg->val_date_override = 0;
-               } else if(strlen((yyvsp[(2) - (2)].str)) == 14) {
+               } else if(strlen((yyvsp[0].str)) == 14) {
                        cfg_parser->cfg->val_date_override = 
-                               cfg_convert_timeval((yyvsp[(2) - (2)].str));
+                               cfg_convert_timeval((yyvsp[0].str));
                        if(!cfg_parser->cfg->val_date_override)
                                yyerror("bad date/time specification");
                } else {
-                       if(atoi((yyvsp[(2) - (2)].str)) == 0)
+                       if(atoi((yyvsp[0].str)) == 0)
                                yyerror("number expected");
-                       cfg_parser->cfg->val_date_override = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->val_date_override = atoi((yyvsp[0].str));
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4450 "util/configparser.c"
     break;
 
   case 393:
 #line 1661 "./util/configparser.y"
     {
-               OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(*(yyvsp[(2) - (2)].str) == '\0' || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
+               OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
+               if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
                        cfg_parser->cfg->val_sig_skew_min = 0;
                } else {
-                       cfg_parser->cfg->val_sig_skew_min = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->val_sig_skew_min = atoi((yyvsp[0].str));
                        if(!cfg_parser->cfg->val_sig_skew_min)
                                yyerror("number expected");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4466 "util/configparser.c"
     break;
 
   case 394:
 #line 1674 "./util/configparser.y"
     {
-               OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(*(yyvsp[(2) - (2)].str) == '\0' || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
+               OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
+               if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
                        cfg_parser->cfg->val_sig_skew_max = 0;
                } else {
-                       cfg_parser->cfg->val_sig_skew_max = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->val_sig_skew_max = atoi((yyvsp[0].str));
                        if(!cfg_parser->cfg->val_sig_skew_max)
                                yyerror("number expected");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4482 "util/configparser.c"
     break;
 
   case 395:
 #line 1687 "./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)
+               OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->max_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4494 "util/configparser.c"
     break;
 
   case 396:
 #line 1696 "./util/configparser.y"
     {
-               OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4506 "util/configparser.c"
     break;
 
   case 397:
 #line 1705 "./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)
+               OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->min_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4518 "util/configparser.c"
     break;
 
   case 398:
 #line 1714 "./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)
+               OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4530 "util/configparser.c"
     break;
 
   case 399:
 #line 1723 "./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)
+               OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->val_clean_additional = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4543 "util/configparser.c"
     break;
 
   case 400:
 #line 1733 "./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)
+               OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->val_permissive_mode = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4556 "util/configparser.c"
     break;
 
   case 401:
 #line 1743 "./util/configparser.y"
     {
-               OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else
                        cfg_parser->cfg->aggressive_nsec =
-                               (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                               (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4570 "util/configparser.c"
     break;
 
   case 402:
 #line 1754 "./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)
+               OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4582 "util/configparser.c"
     break;
 
   case 403:
 #line 1763 "./util/configparser.y"
     {
-               OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4594 "util/configparser.c"
     break;
 
   case 404:
 #line 1772 "./util/configparser.y"
     {
-               OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4606 "util/configparser.c"
     break;
 
   case 405:
 #line 1781 "./util/configparser.y"
     {
-               OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4618 "util/configparser.c"
     break;
 
   case 406:
 #line 1790 "./util/configparser.y"
     {
-               OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4630 "util/configparser.c"
     break;
 
   case 407:
 #line 1799 "./util/configparser.y"
     {
-               OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4642 "util/configparser.c"
     break;
 
   case 408:
 #line 1808 "./util/configparser.y"
     {
-               OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
 #if defined(HAVE_SSL) || defined(HAVE_NETTLE)
-               else fake_dsa = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               else fake_dsa = (strcmp((yyvsp[0].str), "yes")==0);
                if(fake_dsa)
                        log_warn("test option fake_dsa is enabled");
 #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4658 "util/configparser.c"
     break;
 
   case 409:
 #line 1821 "./util/configparser.y"
     {
-               OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
 #if defined(HAVE_SSL) || defined(HAVE_NETTLE)
-               else fake_sha1 = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               else fake_sha1 = (strcmp((yyvsp[0].str), "yes")==0);
                if(fake_sha1)
                        log_warn("test option fake_sha1 is enabled");
 #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4674 "util/configparser.c"
     break;
 
   case 410:
 #line 1834 "./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)
+               OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->val_log_level = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4686 "util/configparser.c"
     break;
 
   case 411:
 #line 1843 "./util/configparser.y"
     {
-               OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->val_nsec3_key_iterations);
-               cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
        }
+#line 4696 "util/configparser.c"
     break;
 
   case 412:
 #line 1850 "./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)
+               OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->add_holddown = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4708 "util/configparser.c"
     break;
 
   case 413:
 #line 1859 "./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)
+               OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->del_holddown = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4720 "util/configparser.c"
     break;
 
   case 414:
 #line 1868 "./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)
+               OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->keep_missing = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4732 "util/configparser.c"
     break;
 
   case 415:
 #line 1877 "./util/configparser.y"
     {
-               OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->permit_small_holddown =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4745 "util/configparser.c"
     break;
 
   case 416:
 #line 1886 "./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))
+               OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
                        yyerror("memory size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4756 "util/configparser.c"
     break;
 
   case 417:
 #line 1894 "./util/configparser.y"
     {
-               OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
                else {
-                       cfg_parser->cfg->key_cache_slabs = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->key_cache_slabs = atoi((yyvsp[0].str));
                        if(!is_pow2(cfg_parser->cfg->key_cache_slabs))
                                yyerror("must be a power of 2");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4772 "util/configparser.c"
     break;
 
   case 418:
 #line 1907 "./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))
+               OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
                        yyerror("memory size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4783 "util/configparser.c"
     break;
 
   case 419:
 #line 1915 "./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 &&
-                  strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 && strcmp((yyvsp[(3) - (3)].str), "redirect")!=0 &&
-                  strcmp((yyvsp[(3) - (3)].str), "transparent")!=0 && strcmp((yyvsp[(3) - (3)].str), "nodefault")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "typetransparent")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "always_transparent")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "always_refuse")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "always_nxdomain")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "noview")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "inform")!=0 && strcmp((yyvsp[(3) - (3)].str), "inform_deny")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "inform_redirect") != 0
-                        && strcmp((yyvsp[(3) - (3)].str), "ipset") != 0) {
+               OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
+                  strcmp((yyvsp[0].str), "refuse")!=0 && strcmp((yyvsp[0].str), "redirect")!=0 &&
+                  strcmp((yyvsp[0].str), "transparent")!=0 && strcmp((yyvsp[0].str), "nodefault")!=0
+                  && strcmp((yyvsp[0].str), "typetransparent")!=0
+                  && strcmp((yyvsp[0].str), "always_transparent")!=0
+                  && strcmp((yyvsp[0].str), "always_refuse")!=0
+                  && strcmp((yyvsp[0].str), "always_nxdomain")!=0
+                  && strcmp((yyvsp[0].str), "noview")!=0
+                  && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0
+                  && strcmp((yyvsp[0].str), "inform_redirect") != 0
+                        && strcmp((yyvsp[0].str), "ipset") != 0) {
                        yyerror("local-zone type: expected static, deny, "
                                "refuse, redirect, transparent, "
                                "typetransparent, inform, inform_deny, "
                                "inform_redirect, always_transparent, "
                                "always_refuse, always_nxdomain, noview "
                                ", nodefault or ipset");
-                       free((yyvsp[(2) - (3)].str));
-                       free((yyvsp[(3) - (3)].str));
-               } else if(strcmp((yyvsp[(3) - (3)].str), "nodefault")==0) {
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
+               } else if(strcmp((yyvsp[0].str), "nodefault")==0) {
                        if(!cfg_strlist_insert(&cfg_parser->cfg->
-                               local_zones_nodefault, (yyvsp[(2) - (3)].str)))
+                               local_zones_nodefault, (yyvsp[-1].str)))
                                fatal_exit("out of memory adding local-zone");
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[0].str));
 #ifdef USE_IPSET
-               } else if(strcmp((yyvsp[(3) - (3)].str), "ipset")==0) {
+               } else if(strcmp((yyvsp[0].str), "ipset")==0) {
                        if(!cfg_strlist_insert(&cfg_parser->cfg->
-                               local_zones_ipset, (yyvsp[(2) - (3)].str)))
+                               local_zones_ipset, (yyvsp[-1].str)))
                                fatal_exit("out of memory adding local-zone");
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[0].str));
 #endif
                } else {
                        if(!cfg_str2list_insert(&cfg_parser->cfg->local_zones, 
-                               (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                               (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding local-zone");
                }
        }
+#line 4827 "util/configparser.c"
     break;
 
   case 420:
 #line 1956 "./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)))
+               OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
                        fatal_exit("out of memory adding local-data");
        }
+#line 4837 "util/configparser.c"
     break;
 
   case 421:
 #line 1963 "./util/configparser.y"
     {
                char* ptr;
-               OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
-               ptr = cfg_ptr_reverse((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
+               ptr = cfg_ptr_reverse((yyvsp[0].str));
+               free((yyvsp[0].str));
                if(ptr) {
                        if(!cfg_strlist_insert(&cfg_parser->cfg->
                                local_data, ptr))
@@ -4992,85 +4851,93 @@ yyreduce:
                        yyerror("local-data-ptr could not be reversed");
                }
        }
+#line 4855 "util/configparser.c"
     break;
 
   case 422:
 #line 1978 "./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)
+               OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->minimal_responses =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4868 "util/configparser.c"
     break;
 
   case 423:
 #line 1988 "./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)
+               OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->rrset_roundrobin =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4881 "util/configparser.c"
     break;
 
   case 424:
 #line 1998 "./util/configparser.y"
     {
-               OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[(2) - (2)].str)));
-               cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
+               cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4891 "util/configparser.c"
     break;
 
   case 425:
 #line 2005 "./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));
+               OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
+               cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 4901 "util/configparser.c"
     break;
 
   case 426:
 #line 2012 "./util/configparser.y"
     {
-               OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dns64_prefix);
-               cfg_parser->cfg->dns64_prefix = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
        }
+#line 4911 "util/configparser.c"
     break;
 
   case 427:
 #line 2019 "./util/configparser.y"
     {
-               OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 4923 "util/configparser.c"
     break;
 
   case 428:
 #line 2028 "./util/configparser.y"
     {
-               OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
-                       (yyvsp[(2) - (2)].str)))
+                       (yyvsp[0].str)))
                        fatal_exit("out of memory adding dns64-ignore-aaaa");
        }
+#line 4934 "util/configparser.c"
     break;
 
   case 429:
 #line 2036 "./util/configparser.y"
     {
-               char* p, *s = (yyvsp[(2) - (2)].str);
-               OUTYY(("P(server_define_tag:%s)\n", (yyvsp[(2) - (2)].str)));
+               char* p, *s = (yyvsp[0].str);
+               OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
                while((p=strsep(&s, " \t\n")) != NULL) {
                        if(*p) {
                                if(!config_add_tag(cfg_parser->cfg, p))
@@ -5078,721 +4945,776 @@ yyreduce:
                                                "out of memory");
                        }
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 4951 "util/configparser.c"
     break;
 
   case 430:
 #line 2050 "./util/configparser.y"
     {
                size_t len = 0;
-               uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[(3) - (3)].str),
+               uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
                        &len);
-               free((yyvsp[(3) - (3)].str));
-               OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[(2) - (3)].str)));
+               free((yyvsp[0].str));
+               OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[-1].str)));
                if(!bitlist) {
                        yyerror("could not parse tags, (define-tag them first)");
-                       free((yyvsp[(2) - (3)].str));
+                       free((yyvsp[-1].str));
                }
                if(bitlist) {
                        if(!cfg_strbytelist_insert(
                                &cfg_parser->cfg->local_zone_tags,
-                               (yyvsp[(2) - (3)].str), bitlist, len)) {
+                               (yyvsp[-1].str), bitlist, len)) {
                                yyerror("out of memory");
-                               free((yyvsp[(2) - (3)].str));
+                               free((yyvsp[-1].str));
                        }
                }
        }
+#line 4975 "util/configparser.c"
     break;
 
   case 431:
 #line 2071 "./util/configparser.y"
     {
                size_t len = 0;
-               uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[(3) - (3)].str),
+               uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
                        &len);
-               free((yyvsp[(3) - (3)].str));
-               OUTYY(("P(server_access_control_tag:%s)\n", (yyvsp[(2) - (3)].str)));
+               free((yyvsp[0].str));
+               OUTYY(("P(server_access_control_tag:%s)\n", (yyvsp[-1].str)));
                if(!bitlist) {
                        yyerror("could not parse tags, (define-tag them first)");
-                       free((yyvsp[(2) - (3)].str));
+                       free((yyvsp[-1].str));
                }
                if(bitlist) {
                        if(!cfg_strbytelist_insert(
                                &cfg_parser->cfg->acl_tags,
-                               (yyvsp[(2) - (3)].str), bitlist, len)) {
+                               (yyvsp[-1].str), bitlist, len)) {
                                yyerror("out of memory");
-                               free((yyvsp[(2) - (3)].str));
+                               free((yyvsp[-1].str));
                        }
                }
        }
+#line 4999 "util/configparser.c"
     break;
 
   case 432:
 #line 2092 "./util/configparser.y"
     {
-               OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (yyvsp[(4) - (4)].str)));
+               OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
-                       (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (yyvsp[(4) - (4)].str))) {
+                       (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
                        yyerror("out of memory");
-                       free((yyvsp[(2) - (4)].str));
-                       free((yyvsp[(3) - (4)].str));
-                       free((yyvsp[(4) - (4)].str));
+                       free((yyvsp[-2].str));
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
                }
        }
+#line 5014 "util/configparser.c"
     break;
 
   case 433:
 #line 2104 "./util/configparser.y"
     {
-               OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (yyvsp[(4) - (4)].str)));
+               OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
-                       (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (yyvsp[(4) - (4)].str))) {
+                       (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
                        yyerror("out of memory");
-                       free((yyvsp[(2) - (4)].str));
-                       free((yyvsp[(3) - (4)].str));
-                       free((yyvsp[(4) - (4)].str));
+                       free((yyvsp[-2].str));
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
                }
        }
+#line 5029 "util/configparser.c"
     break;
 
   case 434:
 #line 2116 "./util/configparser.y"
     {
-               OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (yyvsp[(4) - (4)].str)));
+               OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
-                       (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (yyvsp[(4) - (4)].str))) {
+                       (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))) {
                        yyerror("out of memory");
-                       free((yyvsp[(2) - (4)].str));
-                       free((yyvsp[(3) - (4)].str));
-                       free((yyvsp[(4) - (4)].str));
+                       free((yyvsp[-2].str));
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
                }
        }
+#line 5044 "util/configparser.c"
     break;
 
   case 435:
 #line 2128 "./util/configparser.y"
     {
-               OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
+               OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
                if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
-                       (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))) {
+                       (yyvsp[-1].str), (yyvsp[0].str))) {
                        yyerror("out of memory");
                }
        }
+#line 5056 "util/configparser.c"
     break;
 
   case 436:
 #line 2137 "./util/configparser.y"
     {
                size_t len = 0;
-               uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[(3) - (3)].str),
+               uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
                        &len);
-               free((yyvsp[(3) - (3)].str));
-               OUTYY(("P(response_ip_tag:%s)\n", (yyvsp[(2) - (3)].str)));
+               free((yyvsp[0].str));
+               OUTYY(("P(response_ip_tag:%s)\n", (yyvsp[-1].str)));
                if(!bitlist) {
                        yyerror("could not parse tags, (define-tag them first)");
-                       free((yyvsp[(2) - (3)].str));
+                       free((yyvsp[-1].str));
                }
                if(bitlist) {
                        if(!cfg_strbytelist_insert(
                                &cfg_parser->cfg->respip_tags,
-                               (yyvsp[(2) - (3)].str), bitlist, len)) {
+                               (yyvsp[-1].str), bitlist, len)) {
                                yyerror("out of memory");
-                               free((yyvsp[(2) - (3)].str));
+                               free((yyvsp[-1].str));
                        }
                }
        }
+#line 5080 "util/configparser.c"
     break;
 
   case 437:
 #line 2158 "./util/configparser.y"
     { 
-               OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[(2) - (2)].str))); 
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 5092 "util/configparser.c"
     break;
 
   case 438:
 #line 2168 "./util/configparser.y"
     { 
-               OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[(2) - (2)].str))); 
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->ratelimit = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 5104 "util/configparser.c"
     break;
 
   case 439:
 #line 2177 "./util/configparser.y"
     {
-       OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->ip_ratelimit_size))
+       OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
+       if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
                yyerror("memory size expected");
-       free((yyvsp[(2) - (2)].str));
+       free((yyvsp[0].str));
   }
+#line 5115 "util/configparser.c"
     break;
 
   case 440:
 #line 2185 "./util/configparser.y"
     {
-               OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->ratelimit_size))
+               OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
+               if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
                        yyerror("memory size expected");
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 5126 "util/configparser.c"
     break;
 
   case 441:
 #line 2193 "./util/configparser.y"
     {
-       OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(atoi((yyvsp[(2) - (2)].str)) == 0)
+       OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
+       if(atoi((yyvsp[0].str)) == 0)
                yyerror("number expected");
        else {
-               cfg_parser->cfg->ip_ratelimit_slabs = atoi((yyvsp[(2) - (2)].str));
+               cfg_parser->cfg->ip_ratelimit_slabs = atoi((yyvsp[0].str));
                if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
                        yyerror("must be a power of 2");
        }
-       free((yyvsp[(2) - (2)].str));
+       free((yyvsp[0].str));
   }
+#line 5142 "util/configparser.c"
     break;
 
   case 442:
 #line 2206 "./util/configparser.y"
     {
-               OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("number expected");
                else {
-                       cfg_parser->cfg->ratelimit_slabs = atoi((yyvsp[(2) - (2)].str));
+                       cfg_parser->cfg->ratelimit_slabs = atoi((yyvsp[0].str));
                        if(!is_pow2(cfg_parser->cfg->ratelimit_slabs))
                                yyerror("must be a power of 2");
                }
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 5158 "util/configparser.c"
     break;
 
   case 443:
 #line 2219 "./util/configparser.y"
     {
-               OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
-               if(atoi((yyvsp[(3) - (3)].str)) == 0 && strcmp((yyvsp[(3) - (3)].str), "0") != 0) {
+               OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
                        yyerror("number expected");
-                       free((yyvsp[(2) - (3)].str));
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
                } else {
                        if(!cfg_str2list_insert(&cfg_parser->cfg->
-                               ratelimit_for_domain, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                               ratelimit_for_domain, (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding "
                                        "ratelimit-for-domain");
                }
        }
+#line 5176 "util/configparser.c"
     break;
 
   case 444:
 #line 2234 "./util/configparser.y"
     {
-               OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
-               if(atoi((yyvsp[(3) - (3)].str)) == 0 && strcmp((yyvsp[(3) - (3)].str), "0") != 0) {
+               OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
                        yyerror("number expected");
-                       free((yyvsp[(2) - (3)].str));
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
                } else {
                        if(!cfg_str2list_insert(&cfg_parser->cfg->
-                               ratelimit_below_domain, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                               ratelimit_below_domain, (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding "
                                        "ratelimit-below-domain");
                }
        }
+#line 5194 "util/configparser.c"
     break;
 
   case 445:
 #line 2249 "./util/configparser.y"
     { 
-       OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[(2) - (2)].str))); 
-       if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+       OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
+       if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                yyerror("number expected");
-       else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[(2) - (2)].str));
-       free((yyvsp[(2) - (2)].str));
+       else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
+       free((yyvsp[0].str));
        }
+#line 5206 "util/configparser.c"
     break;
 
   case 446:
 #line 2258 "./util/configparser.y"
     { 
-               OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[(2) - (2)].str))); 
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 5218 "util/configparser.c"
     break;
 
   case 447:
 #line 2267 "./util/configparser.y"
     { 
                OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 5227 "util/configparser.c"
     break;
 
   case 448:
 #line 2273 "./util/configparser.y"
     { 
-               OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[(2) - (2)].str))); 
-               if(atoi((yyvsp[(2) - (2)].str)) <= 0)
+               OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) <= 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->fast_server_num = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 5239 "util/configparser.c"
     break;
 
   case 449:
 #line 2282 "./util/configparser.y"
     { 
-               OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[(2) - (2)].str))); 
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); 
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 5251 "util/configparser.c"
     break;
 
   case 450:
 #line 2291 "./util/configparser.y"
     {
-               OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->qname_minimisation = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5264 "util/configparser.c"
     break;
 
   case 451:
 #line 2301 "./util/configparser.y"
     {
-               OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->qname_minimisation_strict = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5277 "util/configparser.c"
     break;
 
   case 452:
 #line 2311 "./util/configparser.y"
     {
        #ifdef USE_IPSECMOD
-               OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->ipsecmod_enabled = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               else cfg_parser->cfg->ipsecmod_enabled = (strcmp((yyvsp[0].str), "yes")==0);
        #else
                OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 5293 "util/configparser.c"
     break;
 
   case 453:
 #line 2324 "./util/configparser.y"
     {
        #ifdef USE_IPSECMOD
-               OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->ipsecmod_ignore_bogus = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
+               else cfg_parser->cfg->ipsecmod_ignore_bogus = (strcmp((yyvsp[0].str), "yes")==0);
        #else
                OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 5309 "util/configparser.c"
     break;
 
   case 454:
 #line 2337 "./util/configparser.y"
     {
        #ifdef USE_IPSECMOD
-               OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->ipsecmod_hook);
-               cfg_parser->cfg->ipsecmod_hook = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->ipsecmod_hook = (yyvsp[0].str);
        #else
                OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 5324 "util/configparser.c"
     break;
 
   case 455:
 #line 2349 "./util/configparser.y"
     {
        #ifdef USE_IPSECMOD
-               OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+               OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
                        yyerror("number expected");
-               else cfg_parser->cfg->ipsecmod_max_ttl = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ipsecmod_max_ttl = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 5341 "util/configparser.c"
     break;
 
   case 456:
 #line 2363 "./util/configparser.y"
     {
        #ifdef USE_IPSECMOD
-               OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->ipsecmod_whitelist, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->ipsecmod_whitelist, (yyvsp[0].str)))
                        yyerror("out of memory");
        #else
                OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 5356 "util/configparser.c"
     break;
 
   case 457:
 #line 2375 "./util/configparser.y"
     {
        #ifdef USE_IPSECMOD
-               OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->ipsecmod_strict = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->ipsecmod_strict = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 5373 "util/configparser.c"
     break;
 
   case 458:
 #line 2389 "./util/configparser.y"
     {
-               OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->stubs->name)
                        yyerror("stub name override, there must be one name "
                                "for one stub-zone");
                free(cfg_parser->cfg->stubs->name);
-               cfg_parser->cfg->stubs->name = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->stubs->name = (yyvsp[0].str);
        }
+#line 5386 "util/configparser.c"
     break;
 
   case 459:
 #line 2399 "./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)))
+               OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5396 "util/configparser.c"
     break;
 
   case 460:
 #line 2406 "./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)))
+               OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5406 "util/configparser.c"
     break;
 
   case 461:
 #line 2413 "./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)
+               OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5418 "util/configparser.c"
     break;
 
   case 462:
 #line 2422 "./util/configparser.y"
     {
-               OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5430 "util/configparser.c"
     break;
 
   case 463:
 #line 2431 "./util/configparser.y"
     {
-               OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->stubs->ssl_upstream = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5443 "util/configparser.c"
     break;
 
   case 464:
 #line 2441 "./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)
+               OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->stubs->isprime = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5456 "util/configparser.c"
     break;
 
   case 465:
 #line 2451 "./util/configparser.y"
     {
-               OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->forwards->name)
                        yyerror("forward name override, there must be one "
                                "name for one forward-zone");
                free(cfg_parser->cfg->forwards->name);
-               cfg_parser->cfg->forwards->name = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->forwards->name = (yyvsp[0].str);
        }
+#line 5469 "util/configparser.c"
     break;
 
   case 466:
 #line 2461 "./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)))
+               OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5479 "util/configparser.c"
     break;
 
   case 467:
 #line 2468 "./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)))
+               OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5489 "util/configparser.c"
     break;
 
   case 468:
 #line 2475 "./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)
+               OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5501 "util/configparser.c"
     break;
 
   case 469:
 #line 2484 "./util/configparser.y"
     {
-               OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5513 "util/configparser.c"
     break;
 
   case 470:
 #line 2493 "./util/configparser.y"
     {
-               OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->forwards->ssl_upstream = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5526 "util/configparser.c"
     break;
 
   case 471:
 #line 2503 "./util/configparser.y"
     {
-               OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->auths->name)
                        yyerror("auth name override, there must be one name "
                                "for one auth-zone");
                free(cfg_parser->cfg->auths->name);
-               cfg_parser->cfg->auths->name = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->auths->name = (yyvsp[0].str);
        }
+#line 5539 "util/configparser.c"
     break;
 
   case 472:
 #line 2513 "./util/configparser.y"
     {
-               OUTYY(("P(zonefile:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->auths->zonefile);
-               cfg_parser->cfg->auths->zonefile = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
        }
+#line 5549 "util/configparser.c"
     break;
 
   case 473:
 #line 2520 "./util/configparser.y"
     {
-               OUTYY(("P(master:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5559 "util/configparser.c"
     break;
 
   case 474:
 #line 2527 "./util/configparser.y"
     {
-               OUTYY(("P(url:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5569 "util/configparser.c"
     break;
 
   case 475:
 #line 2534 "./util/configparser.y"
     {
-               OUTYY(("P(allow-notify:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
-                       (yyvsp[(2) - (2)].str)))
+                       (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5580 "util/configparser.c"
     break;
 
   case 476:
 #line 2542 "./util/configparser.y"
     {
-               OUTYY(("P(for-downstream:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->auths->for_downstream =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5593 "util/configparser.c"
     break;
 
   case 477:
 #line 2552 "./util/configparser.y"
     {
-               OUTYY(("P(for-upstream:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->auths->for_upstream =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5606 "util/configparser.c"
     break;
 
   case 478:
 #line 2562 "./util/configparser.y"
     {
-               OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->auths->fallback_enabled =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5619 "util/configparser.c"
     break;
 
   case 479:
 #line 2572 "./util/configparser.y"
     {
-               OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
                if(cfg_parser->cfg->views->name)
                        yyerror("view name override, there must be one "
                                "name for one view");
                free(cfg_parser->cfg->views->name);
-               cfg_parser->cfg->views->name = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->views->name = (yyvsp[0].str);
        }
+#line 5632 "util/configparser.c"
     break;
 
   case 480:
 #line 2582 "./util/configparser.y"
     {
-               OUTYY(("P(view_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 &&
-                  strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 && strcmp((yyvsp[(3) - (3)].str), "redirect")!=0 &&
-                  strcmp((yyvsp[(3) - (3)].str), "transparent")!=0 && strcmp((yyvsp[(3) - (3)].str), "nodefault")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "typetransparent")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "always_transparent")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "always_refuse")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "always_nxdomain")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "noview")!=0
-                  && strcmp((yyvsp[(3) - (3)].str), "inform")!=0 && strcmp((yyvsp[(3) - (3)].str), "inform_deny")!=0) {
+               OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
+                  strcmp((yyvsp[0].str), "refuse")!=0 && strcmp((yyvsp[0].str), "redirect")!=0 &&
+                  strcmp((yyvsp[0].str), "transparent")!=0 && strcmp((yyvsp[0].str), "nodefault")!=0
+                  && strcmp((yyvsp[0].str), "typetransparent")!=0
+                  && strcmp((yyvsp[0].str), "always_transparent")!=0
+                  && strcmp((yyvsp[0].str), "always_refuse")!=0
+                  && strcmp((yyvsp[0].str), "always_nxdomain")!=0
+                  && strcmp((yyvsp[0].str), "noview")!=0
+                  && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0) {
                        yyerror("local-zone type: expected static, deny, "
                                "refuse, redirect, transparent, "
                                "typetransparent, inform, inform_deny, "
                                "always_transparent, always_refuse, "
                                "always_nxdomain, noview or nodefault");
-                       free((yyvsp[(2) - (3)].str));
-                       free((yyvsp[(3) - (3)].str));
-               } else if(strcmp((yyvsp[(3) - (3)].str), "nodefault")==0) {
+                       free((yyvsp[-1].str));
+                       free((yyvsp[0].str));
+               } else if(strcmp((yyvsp[0].str), "nodefault")==0) {
                        if(!cfg_strlist_insert(&cfg_parser->cfg->views->
-                               local_zones_nodefault, (yyvsp[(2) - (3)].str)))
+                               local_zones_nodefault, (yyvsp[-1].str)))
                                fatal_exit("out of memory adding local-zone");
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[0].str));
 #ifdef USE_IPSET
-               } else if(strcmp((yyvsp[(3) - (3)].str), "ipset")==0) {
+               } else if(strcmp((yyvsp[0].str), "ipset")==0) {
                        if(!cfg_strlist_insert(&cfg_parser->cfg->views->
-                               local_zones_ipset, (yyvsp[(2) - (3)].str)))
+                               local_zones_ipset, (yyvsp[-1].str)))
                                fatal_exit("out of memory adding local-zone");
-                       free((yyvsp[(3) - (3)].str));
+                       free((yyvsp[0].str));
 #endif
                } else {
                        if(!cfg_str2list_insert(
                                &cfg_parser->cfg->views->local_zones, 
-                               (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                               (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding local-zone");
                }
        }
+#line 5674 "util/configparser.c"
     break;
 
   case 481:
 #line 2621 "./util/configparser.y"
     {
-               OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
-               validate_respip_action((yyvsp[(3) - (3)].str));
+               OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               validate_respip_action((yyvsp[0].str));
                if(!cfg_str2list_insert(
-                       &cfg_parser->cfg->views->respip_actions, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                       &cfg_parser->cfg->views->respip_actions, (yyvsp[-1].str), (yyvsp[0].str)))
                        fatal_exit("out of memory adding per-view "
                                "response-ip action");
        }
+#line 5687 "util/configparser.c"
     break;
 
   case 482:
 #line 2631 "./util/configparser.y"
     {
-               OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[(2) - (3)].str)));
+               OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
                if(!cfg_str2list_insert(
-                       &cfg_parser->cfg->views->respip_data, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                       &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
                        fatal_exit("out of memory adding response-ip-data");
        }
+#line 5698 "util/configparser.c"
     break;
 
   case 483:
 #line 2639 "./util/configparser.y"
     {
-               OUTYY(("P(view_local_data:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[(2) - (2)].str))) {
+               OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
                        fatal_exit("out of memory adding local-data");
                }
        }
+#line 5709 "util/configparser.c"
     break;
 
   case 484:
 #line 2647 "./util/configparser.y"
     {
                char* ptr;
-               OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
-               ptr = cfg_ptr_reverse((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
+               ptr = cfg_ptr_reverse((yyvsp[0].str));
+               free((yyvsp[0].str));
                if(ptr) {
                        if(!cfg_strlist_insert(&cfg_parser->cfg->views->
                                local_data, ptr))
@@ -5801,17 +5723,19 @@ yyreduce:
                        yyerror("local-data-ptr could not be reversed");
                }
        }
+#line 5727 "util/configparser.c"
     break;
 
   case 485:
 #line 2662 "./util/configparser.y"
     {
-               OUTYY(("P(view-first:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5739 "util/configparser.c"
     break;
 
   case 486:
@@ -5819,83 +5743,92 @@ yyreduce:
     { 
                OUTYY(("\nP(remote-control:)\n")); 
        }
+#line 5747 "util/configparser.c"
     break;
 
   case 497:
 #line 2682 "./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)
+               OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->remote_control_enable = 
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5760 "util/configparser.c"
     break;
 
   case 498:
 #line 2692 "./util/configparser.y"
     {
-               OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("control port number expected");
-               else cfg_parser->cfg->control_port = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 5772 "util/configparser.c"
     break;
 
   case 499:
 #line 2701 "./util/configparser.y"
     {
-               OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 5782 "util/configparser.c"
     break;
 
   case 500:
 #line 2708 "./util/configparser.y"
     {
-               OUTYY(("P(control_use_cert:%s)\n", (yyvsp[(2) - (2)].str)));
-               cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
+               cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5792 "util/configparser.c"
     break;
 
   case 501:
 #line 2715 "./util/configparser.y"
     {
-               OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->server_key_file);
-               cfg_parser->cfg->server_key_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->server_key_file = (yyvsp[0].str);
        }
+#line 5802 "util/configparser.c"
     break;
 
   case 502:
 #line 2722 "./util/configparser.y"
     {
-               OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->server_cert_file);
-               cfg_parser->cfg->server_cert_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
        }
+#line 5812 "util/configparser.c"
     break;
 
   case 503:
 #line 2729 "./util/configparser.y"
     {
-               OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->control_key_file);
-               cfg_parser->cfg->control_key_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->control_key_file = (yyvsp[0].str);
        }
+#line 5822 "util/configparser.c"
     break;
 
   case 504:
 #line 2736 "./util/configparser.y"
     {
-               OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->control_cert_file);
-               cfg_parser->cfg->control_cert_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
        }
+#line 5832 "util/configparser.c"
     break;
 
   case 505:
@@ -5903,194 +5836,213 @@ yyreduce:
     {
                OUTYY(("\nP(dnstap:)\n"));
        }
+#line 5840 "util/configparser.c"
     break;
 
   case 526:
 #line 2763 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->dnstap = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5852 "util/configparser.c"
     break;
 
   case 527:
 #line 2772 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_socket_path);
-               cfg_parser->cfg->dnstap_socket_path = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
        }
+#line 5862 "util/configparser.c"
     break;
 
   case 528:
 #line 2779 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_ip);
-               cfg_parser->cfg->dnstap_ip = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
        }
+#line 5872 "util/configparser.c"
     break;
 
   case 529:
 #line 2786 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5884 "util/configparser.c"
     break;
 
   case 530:
 #line 2795 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_tls_server_name);
-               cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
        }
+#line 5894 "util/configparser.c"
     break;
 
   case 531:
 #line 2802 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_tls_cert_bundle);
-               cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
        }
+#line 5904 "util/configparser.c"
     break;
 
   case 532:
 #line 2809 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_tls_client_key_file);
-               cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
        }
+#line 5914 "util/configparser.c"
     break;
 
   case 533:
 #line 2816 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_tls_client_cert_file);
-               cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
        }
+#line 5924 "util/configparser.c"
     break;
 
   case 534:
 #line 2823 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5936 "util/configparser.c"
     break;
 
   case 535:
 #line 2832 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5948 "util/configparser.c"
     break;
 
   case 536:
 #line 2841 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_identity);
-               cfg_parser->cfg->dnstap_identity = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
        }
+#line 5958 "util/configparser.c"
     break;
 
   case 537:
 #line 2848 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnstap_version);
-               cfg_parser->cfg->dnstap_version = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
        }
+#line 5968 "util/configparser.c"
     break;
 
   case 538:
 #line 2855 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_log_resolver_query_messages =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5981 "util/configparser.c"
     break;
 
   case 539:
 #line 2865 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_log_resolver_response_messages =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 5994 "util/configparser.c"
     break;
 
   case 540:
 #line 2875 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_log_client_query_messages =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 6007 "util/configparser.c"
     break;
 
   case 541:
 #line 2885 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_log_client_response_messages =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 6020 "util/configparser.c"
     break;
 
   case 542:
 #line 2895 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_log_forwarder_query_messages =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 6033 "util/configparser.c"
     break;
 
   case 543:
 #line 2905 "./util/configparser.y"
     {
-               OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->dnstap_log_forwarder_response_messages =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 6046 "util/configparser.c"
     break;
 
   case 544:
@@ -6098,57 +6050,63 @@ yyreduce:
     { 
                OUTYY(("\nP(python:)\n")); 
        }
+#line 6054 "util/configparser.c"
     break;
 
   case 548:
 #line 2924 "./util/configparser.y"
     {
-               OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
                        yyerror("out of memory");
        }
+#line 6064 "util/configparser.c"
     break;
 
   case 549:
 #line 2930 "./util/configparser.y"
     {
-               OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[(2) - (2)].str)));
-               if (strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
+               if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
                else cfg_parser->cfg->disable_dnssec_lame_check =
-                       (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+                       (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 6077 "util/configparser.c"
     break;
 
   case 550:
 #line 2940 "./util/configparser.y"
     {
-               OUTYY(("P(server_log_identity:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->log_identity);
-               cfg_parser->cfg->log_identity = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->log_identity = (yyvsp[0].str);
        }
+#line 6087 "util/configparser.c"
     break;
 
   case 551:
 #line 2947 "./util/configparser.y"
     {
-               OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
-               validate_respip_action((yyvsp[(3) - (3)].str));
+               OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               validate_respip_action((yyvsp[0].str));
                if(!cfg_str2list_insert(&cfg_parser->cfg->respip_actions,
-                       (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                       (yyvsp[-1].str), (yyvsp[0].str)))
                        fatal_exit("out of memory adding response-ip");
        }
+#line 6099 "util/configparser.c"
     break;
 
   case 552:
 #line 2956 "./util/configparser.y"
     {
-               OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[(2) - (3)].str)));
+               OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
                if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
-                       (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                       (yyvsp[-1].str), (yyvsp[0].str)))
                        fatal_exit("out of memory adding response-ip-data");
        }
+#line 6110 "util/configparser.c"
     break;
 
   case 553:
@@ -6156,118 +6114,129 @@ yyreduce:
     {
                OUTYY(("\nP(dnscrypt:)\n"));
        }
+#line 6118 "util/configparser.c"
     break;
 
   case 566:
 #line 2980 "./util/configparser.y"
     {
-               OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
+               OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
+               if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
                        yyerror("expected yes or no.");
-               else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[(2) - (2)].str), "yes")==0);
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
+               free((yyvsp[0].str));
        }
+#line 6130 "util/configparser.c"
     break;
 
   case 567:
 #line 2990 "./util/configparser.y"
     {
-               OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("port number expected");
-               else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[(2) - (2)].str));
-               free((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
+               free((yyvsp[0].str));
        }
+#line 6142 "util/configparser.c"
     break;
 
   case 568:
 #line 2999 "./util/configparser.y"
     {
-               OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->dnscrypt_provider);
-               cfg_parser->cfg->dnscrypt_provider = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
        }
+#line 6152 "util/configparser.c"
     break;
 
   case 569:
 #line 3006 "./util/configparser.y"
     {
-               OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[(2) - (2)].str)))
-                       log_warn("dnscrypt-provider-cert %s is a duplicate", (yyvsp[(2) - (2)].str));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
+               if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
+                       log_warn("dnscrypt-provider-cert %s is a duplicate", (yyvsp[0].str));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
                        fatal_exit("out of memory adding dnscrypt-provider-cert");
        }
+#line 6164 "util/configparser.c"
     break;
 
   case 570:
 #line 3015 "./util/configparser.y"
     {
-               OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
                        fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
        }
+#line 6174 "util/configparser.c"
     break;
 
   case 571:
 #line 3022 "./util/configparser.y"
     {
-               OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[(2) - (2)].str)))
-                       log_warn("dnscrypt-secret-key: %s is a duplicate", (yyvsp[(2) - (2)].str));
-               if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[(2) - (2)].str)))
+               OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
+               if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
+                       log_warn("dnscrypt-secret-key: %s is a duplicate", (yyvsp[0].str));
+               if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
                        fatal_exit("out of memory adding dnscrypt-secret-key");
        }
+#line 6186 "util/configparser.c"
     break;
 
   case 572:
 #line 3031 "./util/configparser.y"
     {
-       OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
+       OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
+       if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
                yyerror("memory size expected");
-       free((yyvsp[(2) - (2)].str));
+       free((yyvsp[0].str));
   }
+#line 6197 "util/configparser.c"
     break;
 
   case 573:
 #line 3039 "./util/configparser.y"
     {
-       OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(atoi((yyvsp[(2) - (2)].str)) == 0)
+       OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
+       if(atoi((yyvsp[0].str)) == 0)
                yyerror("number expected");
        else {
-               cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs = atoi((yyvsp[(2) - (2)].str));
+               cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs = atoi((yyvsp[0].str));
                if(!is_pow2(cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs))
                        yyerror("must be a power of 2");
        }
-       free((yyvsp[(2) - (2)].str));
+       free((yyvsp[0].str));
   }
+#line 6213 "util/configparser.c"
     break;
 
   case 574:
 #line 3052 "./util/configparser.y"
     {
-       OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
+       OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
+       if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
                yyerror("memory size expected");
-       free((yyvsp[(2) - (2)].str));
+       free((yyvsp[0].str));
   }
+#line 6224 "util/configparser.c"
     break;
 
   case 575:
 #line 3060 "./util/configparser.y"
     {
-       OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
-       if(atoi((yyvsp[(2) - (2)].str)) == 0)
+       OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
+       if(atoi((yyvsp[0].str)) == 0)
                yyerror("number expected");
        else {
-               cfg_parser->cfg->dnscrypt_nonce_cache_slabs = atoi((yyvsp[(2) - (2)].str));
+               cfg_parser->cfg->dnscrypt_nonce_cache_slabs = atoi((yyvsp[0].str));
                if(!is_pow2(cfg_parser->cfg->dnscrypt_nonce_cache_slabs))
                        yyerror("must be a power of 2");
        }
-       free((yyvsp[(2) - (2)].str));
+       free((yyvsp[0].str));
   }
+#line 6240 "util/configparser.c"
     break;
 
   case 576:
@@ -6275,48 +6244,52 @@ yyreduce:
     {
                OUTYY(("\nP(cachedb:)\n"));
        }
+#line 6248 "util/configparser.c"
     break;
 
   case 584:
 #line 3083 "./util/configparser.y"
     {
        #ifdef USE_CACHEDB
-               OUTYY(("P(backend:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->cachedb_backend);
-               cfg_parser->cfg->cachedb_backend = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->cachedb_backend = (yyvsp[0].str);
        #else
                OUTYY(("P(Compiled without cachedb, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 6263 "util/configparser.c"
     break;
 
   case 585:
 #line 3095 "./util/configparser.y"
     {
        #ifdef USE_CACHEDB
-               OUTYY(("P(secret-seed:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->cachedb_secret);
-               cfg_parser->cfg->cachedb_secret = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->cachedb_secret = (yyvsp[0].str);
        #else
                OUTYY(("P(Compiled without cachedb, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 6278 "util/configparser.c"
     break;
 
   case 586:
 #line 3107 "./util/configparser.y"
     {
        #if defined(USE_CACHEDB) && defined(USE_REDIS)
-               OUTYY(("P(redis_server_host:%s)\n", (yyvsp[(2) - (2)].str)));
+               OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
                free(cfg_parser->cfg->redis_server_host);
-               cfg_parser->cfg->redis_server_host = (yyvsp[(2) - (2)].str);
+               cfg_parser->cfg->redis_server_host = (yyvsp[0].str);
        #else
                OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        #endif
        }
+#line 6293 "util/configparser.c"
     break;
 
   case 587:
@@ -6324,44 +6297,47 @@ yyreduce:
     {
        #if defined(USE_CACHEDB) && defined(USE_REDIS)
                int port;
-               OUTYY(("P(redis_server_port:%s)\n", (yyvsp[(2) - (2)].str)));
-               port = atoi((yyvsp[(2) - (2)].str));
+               OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str)));
+               port = atoi((yyvsp[0].str));
                if(port == 0 || port < 0 || port > 65535)
                        yyerror("valid redis server port number expected");
                else cfg_parser->cfg->redis_server_port = port;
        #else
                OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 6311 "util/configparser.c"
     break;
 
   case 588:
 #line 3134 "./util/configparser.y"
     {
        #if defined(USE_CACHEDB) && defined(USE_REDIS)
-               OUTYY(("P(redis_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
-               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+               OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
+               if(atoi((yyvsp[0].str)) == 0)
                        yyerror("redis timeout value expected");
-               else cfg_parser->cfg->redis_timeout = atoi((yyvsp[(2) - (2)].str));
+               else cfg_parser->cfg->redis_timeout = atoi((yyvsp[0].str));
        #else
                OUTYY(("P(Compiled without cachedb or redis, ignoring)\n"));
        #endif
-               free((yyvsp[(2) - (2)].str));
+               free((yyvsp[0].str));
        }
+#line 6327 "util/configparser.c"
     break;
 
   case 589:
 #line 3147 "./util/configparser.y"
     {
-               OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
-               if (atoi((yyvsp[(3) - (3)].str)) < 0)
+               OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
+               if (atoi((yyvsp[0].str)) < 0)
                        yyerror("positive number expected");
                else {
-                       if(!cfg_str2list_insert(&cfg_parser->cfg->tcp_connection_limits, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                       if(!cfg_str2list_insert(&cfg_parser->cfg->tcp_connection_limits, (yyvsp[-1].str), (yyvsp[0].str)))
                                fatal_exit("out of memory adding tcp connection limit");
                }
        }
+#line 6341 "util/configparser.c"
     break;
 
   case 590:
@@ -6369,47 +6345,61 @@ yyreduce:
     {
                        OUTYY(("\nP(ipset:)\n"));
                }
+#line 6349 "util/configparser.c"
     break;
 
   case 595:
 #line 3167 "./util/configparser.y"
     {
                #ifdef USE_IPSET
-                       OUTYY(("P(name-v4:%s)\n", (yyvsp[(2) - (2)].str)));
+                       OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
                        if(cfg_parser->cfg->ipset_name_v4)
                                yyerror("ipset name v4 override, there must be one "
                                        "name for ip v4");
                        free(cfg_parser->cfg->ipset_name_v4);
-                       cfg_parser->cfg->ipset_name_v4 = (yyvsp[(2) - (2)].str);
+                       cfg_parser->cfg->ipset_name_v4 = (yyvsp[0].str);
                #else
                        OUTYY(("P(Compiled without ipset, ignoring)\n"));
-                       free((yyvsp[(2) - (2)].str));
+                       free((yyvsp[0].str));
                #endif
                }
+#line 6367 "util/configparser.c"
     break;
 
   case 596:
 #line 3182 "./util/configparser.y"
     {
                #ifdef USE_IPSET
-                       OUTYY(("P(name-v6:%s)\n", (yyvsp[(2) - (2)].str)));
+                       OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
                        if(cfg_parser->cfg->ipset_name_v6)
                                yyerror("ipset name v6 override, there must be one "
                                        "name for ip v6");
                        free(cfg_parser->cfg->ipset_name_v6);
-                       cfg_parser->cfg->ipset_name_v6 = (yyvsp[(2) - (2)].str);
+                       cfg_parser->cfg->ipset_name_v6 = (yyvsp[0].str);
                #else
                        OUTYY(("P(Compiled without ipset, ignoring)\n"));
-                       free((yyvsp[(2) - (2)].str));
+                       free((yyvsp[0].str));
                #endif
                }
+#line 6385 "util/configparser.c"
     break;
 
 
-/* Line 1267 of yacc.c.  */
-#line 6411 "util/configparser.c"
+#line 6389 "util/configparser.c"
+
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -6418,26 +6408,28 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+  {
+    const int yylhs = yyr1[yyn] - YYNTOKENS;
+    const int yyi = yypgoto[yylhs] + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+               ? yytable[yyi]
+               : yydefgoto[yylhs]);
+  }
 
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -6445,37 +6437,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-       if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-         {
-           YYSIZE_T yyalloc = 2 * yysize;
-           if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-             yyalloc = YYSTACK_ALLOC_MAXIMUM;
-           if (yymsg != yymsgbuf)
-             YYSTACK_FREE (yymsg);
-           yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-           if (yymsg)
-             yymsg_alloc = yyalloc;
-           else
-             {
-               yymsg = yymsgbuf;
-               yymsg_alloc = sizeof yymsgbuf;
-             }
-         }
-
-       if (0 < yysize && yysize <= yymsg_alloc)
-         {
-           (void) yysyntax_error (yymsg, yystate, yychar);
-           yyerror (yymsg);
-         }
-       else
-         {
-           yyerror (YY_("syntax error"));
-           if (yysize != 0)
-             goto yyexhaustedlab;
-         }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -6483,24 +6474,24 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
-        error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-       {
-         /* Return failure if at end of input.  */
-         if (yychar == YYEOF)
-           YYABORT;
-       }
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-       {
-         yydestruct ("Error: discarding",
-                     yytoken, &yylval);
-         yychar = YYEMPTY;
-       }
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -6509,14 +6500,12 @@ yyerrlab:
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
+  /* Pacify compilers when the user code never invokes YYERROR and the
+     label yyerrorlab therefore never appears in user code.  */
+  if (0)
+    YYERROR;
 
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -6529,38 +6518,37 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;     /* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-       {
-         yyn += YYTERROR;
-         if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-           {
-             yyn = yytable[yyn];
-             if (0 < yyn)
-               break;
-           }
-       }
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-       YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-                 yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -6577,6 +6565,7 @@ yyacceptlab:
   yyresult = 0;
   goto yyreturn;
 
+
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
@@ -6584,7 +6573,8 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -6594,18 +6584,27 @@ yyexhaustedlab:
   /* Fall through.  */
 #endif
 
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result.  |
+`-----------------------------------------------------*/
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-                yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                 yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -6616,11 +6615,8 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
 #line 3196 "./util/configparser.y"
 
 
@@ -6643,4 +6639,3 @@ validate_respip_action(const char* action)
 }
 
 
-

diff --git a/util/configparser.h b/util/configparser.h
index 194bf10694375224ec912b6772018add34f6e3a8..f5958de4b87bc33a827a5cae7a4e884f4c595396 100644 (file)
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -33,296 +31,308 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Tokens.  */
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
+#ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
+# define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     SPACE = 258,
-     LETTER = 259,
-     NEWLINE = 260,
-     COMMENT = 261,
-     COLON = 262,
-     ANY = 263,
-     ZONESTR = 264,
-     STRING_ARG = 265,
-     VAR_SERVER = 266,
-     VAR_VERBOSITY = 267,
-     VAR_NUM_THREADS = 268,
-     VAR_PORT = 269,
-     VAR_OUTGOING_RANGE = 270,
-     VAR_INTERFACE = 271,
-     VAR_PREFER_IP4 = 272,
-     VAR_DO_IP4 = 273,
-     VAR_DO_IP6 = 274,
-     VAR_PREFER_IP6 = 275,
-     VAR_DO_UDP = 276,
-     VAR_DO_TCP = 277,
-     VAR_TCP_MSS = 278,
-     VAR_OUTGOING_TCP_MSS = 279,
-     VAR_TCP_IDLE_TIMEOUT = 280,
-     VAR_EDNS_TCP_KEEPALIVE = 281,
-     VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282,
-     VAR_CHROOT = 283,
-     VAR_USERNAME = 284,
-     VAR_DIRECTORY = 285,
-     VAR_LOGFILE = 286,
-     VAR_PIDFILE = 287,
-     VAR_MSG_CACHE_SIZE = 288,
-     VAR_MSG_CACHE_SLABS = 289,
-     VAR_NUM_QUERIES_PER_THREAD = 290,
-     VAR_RRSET_CACHE_SIZE = 291,
-     VAR_RRSET_CACHE_SLABS = 292,
-     VAR_OUTGOING_NUM_TCP = 293,
-     VAR_INFRA_HOST_TTL = 294,
-     VAR_INFRA_LAME_TTL = 295,
-     VAR_INFRA_CACHE_SLABS = 296,
-     VAR_INFRA_CACHE_NUMHOSTS = 297,
-     VAR_INFRA_CACHE_LAME_SIZE = 298,
-     VAR_NAME = 299,
-     VAR_STUB_ZONE = 300,
-     VAR_STUB_HOST = 301,
-     VAR_STUB_ADDR = 302,
-     VAR_TARGET_FETCH_POLICY = 303,
-     VAR_HARDEN_SHORT_BUFSIZE = 304,
-     VAR_HARDEN_LARGE_QUERIES = 305,
-     VAR_FORWARD_ZONE = 306,
-     VAR_FORWARD_HOST = 307,
-     VAR_FORWARD_ADDR = 308,
-     VAR_DO_NOT_QUERY_ADDRESS = 309,
-     VAR_HIDE_IDENTITY = 310,
-     VAR_HIDE_VERSION = 311,
-     VAR_IDENTITY = 312,
-     VAR_VERSION = 313,
-     VAR_HARDEN_GLUE = 314,
-     VAR_MODULE_CONF = 315,
-     VAR_TRUST_ANCHOR_FILE = 316,
-     VAR_TRUST_ANCHOR = 317,
-     VAR_VAL_OVERRIDE_DATE = 318,
-     VAR_BOGUS_TTL = 319,
-     VAR_VAL_CLEAN_ADDITIONAL = 320,
-     VAR_VAL_PERMISSIVE_MODE = 321,
-     VAR_INCOMING_NUM_TCP = 322,
-     VAR_MSG_BUFFER_SIZE = 323,
-     VAR_KEY_CACHE_SIZE = 324,
-     VAR_KEY_CACHE_SLABS = 325,
-     VAR_TRUSTED_KEYS_FILE = 326,
-     VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327,
-     VAR_USE_SYSLOG = 328,
-     VAR_OUTGOING_INTERFACE = 329,
-     VAR_ROOT_HINTS = 330,
-     VAR_DO_NOT_QUERY_LOCALHOST = 331,
-     VAR_CACHE_MAX_TTL = 332,
-     VAR_HARDEN_DNSSEC_STRIPPED = 333,
-     VAR_ACCESS_CONTROL = 334,
-     VAR_LOCAL_ZONE = 335,
-     VAR_LOCAL_DATA = 336,
-     VAR_INTERFACE_AUTOMATIC = 337,
-     VAR_STATISTICS_INTERVAL = 338,
-     VAR_DO_DAEMONIZE = 339,
-     VAR_USE_CAPS_FOR_ID = 340,
-     VAR_STATISTICS_CUMULATIVE = 341,
-     VAR_OUTGOING_PORT_PERMIT = 342,
-     VAR_OUTGOING_PORT_AVOID = 343,
-     VAR_DLV_ANCHOR_FILE = 344,
-     VAR_DLV_ANCHOR = 345,
-     VAR_NEG_CACHE_SIZE = 346,
-     VAR_HARDEN_REFERRAL_PATH = 347,
-     VAR_PRIVATE_ADDRESS = 348,
-     VAR_PRIVATE_DOMAIN = 349,
-     VAR_REMOTE_CONTROL = 350,
-     VAR_CONTROL_ENABLE = 351,
-     VAR_CONTROL_INTERFACE = 352,
-     VAR_CONTROL_PORT = 353,
-     VAR_SERVER_KEY_FILE = 354,
-     VAR_SERVER_CERT_FILE = 355,
-     VAR_CONTROL_KEY_FILE = 356,
-     VAR_CONTROL_CERT_FILE = 357,
-     VAR_CONTROL_USE_CERT = 358,
-     VAR_EXTENDED_STATISTICS = 359,
-     VAR_LOCAL_DATA_PTR = 360,
-     VAR_JOSTLE_TIMEOUT = 361,
-     VAR_STUB_PRIME = 362,
-     VAR_UNWANTED_REPLY_THRESHOLD = 363,
-     VAR_LOG_TIME_ASCII = 364,
-     VAR_DOMAIN_INSECURE = 365,
-     VAR_PYTHON = 366,
-     VAR_PYTHON_SCRIPT = 367,
-     VAR_VAL_SIG_SKEW_MIN = 368,
-     VAR_VAL_SIG_SKEW_MAX = 369,
-     VAR_CACHE_MIN_TTL = 370,
-     VAR_VAL_LOG_LEVEL = 371,
-     VAR_AUTO_TRUST_ANCHOR_FILE = 372,
-     VAR_KEEP_MISSING = 373,
-     VAR_ADD_HOLDDOWN = 374,
-     VAR_DEL_HOLDDOWN = 375,
-     VAR_SO_RCVBUF = 376,
-     VAR_EDNS_BUFFER_SIZE = 377,
-     VAR_PREFETCH = 378,
-     VAR_PREFETCH_KEY = 379,
-     VAR_SO_SNDBUF = 380,
-     VAR_SO_REUSEPORT = 381,
-     VAR_HARDEN_BELOW_NXDOMAIN = 382,
-     VAR_IGNORE_CD_FLAG = 383,
-     VAR_LOG_QUERIES = 384,
-     VAR_LOG_REPLIES = 385,
-     VAR_LOG_LOCAL_ACTIONS = 386,
-     VAR_TCP_UPSTREAM = 387,
-     VAR_SSL_UPSTREAM = 388,
-     VAR_SSL_SERVICE_KEY = 389,
-     VAR_SSL_SERVICE_PEM = 390,
-     VAR_SSL_PORT = 391,
-     VAR_FORWARD_FIRST = 392,
-     VAR_STUB_SSL_UPSTREAM = 393,
-     VAR_FORWARD_SSL_UPSTREAM = 394,
-     VAR_TLS_CERT_BUNDLE = 395,
-     VAR_STUB_FIRST = 396,
-     VAR_MINIMAL_RESPONSES = 397,
-     VAR_RRSET_ROUNDROBIN = 398,
-     VAR_MAX_UDP_SIZE = 399,
-     VAR_DELAY_CLOSE = 400,
-     VAR_UNBLOCK_LAN_ZONES = 401,
-     VAR_INSECURE_LAN_ZONES = 402,
-     VAR_INFRA_CACHE_MIN_RTT = 403,
-     VAR_DNS64_PREFIX = 404,
-     VAR_DNS64_SYNTHALL = 405,
-     VAR_DNS64_IGNORE_AAAA = 406,
-     VAR_DNSTAP = 407,
-     VAR_DNSTAP_ENABLE = 408,
-     VAR_DNSTAP_SOCKET_PATH = 409,
-     VAR_DNSTAP_IP = 410,
-     VAR_DNSTAP_TLS = 411,
-     VAR_DNSTAP_TLS_SERVER_NAME = 412,
-     VAR_DNSTAP_TLS_CERT_BUNDLE = 413,
-     VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414,
-     VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415,
-     VAR_DNSTAP_SEND_IDENTITY = 416,
-     VAR_DNSTAP_SEND_VERSION = 417,
-     VAR_DNSTAP_IDENTITY = 418,
-     VAR_DNSTAP_VERSION = 419,
-     VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420,
-     VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421,
-     VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422,
-     VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423,
-     VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424,
-     VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425,
-     VAR_RESPONSE_IP_TAG = 426,
-     VAR_RESPONSE_IP = 427,
-     VAR_RESPONSE_IP_DATA = 428,
-     VAR_HARDEN_ALGO_DOWNGRADE = 429,
-     VAR_IP_TRANSPARENT = 430,
-     VAR_IP_DSCP = 431,
-     VAR_DISABLE_DNSSEC_LAME_CHECK = 432,
-     VAR_IP_RATELIMIT = 433,
-     VAR_IP_RATELIMIT_SLABS = 434,
-     VAR_IP_RATELIMIT_SIZE = 435,
-     VAR_RATELIMIT = 436,
-     VAR_RATELIMIT_SLABS = 437,
-     VAR_RATELIMIT_SIZE = 438,
-     VAR_RATELIMIT_FOR_DOMAIN = 439,
-     VAR_RATELIMIT_BELOW_DOMAIN = 440,
-     VAR_IP_RATELIMIT_FACTOR = 441,
-     VAR_RATELIMIT_FACTOR = 442,
-     VAR_SEND_CLIENT_SUBNET = 443,
-     VAR_CLIENT_SUBNET_ZONE = 444,
-     VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445,
-     VAR_CLIENT_SUBNET_OPCODE = 446,
-     VAR_MAX_CLIENT_SUBNET_IPV4 = 447,
-     VAR_MAX_CLIENT_SUBNET_IPV6 = 448,
-     VAR_MIN_CLIENT_SUBNET_IPV4 = 449,
-     VAR_MIN_CLIENT_SUBNET_IPV6 = 450,
-     VAR_MAX_ECS_TREE_SIZE_IPV4 = 451,
-     VAR_MAX_ECS_TREE_SIZE_IPV6 = 452,
-     VAR_CAPS_WHITELIST = 453,
-     VAR_CACHE_MAX_NEGATIVE_TTL = 454,
-     VAR_PERMIT_SMALL_HOLDDOWN = 455,
-     VAR_QNAME_MINIMISATION = 456,
-     VAR_QNAME_MINIMISATION_STRICT = 457,
-     VAR_IP_FREEBIND = 458,
-     VAR_DEFINE_TAG = 459,
-     VAR_LOCAL_ZONE_TAG = 460,
-     VAR_ACCESS_CONTROL_TAG = 461,
-     VAR_LOCAL_ZONE_OVERRIDE = 462,
-     VAR_ACCESS_CONTROL_TAG_ACTION = 463,
-     VAR_ACCESS_CONTROL_TAG_DATA = 464,
-     VAR_VIEW = 465,
-     VAR_ACCESS_CONTROL_VIEW = 466,
-     VAR_VIEW_FIRST = 467,
-     VAR_SERVE_EXPIRED = 468,
-     VAR_SERVE_EXPIRED_TTL = 469,
-     VAR_SERVE_EXPIRED_TTL_RESET = 470,
-     VAR_SERVE_EXPIRED_REPLY_TTL = 471,
-     VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472,
-     VAR_FAKE_DSA = 473,
-     VAR_FAKE_SHA1 = 474,
-     VAR_LOG_IDENTITY = 475,
-     VAR_HIDE_TRUSTANCHOR = 476,
-     VAR_TRUST_ANCHOR_SIGNALING = 477,
-     VAR_AGGRESSIVE_NSEC = 478,
-     VAR_USE_SYSTEMD = 479,
-     VAR_SHM_ENABLE = 480,
-     VAR_SHM_KEY = 481,
-     VAR_ROOT_KEY_SENTINEL = 482,
-     VAR_DNSCRYPT = 483,
-     VAR_DNSCRYPT_ENABLE = 484,
-     VAR_DNSCRYPT_PORT = 485,
-     VAR_DNSCRYPT_PROVIDER = 486,
-     VAR_DNSCRYPT_SECRET_KEY = 487,
-     VAR_DNSCRYPT_PROVIDER_CERT = 488,
-     VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 489,
-     VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 490,
-     VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 491,
-     VAR_DNSCRYPT_NONCE_CACHE_SIZE = 492,
-     VAR_DNSCRYPT_NONCE_CACHE_SLABS = 493,
-     VAR_IPSECMOD_ENABLED = 494,
-     VAR_IPSECMOD_HOOK = 495,
-     VAR_IPSECMOD_IGNORE_BOGUS = 496,
-     VAR_IPSECMOD_MAX_TTL = 497,
-     VAR_IPSECMOD_WHITELIST = 498,
-     VAR_IPSECMOD_STRICT = 499,
-     VAR_CACHEDB = 500,
-     VAR_CACHEDB_BACKEND = 501,
-     VAR_CACHEDB_SECRETSEED = 502,
-     VAR_CACHEDB_REDISHOST = 503,
-     VAR_CACHEDB_REDISPORT = 504,
-     VAR_CACHEDB_REDISTIMEOUT = 505,
-     VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 506,
-     VAR_FOR_UPSTREAM = 507,
-     VAR_AUTH_ZONE = 508,
-     VAR_ZONEFILE = 509,
-     VAR_MASTER = 510,
-     VAR_URL = 511,
-     VAR_FOR_DOWNSTREAM = 512,
-     VAR_FALLBACK_ENABLED = 513,
-     VAR_TLS_ADDITIONAL_PORT = 514,
-     VAR_LOW_RTT = 515,
-     VAR_LOW_RTT_PERMIL = 516,
-     VAR_FAST_SERVER_PERMIL = 517,
-     VAR_FAST_SERVER_NUM = 518,
-     VAR_ALLOW_NOTIFY = 519,
-     VAR_TLS_WIN_CERT = 520,
-     VAR_TCP_CONNECTION_LIMIT = 521,
-     VAR_FORWARD_NO_CACHE = 522,
-     VAR_STUB_NO_CACHE = 523,
-     VAR_LOG_SERVFAIL = 524,
-     VAR_DENY_ANY = 525,
-     VAR_UNKNOWN_SERVER_TIME_LIMIT = 526,
-     VAR_LOG_TAG_QUERYREPLY = 527,
-     VAR_STREAM_WAIT_SIZE = 528,
-     VAR_TLS_CIPHERS = 529,
-     VAR_TLS_CIPHERSUITES = 530,
-     VAR_IPSET = 531,
-     VAR_IPSET_NAME_V4 = 532,
-     VAR_IPSET_NAME_V6 = 533,
-     VAR_TLS_SESSION_TICKET_KEYS = 534,
-     VAR_RPZ = 535,
-     VAR_TAGS = 536,
-     VAR_RPZ_ACTION_OVERRIDE = 537,
-     VAR_RPZ_CNAME_OVERRIDE = 538,
-     VAR_RPZ_LOG = 539,
-     VAR_RPZ_LOG_NAME = 540
-   };
+  enum yytokentype
+  {
+    SPACE = 258,
+    LETTER = 259,
+    NEWLINE = 260,
+    COMMENT = 261,
+    COLON = 262,
+    ANY = 263,
+    ZONESTR = 264,
+    STRING_ARG = 265,
+    VAR_SERVER = 266,
+    VAR_VERBOSITY = 267,
+    VAR_NUM_THREADS = 268,
+    VAR_PORT = 269,
+    VAR_OUTGOING_RANGE = 270,
+    VAR_INTERFACE = 271,
+    VAR_PREFER_IP4 = 272,
+    VAR_DO_IP4 = 273,
+    VAR_DO_IP6 = 274,
+    VAR_PREFER_IP6 = 275,
+    VAR_DO_UDP = 276,
+    VAR_DO_TCP = 277,
+    VAR_TCP_MSS = 278,
+    VAR_OUTGOING_TCP_MSS = 279,
+    VAR_TCP_IDLE_TIMEOUT = 280,
+    VAR_EDNS_TCP_KEEPALIVE = 281,
+    VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 282,
+    VAR_CHROOT = 283,
+    VAR_USERNAME = 284,
+    VAR_DIRECTORY = 285,
+    VAR_LOGFILE = 286,
+    VAR_PIDFILE = 287,
+    VAR_MSG_CACHE_SIZE = 288,
+    VAR_MSG_CACHE_SLABS = 289,
+    VAR_NUM_QUERIES_PER_THREAD = 290,
+    VAR_RRSET_CACHE_SIZE = 291,
+    VAR_RRSET_CACHE_SLABS = 292,
+    VAR_OUTGOING_NUM_TCP = 293,
+    VAR_INFRA_HOST_TTL = 294,
+    VAR_INFRA_LAME_TTL = 295,
+    VAR_INFRA_CACHE_SLABS = 296,
+    VAR_INFRA_CACHE_NUMHOSTS = 297,
+    VAR_INFRA_CACHE_LAME_SIZE = 298,
+    VAR_NAME = 299,
+    VAR_STUB_ZONE = 300,
+    VAR_STUB_HOST = 301,
+    VAR_STUB_ADDR = 302,
+    VAR_TARGET_FETCH_POLICY = 303,
+    VAR_HARDEN_SHORT_BUFSIZE = 304,
+    VAR_HARDEN_LARGE_QUERIES = 305,
+    VAR_FORWARD_ZONE = 306,
+    VAR_FORWARD_HOST = 307,
+    VAR_FORWARD_ADDR = 308,
+    VAR_DO_NOT_QUERY_ADDRESS = 309,
+    VAR_HIDE_IDENTITY = 310,
+    VAR_HIDE_VERSION = 311,
+    VAR_IDENTITY = 312,
+    VAR_VERSION = 313,
+    VAR_HARDEN_GLUE = 314,
+    VAR_MODULE_CONF = 315,
+    VAR_TRUST_ANCHOR_FILE = 316,
+    VAR_TRUST_ANCHOR = 317,
+    VAR_VAL_OVERRIDE_DATE = 318,
+    VAR_BOGUS_TTL = 319,
+    VAR_VAL_CLEAN_ADDITIONAL = 320,
+    VAR_VAL_PERMISSIVE_MODE = 321,
+    VAR_INCOMING_NUM_TCP = 322,
+    VAR_MSG_BUFFER_SIZE = 323,
+    VAR_KEY_CACHE_SIZE = 324,
+    VAR_KEY_CACHE_SLABS = 325,
+    VAR_TRUSTED_KEYS_FILE = 326,
+    VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 327,
+    VAR_USE_SYSLOG = 328,
+    VAR_OUTGOING_INTERFACE = 329,
+    VAR_ROOT_HINTS = 330,
+    VAR_DO_NOT_QUERY_LOCALHOST = 331,
+    VAR_CACHE_MAX_TTL = 332,
+    VAR_HARDEN_DNSSEC_STRIPPED = 333,
+    VAR_ACCESS_CONTROL = 334,
+    VAR_LOCAL_ZONE = 335,
+    VAR_LOCAL_DATA = 336,
+    VAR_INTERFACE_AUTOMATIC = 337,
+    VAR_STATISTICS_INTERVAL = 338,
+    VAR_DO_DAEMONIZE = 339,
+    VAR_USE_CAPS_FOR_ID = 340,
+    VAR_STATISTICS_CUMULATIVE = 341,
+    VAR_OUTGOING_PORT_PERMIT = 342,
+    VAR_OUTGOING_PORT_AVOID = 343,
+    VAR_DLV_ANCHOR_FILE = 344,
+    VAR_DLV_ANCHOR = 345,
+    VAR_NEG_CACHE_SIZE = 346,
+    VAR_HARDEN_REFERRAL_PATH = 347,
+    VAR_PRIVATE_ADDRESS = 348,
+    VAR_PRIVATE_DOMAIN = 349,
+    VAR_REMOTE_CONTROL = 350,
+    VAR_CONTROL_ENABLE = 351,
+    VAR_CONTROL_INTERFACE = 352,
+    VAR_CONTROL_PORT = 353,
+    VAR_SERVER_KEY_FILE = 354,
+    VAR_SERVER_CERT_FILE = 355,
+    VAR_CONTROL_KEY_FILE = 356,
+    VAR_CONTROL_CERT_FILE = 357,
+    VAR_CONTROL_USE_CERT = 358,
+    VAR_EXTENDED_STATISTICS = 359,
+    VAR_LOCAL_DATA_PTR = 360,
+    VAR_JOSTLE_TIMEOUT = 361,
+    VAR_STUB_PRIME = 362,
+    VAR_UNWANTED_REPLY_THRESHOLD = 363,
+    VAR_LOG_TIME_ASCII = 364,
+    VAR_DOMAIN_INSECURE = 365,
+    VAR_PYTHON = 366,
+    VAR_PYTHON_SCRIPT = 367,
+    VAR_VAL_SIG_SKEW_MIN = 368,
+    VAR_VAL_SIG_SKEW_MAX = 369,
+    VAR_CACHE_MIN_TTL = 370,
+    VAR_VAL_LOG_LEVEL = 371,
+    VAR_AUTO_TRUST_ANCHOR_FILE = 372,
+    VAR_KEEP_MISSING = 373,
+    VAR_ADD_HOLDDOWN = 374,
+    VAR_DEL_HOLDDOWN = 375,
+    VAR_SO_RCVBUF = 376,
+    VAR_EDNS_BUFFER_SIZE = 377,
+    VAR_PREFETCH = 378,
+    VAR_PREFETCH_KEY = 379,
+    VAR_SO_SNDBUF = 380,
+    VAR_SO_REUSEPORT = 381,
+    VAR_HARDEN_BELOW_NXDOMAIN = 382,
+    VAR_IGNORE_CD_FLAG = 383,
+    VAR_LOG_QUERIES = 384,
+    VAR_LOG_REPLIES = 385,
+    VAR_LOG_LOCAL_ACTIONS = 386,
+    VAR_TCP_UPSTREAM = 387,
+    VAR_SSL_UPSTREAM = 388,
+    VAR_SSL_SERVICE_KEY = 389,
+    VAR_SSL_SERVICE_PEM = 390,
+    VAR_SSL_PORT = 391,
+    VAR_FORWARD_FIRST = 392,
+    VAR_STUB_SSL_UPSTREAM = 393,
+    VAR_FORWARD_SSL_UPSTREAM = 394,
+    VAR_TLS_CERT_BUNDLE = 395,
+    VAR_STUB_FIRST = 396,
+    VAR_MINIMAL_RESPONSES = 397,
+    VAR_RRSET_ROUNDROBIN = 398,
+    VAR_MAX_UDP_SIZE = 399,
+    VAR_DELAY_CLOSE = 400,
+    VAR_UNBLOCK_LAN_ZONES = 401,
+    VAR_INSECURE_LAN_ZONES = 402,
+    VAR_INFRA_CACHE_MIN_RTT = 403,
+    VAR_DNS64_PREFIX = 404,
+    VAR_DNS64_SYNTHALL = 405,
+    VAR_DNS64_IGNORE_AAAA = 406,
+    VAR_DNSTAP = 407,
+    VAR_DNSTAP_ENABLE = 408,
+    VAR_DNSTAP_SOCKET_PATH = 409,
+    VAR_DNSTAP_IP = 410,
+    VAR_DNSTAP_TLS = 411,
+    VAR_DNSTAP_TLS_SERVER_NAME = 412,
+    VAR_DNSTAP_TLS_CERT_BUNDLE = 413,
+    VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 414,
+    VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 415,
+    VAR_DNSTAP_SEND_IDENTITY = 416,
+    VAR_DNSTAP_SEND_VERSION = 417,
+    VAR_DNSTAP_IDENTITY = 418,
+    VAR_DNSTAP_VERSION = 419,
+    VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 420,
+    VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 421,
+    VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 422,
+    VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 423,
+    VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 424,
+    VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 425,
+    VAR_RESPONSE_IP_TAG = 426,
+    VAR_RESPONSE_IP = 427,
+    VAR_RESPONSE_IP_DATA = 428,
+    VAR_HARDEN_ALGO_DOWNGRADE = 429,
+    VAR_IP_TRANSPARENT = 430,
+    VAR_IP_DSCP = 431,
+    VAR_DISABLE_DNSSEC_LAME_CHECK = 432,
+    VAR_IP_RATELIMIT = 433,
+    VAR_IP_RATELIMIT_SLABS = 434,
+    VAR_IP_RATELIMIT_SIZE = 435,
+    VAR_RATELIMIT = 436,
+    VAR_RATELIMIT_SLABS = 437,
+    VAR_RATELIMIT_SIZE = 438,
+    VAR_RATELIMIT_FOR_DOMAIN = 439,
+    VAR_RATELIMIT_BELOW_DOMAIN = 440,
+    VAR_IP_RATELIMIT_FACTOR = 441,
+    VAR_RATELIMIT_FACTOR = 442,
+    VAR_SEND_CLIENT_SUBNET = 443,
+    VAR_CLIENT_SUBNET_ZONE = 444,
+    VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 445,
+    VAR_CLIENT_SUBNET_OPCODE = 446,
+    VAR_MAX_CLIENT_SUBNET_IPV4 = 447,
+    VAR_MAX_CLIENT_SUBNET_IPV6 = 448,
+    VAR_MIN_CLIENT_SUBNET_IPV4 = 449,
+    VAR_MIN_CLIENT_SUBNET_IPV6 = 450,
+    VAR_MAX_ECS_TREE_SIZE_IPV4 = 451,
+    VAR_MAX_ECS_TREE_SIZE_IPV6 = 452,
+    VAR_CAPS_WHITELIST = 453,
+    VAR_CACHE_MAX_NEGATIVE_TTL = 454,
+    VAR_PERMIT_SMALL_HOLDDOWN = 455,
+    VAR_QNAME_MINIMISATION = 456,
+    VAR_QNAME_MINIMISATION_STRICT = 457,
+    VAR_IP_FREEBIND = 458,
+    VAR_DEFINE_TAG = 459,
+    VAR_LOCAL_ZONE_TAG = 460,
+    VAR_ACCESS_CONTROL_TAG = 461,
+    VAR_LOCAL_ZONE_OVERRIDE = 462,
+    VAR_ACCESS_CONTROL_TAG_ACTION = 463,
+    VAR_ACCESS_CONTROL_TAG_DATA = 464,
+    VAR_VIEW = 465,
+    VAR_ACCESS_CONTROL_VIEW = 466,
+    VAR_VIEW_FIRST = 467,
+    VAR_SERVE_EXPIRED = 468,
+    VAR_SERVE_EXPIRED_TTL = 469,
+    VAR_SERVE_EXPIRED_TTL_RESET = 470,
+    VAR_SERVE_EXPIRED_REPLY_TTL = 471,
+    VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 472,
+    VAR_FAKE_DSA = 473,
+    VAR_FAKE_SHA1 = 474,
+    VAR_LOG_IDENTITY = 475,
+    VAR_HIDE_TRUSTANCHOR = 476,
+    VAR_TRUST_ANCHOR_SIGNALING = 477,
+    VAR_AGGRESSIVE_NSEC = 478,
+    VAR_USE_SYSTEMD = 479,
+    VAR_SHM_ENABLE = 480,
+    VAR_SHM_KEY = 481,
+    VAR_ROOT_KEY_SENTINEL = 482,
+    VAR_DNSCRYPT = 483,
+    VAR_DNSCRYPT_ENABLE = 484,
+    VAR_DNSCRYPT_PORT = 485,
+    VAR_DNSCRYPT_PROVIDER = 486,
+    VAR_DNSCRYPT_SECRET_KEY = 487,
+    VAR_DNSCRYPT_PROVIDER_CERT = 488,
+    VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 489,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 490,
+    VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 491,
+    VAR_DNSCRYPT_NONCE_CACHE_SIZE = 492,
+    VAR_DNSCRYPT_NONCE_CACHE_SLABS = 493,
+    VAR_IPSECMOD_ENABLED = 494,
+    VAR_IPSECMOD_HOOK = 495,
+    VAR_IPSECMOD_IGNORE_BOGUS = 496,
+    VAR_IPSECMOD_MAX_TTL = 497,
+    VAR_IPSECMOD_WHITELIST = 498,
+    VAR_IPSECMOD_STRICT = 499,
+    VAR_CACHEDB = 500,
+    VAR_CACHEDB_BACKEND = 501,
+    VAR_CACHEDB_SECRETSEED = 502,
+    VAR_CACHEDB_REDISHOST = 503,
+    VAR_CACHEDB_REDISPORT = 504,
+    VAR_CACHEDB_REDISTIMEOUT = 505,
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 506,
+    VAR_FOR_UPSTREAM = 507,
+    VAR_AUTH_ZONE = 508,
+    VAR_ZONEFILE = 509,
+    VAR_MASTER = 510,
+    VAR_URL = 511,
+    VAR_FOR_DOWNSTREAM = 512,
+    VAR_FALLBACK_ENABLED = 513,
+    VAR_TLS_ADDITIONAL_PORT = 514,
+    VAR_LOW_RTT = 515,
+    VAR_LOW_RTT_PERMIL = 516,
+    VAR_FAST_SERVER_PERMIL = 517,
+    VAR_FAST_SERVER_NUM = 518,
+    VAR_ALLOW_NOTIFY = 519,
+    VAR_TLS_WIN_CERT = 520,
+    VAR_TCP_CONNECTION_LIMIT = 521,
+    VAR_FORWARD_NO_CACHE = 522,
+    VAR_STUB_NO_CACHE = 523,
+    VAR_LOG_SERVFAIL = 524,
+    VAR_DENY_ANY = 525,
+    VAR_UNKNOWN_SERVER_TIME_LIMIT = 526,
+    VAR_LOG_TAG_QUERYREPLY = 527,
+    VAR_STREAM_WAIT_SIZE = 528,
+    VAR_TLS_CIPHERS = 529,
+    VAR_TLS_CIPHERSUITES = 530,
+    VAR_IPSET = 531,
+    VAR_IPSET_NAME_V4 = 532,
+    VAR_IPSET_NAME_V6 = 533,
+    VAR_TLS_SESSION_TICKET_KEYS = 534,
+    VAR_RPZ = 535,
+    VAR_TAGS = 536,
+    VAR_RPZ_ACTION_OVERRIDE = 537,
+    VAR_RPZ_CNAME_OVERRIDE = 538,
+    VAR_RPZ_LOG = 539,
+    VAR_RPZ_LOG_NAME = 540
+  };
 #endif
 /* Tokens.  */
 #define SPACE 258
@@ -609,22 +619,25 @@
 #define VAR_RPZ_LOG 539
 #define VAR_RPZ_LOG_NAME 540
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 66 "./util/configparser.y"
+union YYSTYPE
 {
+#line 66 "./util/configparser.y"
+
        char*   str;
-}
-/* Line 1529 of yacc.c.  */
-#line 623 "util/configparser.h"
-       YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 631 "util/configparser.h"
+
+};
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 extern YYSTYPE yylval;
 
+int yyparse (void);
+
+#endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED  */