- uninitialised variable in reprobe for rtt blocked domains fixed.

- lintfix and new flex output.

git-svn-id: file:///svn/unbound/trunk@2583 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 4f60bf32db28fcbaddcf108f15e64807a489eb01..9d6ce9fe47feeb72765f0f0bb2cf7b616309d2e5 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -321,7 +321,7 @@ daemon_create_workers(struct daemon* daemon)
                if(!daemon->rand)
                        fatal_exit("could not init random generator");
        }
-       hash_set_raninit(ub_random(daemon->rand));
+       hash_set_raninit((uint32_t)ub_random(daemon->rand));
        shufport = (int*)calloc(65536, sizeof(int));
        if(!shufport)
                fatal_exit("out of memory during daemon init");

diff --git a/doc/Changelog b/doc/Changelog
index a6563b0bbc034fcd3ac5bd4abd28358f1eeba1a9..ff341e5e14913bdc78dd017ae0e964f3678713a9 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,8 @@
          that would be permissible by the RFCs but it is not the TTL in the
          cache.
        - iana portlist updated.
+       - uninitialised variable in reprobe for rtt blocked domains fixed.
+       - lintfix and new flex output.
 
 2 January 2012: Wouter
        - Fix to randomize hash function, based on 28c3 congress, reported

diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 91b335e424b04c25bf4060c966f13c53f3defcde..0a734a294c6095ca3987a7214e8f60bc00bd5d2b 100644 (file)
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -170,7 +170,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg)
                static int done_raninit = 0;
                if(!done_raninit) {
                        done_raninit = 1;
-                       hash_set_raninit(ub_random(w->env->rnd));
+                       hash_set_raninit((uint32_t)ub_random(w->env->rnd));
                }
        }
        seed = 0;

diff --git a/services/cache/infra.c b/services/cache/infra.c
index 053c22cf269d9c244e10b3ea4ec30c5f12264050..8a83528b5f78a01b237ac9573e04e42e1b1ad3ea 100644 (file)
--- a/services/cache/infra.c
+++ b/services/cache/infra.c
@@ -466,6 +466,9 @@ infra_get_lame_rtt(struct infra_cache* infra,
                 * blacklisted servers stay blacklisted if this is chosen */
                if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) {
                        *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000;
+                       *lame = 0;
+                       *dnsseclame = 0;
+                       *reclame = 0;
                        lock_rw_unlock(&e->lock);
                        return 1;
                }

diff --git a/util/configlexer.c b/util/configlexer.c
index 415b68890408b85a5935615db332a7a4e9d503ef..bd4488b67a1e1c566e06c981f3bd7c06f1d9afae 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -1463,8 +1463,8 @@ static int yy_more_len = 0;
 #define YY_MORE_ADJ (yy_more_len)
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "util/configlexer.lex"
-#line 2 "util/configlexer.lex"
+#line 1 "./util/configlexer.lex"
+#line 2 "./util/configlexer.lex"
 /*
  * configlexer.lex - lexical analyzer for unbound config file
  *
@@ -1560,7 +1560,7 @@ static void config_end_include(void)
 #endif
 
 #define YY_NO_INPUT 1
-#line 100 "util/configlexer.lex"
+#line 100 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
 #define YY_NO_UNPUT 1
 #endif
@@ -1660,7 +1660,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, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1671,7 +1671,7 @@ static int input (void );
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \
-               int n; \
+               unsigned n; \
                for ( n = 0; n < max_size && \
                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \
@@ -1753,7 +1753,7 @@ YY_DECL
        register char *yy_cp, *yy_bp;
        register int yy_act;
     
-#line 120 "util/configlexer.lex"
+#line 120 "./util/configlexer.lex"
 
 #line 1757 "<stdout>"
 
@@ -1846,607 +1846,607 @@ do_action:    /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 121 "util/configlexer.lex"
+#line 121 "./util/configlexer.lex"
 { 
        LEXOUT(("SP ")); /* ignore */ }
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 123 "util/configlexer.lex"
+#line 123 "./util/configlexer.lex"
 { 
        /* note that flex makes the longest match and '.' is any but not nl */
        LEXOUT(("comment(%s) ", yytext)); /* ignore */ }
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 126 "util/configlexer.lex"
+#line 126 "./util/configlexer.lex"
 { YDVAR(0, VAR_SERVER) }
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 127 "util/configlexer.lex"
+#line 127 "./util/configlexer.lex"
 { YDVAR(1, VAR_NUM_THREADS) }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 128 "util/configlexer.lex"
+#line 128 "./util/configlexer.lex"
 { YDVAR(1, VAR_VERBOSITY) }
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 129 "util/configlexer.lex"
+#line 129 "./util/configlexer.lex"
 { YDVAR(1, VAR_PORT) }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 130 "util/configlexer.lex"
+#line 130 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_RANGE) }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 131 "util/configlexer.lex"
+#line 131 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_PORT_PERMIT) }
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 132 "util/configlexer.lex"
+#line 132 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_PORT_AVOID) }
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 133 "util/configlexer.lex"
+#line 133 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_NUM_TCP) }
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 134 "util/configlexer.lex"
+#line 134 "./util/configlexer.lex"
 { YDVAR(1, VAR_INCOMING_NUM_TCP) }
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 135 "util/configlexer.lex"
+#line 135 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_IP4) }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 136 "util/configlexer.lex"
+#line 136 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_IP6) }
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 137 "util/configlexer.lex"
+#line 137 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_UDP) }
        YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 138 "util/configlexer.lex"
+#line 138 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_TCP) }
        YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 139 "util/configlexer.lex"
+#line 139 "./util/configlexer.lex"
 { YDVAR(1, VAR_TCP_UPSTREAM) }
        YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 140 "util/configlexer.lex"
+#line 140 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_UPSTREAM) }
        YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 141 "util/configlexer.lex"
+#line 141 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_SERVICE_KEY) }
        YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 142 "util/configlexer.lex"
+#line 142 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_SERVICE_PEM) }
        YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 143 "util/configlexer.lex"
+#line 143 "./util/configlexer.lex"
 { YDVAR(1, VAR_SSL_PORT) }
        YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 144 "util/configlexer.lex"
+#line 144 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_DAEMONIZE) }
        YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 145 "util/configlexer.lex"
+#line 145 "./util/configlexer.lex"
 { YDVAR(1, VAR_INTERFACE) }
        YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 146 "util/configlexer.lex"
+#line 146 "./util/configlexer.lex"
 { YDVAR(1, VAR_OUTGOING_INTERFACE) }
        YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 147 "util/configlexer.lex"
+#line 147 "./util/configlexer.lex"
 { YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
        YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 148 "util/configlexer.lex"
+#line 148 "./util/configlexer.lex"
 { YDVAR(1, VAR_SO_RCVBUF) }
        YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 149 "util/configlexer.lex"
+#line 149 "./util/configlexer.lex"
 { YDVAR(1, VAR_SO_SNDBUF) }
        YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 150 "util/configlexer.lex"
+#line 150 "./util/configlexer.lex"
 { YDVAR(1, VAR_CHROOT) }
        YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 151 "util/configlexer.lex"
+#line 151 "./util/configlexer.lex"
 { YDVAR(1, VAR_USERNAME) }
        YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 152 "util/configlexer.lex"
+#line 152 "./util/configlexer.lex"
 { YDVAR(1, VAR_DIRECTORY) }
        YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 153 "util/configlexer.lex"
+#line 153 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOGFILE) }
        YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 154 "util/configlexer.lex"
+#line 154 "./util/configlexer.lex"
 { YDVAR(1, VAR_PIDFILE) }
        YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 155 "util/configlexer.lex"
+#line 155 "./util/configlexer.lex"
 { YDVAR(1, VAR_ROOT_HINTS) }
        YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 156 "util/configlexer.lex"
+#line 156 "./util/configlexer.lex"
 { YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
        YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 157 "util/configlexer.lex"
+#line 157 "./util/configlexer.lex"
 { YDVAR(1, VAR_MSG_BUFFER_SIZE) }
        YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 158 "util/configlexer.lex"
+#line 158 "./util/configlexer.lex"
 { YDVAR(1, VAR_MSG_CACHE_SIZE) }
        YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 159 "util/configlexer.lex"
+#line 159 "./util/configlexer.lex"
 { YDVAR(1, VAR_MSG_CACHE_SLABS) }
        YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 160 "util/configlexer.lex"
+#line 160 "./util/configlexer.lex"
 { YDVAR(1, VAR_RRSET_CACHE_SIZE) }
        YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 161 "util/configlexer.lex"
+#line 161 "./util/configlexer.lex"
 { YDVAR(1, VAR_RRSET_CACHE_SLABS) }
        YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 162 "util/configlexer.lex"
+#line 162 "./util/configlexer.lex"
 { YDVAR(1, VAR_CACHE_MAX_TTL) }
        YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 163 "util/configlexer.lex"
+#line 163 "./util/configlexer.lex"
 { YDVAR(1, VAR_CACHE_MIN_TTL) }
        YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 164 "util/configlexer.lex"
+#line 164 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_HOST_TTL) }
        YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 165 "util/configlexer.lex"
+#line 165 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_LAME_TTL) }
        YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 166 "util/configlexer.lex"
+#line 166 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_CACHE_SLABS) }
        YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 167 "util/configlexer.lex"
+#line 167 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
        YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 168 "util/configlexer.lex"
+#line 168 "./util/configlexer.lex"
 { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
        YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 169 "util/configlexer.lex"
+#line 169 "./util/configlexer.lex"
 { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
        YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 170 "util/configlexer.lex"
+#line 170 "./util/configlexer.lex"
 { YDVAR(1, VAR_JOSTLE_TIMEOUT) }
        YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 171 "util/configlexer.lex"
+#line 171 "./util/configlexer.lex"
 { YDVAR(1, VAR_TARGET_FETCH_POLICY) }
        YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 172 "util/configlexer.lex"
+#line 172 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
        YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 173 "util/configlexer.lex"
+#line 173 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
        YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 174 "util/configlexer.lex"
+#line 174 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_GLUE) }
        YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 175 "util/configlexer.lex"
+#line 175 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
        YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 176 "util/configlexer.lex"
+#line 176 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
        YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 177 "util/configlexer.lex"
+#line 177 "./util/configlexer.lex"
 { YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
        YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 178 "util/configlexer.lex"
+#line 178 "./util/configlexer.lex"
 { YDVAR(1, VAR_USE_CAPS_FOR_ID) }
        YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 179 "util/configlexer.lex"
+#line 179 "./util/configlexer.lex"
 { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
        YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 180 "util/configlexer.lex"
+#line 180 "./util/configlexer.lex"
 { YDVAR(1, VAR_PRIVATE_ADDRESS) }
        YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 181 "util/configlexer.lex"
+#line 181 "./util/configlexer.lex"
 { YDVAR(1, VAR_PRIVATE_DOMAIN) }
        YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 182 "util/configlexer.lex"
+#line 182 "./util/configlexer.lex"
 { YDVAR(1, VAR_PREFETCH_KEY) }
        YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 183 "util/configlexer.lex"
+#line 183 "./util/configlexer.lex"
 { YDVAR(1, VAR_PREFETCH) }
        YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 184 "util/configlexer.lex"
+#line 184 "./util/configlexer.lex"
 { YDVAR(0, VAR_STUB_ZONE) }
        YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 185 "util/configlexer.lex"
+#line 185 "./util/configlexer.lex"
 { YDVAR(1, VAR_NAME) }
        YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 186 "util/configlexer.lex"
+#line 186 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_ADDR) }
        YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 187 "util/configlexer.lex"
+#line 187 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_HOST) }
        YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 188 "util/configlexer.lex"
+#line 188 "./util/configlexer.lex"
 { YDVAR(1, VAR_STUB_PRIME) }
        YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 189 "util/configlexer.lex"
+#line 189 "./util/configlexer.lex"
 { YDVAR(0, VAR_FORWARD_ZONE) }
        YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 190 "util/configlexer.lex"
+#line 190 "./util/configlexer.lex"
 { YDVAR(1, VAR_FORWARD_ADDR) }
        YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 191 "util/configlexer.lex"
+#line 191 "./util/configlexer.lex"
 { YDVAR(1, VAR_FORWARD_HOST) }
        YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 192 "util/configlexer.lex"
+#line 192 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
        YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 193 "util/configlexer.lex"
+#line 193 "./util/configlexer.lex"
 { YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
        YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 194 "util/configlexer.lex"
+#line 194 "./util/configlexer.lex"
 { YDVAR(2, VAR_ACCESS_CONTROL) }
        YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 195 "util/configlexer.lex"
+#line 195 "./util/configlexer.lex"
 { YDVAR(1, VAR_HIDE_IDENTITY) }
        YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 196 "util/configlexer.lex"
+#line 196 "./util/configlexer.lex"
 { YDVAR(1, VAR_HIDE_VERSION) }
        YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 197 "util/configlexer.lex"
+#line 197 "./util/configlexer.lex"
 { YDVAR(1, VAR_IDENTITY) }
        YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 198 "util/configlexer.lex"
+#line 198 "./util/configlexer.lex"
 { YDVAR(1, VAR_VERSION) }
        YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 199 "util/configlexer.lex"
+#line 199 "./util/configlexer.lex"
 { YDVAR(1, VAR_MODULE_CONF) }
        YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 200 "util/configlexer.lex"
+#line 200 "./util/configlexer.lex"
 { YDVAR(1, VAR_DLV_ANCHOR) }
        YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 201 "util/configlexer.lex"
+#line 201 "./util/configlexer.lex"
 { YDVAR(1, VAR_DLV_ANCHOR_FILE) }
        YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 202 "util/configlexer.lex"
+#line 202 "./util/configlexer.lex"
 { YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 203 "util/configlexer.lex"
+#line 203 "./util/configlexer.lex"
 { YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
        YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 204 "util/configlexer.lex"
+#line 204 "./util/configlexer.lex"
 { YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
        YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 205 "util/configlexer.lex"
+#line 205 "./util/configlexer.lex"
 { YDVAR(1, VAR_TRUST_ANCHOR) }
        YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 206 "util/configlexer.lex"
+#line 206 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
        YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 207 "util/configlexer.lex"
+#line 207 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
        YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 208 "util/configlexer.lex"
+#line 208 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
        YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 209 "util/configlexer.lex"
+#line 209 "./util/configlexer.lex"
 { YDVAR(1, VAR_BOGUS_TTL) }
        YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 210 "util/configlexer.lex"
+#line 210 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
        YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 211 "util/configlexer.lex"
+#line 211 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
        YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 212 "util/configlexer.lex"
+#line 212 "./util/configlexer.lex"
 { YDVAR(1, VAR_IGNORE_CD_FLAG) }
        YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 213 "util/configlexer.lex"
+#line 213 "./util/configlexer.lex"
 { YDVAR(1, VAR_VAL_LOG_LEVEL) }
        YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 214 "util/configlexer.lex"
+#line 214 "./util/configlexer.lex"
 { YDVAR(1, VAR_KEY_CACHE_SIZE) }
        YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 215 "util/configlexer.lex"
+#line 215 "./util/configlexer.lex"
 { YDVAR(1, VAR_KEY_CACHE_SLABS) }
        YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 216 "util/configlexer.lex"
+#line 216 "./util/configlexer.lex"
 { YDVAR(1, VAR_NEG_CACHE_SIZE) }
        YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 217 "util/configlexer.lex"
+#line 217 "./util/configlexer.lex"
 { 
                                  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
        YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 219 "util/configlexer.lex"
+#line 219 "./util/configlexer.lex"
 { YDVAR(1, VAR_ADD_HOLDDOWN) }
        YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 220 "util/configlexer.lex"
+#line 220 "./util/configlexer.lex"
 { YDVAR(1, VAR_DEL_HOLDDOWN) }
        YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 221 "util/configlexer.lex"
+#line 221 "./util/configlexer.lex"
 { YDVAR(1, VAR_KEEP_MISSING) }
        YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 222 "util/configlexer.lex"
+#line 222 "./util/configlexer.lex"
 { YDVAR(1, VAR_USE_SYSLOG) }
        YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 223 "util/configlexer.lex"
+#line 223 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOG_TIME_ASCII) }
        YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 224 "util/configlexer.lex"
+#line 224 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOG_QUERIES) }
        YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 225 "util/configlexer.lex"
+#line 225 "./util/configlexer.lex"
 { YDVAR(2, VAR_LOCAL_ZONE) }
        YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 226 "util/configlexer.lex"
+#line 226 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOCAL_DATA) }
        YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 227 "util/configlexer.lex"
+#line 227 "./util/configlexer.lex"
 { YDVAR(1, VAR_LOCAL_DATA_PTR) }
        YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 228 "util/configlexer.lex"
+#line 228 "./util/configlexer.lex"
 { YDVAR(1, VAR_STATISTICS_INTERVAL) }
        YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 229 "util/configlexer.lex"
+#line 229 "./util/configlexer.lex"
 { YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
        YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 230 "util/configlexer.lex"
+#line 230 "./util/configlexer.lex"
 { YDVAR(1, VAR_EXTENDED_STATISTICS) }
        YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 231 "util/configlexer.lex"
+#line 231 "./util/configlexer.lex"
 { YDVAR(0, VAR_REMOTE_CONTROL) }
        YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 232 "util/configlexer.lex"
+#line 232 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_ENABLE) }
        YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 233 "util/configlexer.lex"
+#line 233 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_INTERFACE) }
        YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 234 "util/configlexer.lex"
+#line 234 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_PORT) }
        YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 235 "util/configlexer.lex"
+#line 235 "./util/configlexer.lex"
 { YDVAR(1, VAR_SERVER_KEY_FILE) }
        YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 236 "util/configlexer.lex"
+#line 236 "./util/configlexer.lex"
 { YDVAR(1, VAR_SERVER_CERT_FILE) }
        YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 237 "util/configlexer.lex"
+#line 237 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_KEY_FILE) }
        YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 238 "util/configlexer.lex"
+#line 238 "./util/configlexer.lex"
 { YDVAR(1, VAR_CONTROL_CERT_FILE) }
        YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 239 "util/configlexer.lex"
+#line 239 "./util/configlexer.lex"
 { YDVAR(1, VAR_PYTHON_SCRIPT) }
        YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 240 "util/configlexer.lex"
+#line 240 "./util/configlexer.lex"
 { YDVAR(0, VAR_PYTHON) }
        YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 241 "util/configlexer.lex"
+#line 241 "./util/configlexer.lex"
 { YDVAR(1, VAR_DOMAIN_INSECURE) }
        YY_BREAK
 case 118:
 /* rule 118 can match eol */
 YY_RULE_SETUP
-#line 242 "util/configlexer.lex"
+#line 242 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
        YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
 case 119:
 YY_RULE_SETUP
-#line 245 "util/configlexer.lex"
+#line 245 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 246 "util/configlexer.lex"
+#line 246 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2455,19 +2455,19 @@ case YY_STATE_EOF(quotedstring):
        YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 251 "util/configlexer.lex"
+#line 251 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 252 "util/configlexer.lex"
+#line 252 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 254 "util/configlexer.lex"
+#line 254 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2482,11 +2482,11 @@ YY_RULE_SETUP
 /* Single Quoted strings. Strip leading and ending quotes */
 case 123:
 YY_RULE_SETUP
-#line 266 "util/configlexer.lex"
+#line 266 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 267 "util/configlexer.lex"
+#line 267 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2495,19 +2495,19 @@ case YY_STATE_EOF(singlequotedstr):
        YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 272 "util/configlexer.lex"
+#line 272 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
 case 125:
 /* rule 125 can match eol */
 YY_RULE_SETUP
-#line 273 "util/configlexer.lex"
+#line 273 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 275 "util/configlexer.lex"
+#line 275 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2522,12 +2522,12 @@ YY_RULE_SETUP
 /* include: directive */
 case 127:
 YY_RULE_SETUP
-#line 287 "util/configlexer.lex"
+#line 287 "./util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 289 "util/configlexer.lex"
+#line 289 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
@@ -2535,23 +2535,23 @@ case YY_STATE_EOF(include):
        YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 293 "util/configlexer.lex"
+#line 293 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
 case 129:
 /* rule 129 can match eol */
 YY_RULE_SETUP
-#line 294 "util/configlexer.lex"
+#line 294 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 295 "util/configlexer.lex"
+#line 295 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
        YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 296 "util/configlexer.lex"
+#line 296 "./util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include(yytext);
@@ -2559,7 +2559,7 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 301 "util/configlexer.lex"
+#line 301 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
@@ -2567,19 +2567,19 @@ case YY_STATE_EOF(include_quoted):
        YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 305 "util/configlexer.lex"
+#line 305 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
 case 133:
 /* rule 133 can match eol */
 YY_RULE_SETUP
-#line 306 "util/configlexer.lex"
+#line 306 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 308 "util/configlexer.lex"
+#line 308 "./util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -2589,7 +2589,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 314 "util/configlexer.lex"
+#line 314 "./util/configlexer.lex"
 {
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
        if (config_include_stack_ptr == 0) {
@@ -2602,28 +2602,28 @@ case YY_STATE_EOF(val):
        YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 324 "util/configlexer.lex"
+#line 324 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 328 "util/configlexer.lex"
+#line 328 "./util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 332 "util/configlexer.lex"
+#line 332 "./util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 336 "util/configlexer.lex"
+#line 336 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
 #line 2628 "<stdout>"
@@ -3585,7 +3585,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 336 "util/configlexer.lex"
+#line 336 "./util/configlexer.lex"