diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 3481 |
1 files changed, 1838 insertions, 1643 deletions
diff --git a/util/configparser.c b/util/configparser.c index 820a6fd9560e..ce0ef7d587a8 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -147,225 +147,236 @@ extern int yydebug; VAR_DO_TCP = 276, VAR_TCP_MSS = 277, VAR_OUTGOING_TCP_MSS = 278, - VAR_CHROOT = 279, - VAR_USERNAME = 280, - VAR_DIRECTORY = 281, - VAR_LOGFILE = 282, - VAR_PIDFILE = 283, - VAR_MSG_CACHE_SIZE = 284, - VAR_MSG_CACHE_SLABS = 285, - VAR_NUM_QUERIES_PER_THREAD = 286, - VAR_RRSET_CACHE_SIZE = 287, - VAR_RRSET_CACHE_SLABS = 288, - VAR_OUTGOING_NUM_TCP = 289, - VAR_INFRA_HOST_TTL = 290, - VAR_INFRA_LAME_TTL = 291, - VAR_INFRA_CACHE_SLABS = 292, - VAR_INFRA_CACHE_NUMHOSTS = 293, - VAR_INFRA_CACHE_LAME_SIZE = 294, - VAR_NAME = 295, - VAR_STUB_ZONE = 296, - VAR_STUB_HOST = 297, - VAR_STUB_ADDR = 298, - VAR_TARGET_FETCH_POLICY = 299, - VAR_HARDEN_SHORT_BUFSIZE = 300, - VAR_HARDEN_LARGE_QUERIES = 301, - VAR_FORWARD_ZONE = 302, - VAR_FORWARD_HOST = 303, - VAR_FORWARD_ADDR = 304, - VAR_DO_NOT_QUERY_ADDRESS = 305, - VAR_HIDE_IDENTITY = 306, - VAR_HIDE_VERSION = 307, - VAR_IDENTITY = 308, - VAR_VERSION = 309, - VAR_HARDEN_GLUE = 310, - VAR_MODULE_CONF = 311, - VAR_TRUST_ANCHOR_FILE = 312, - VAR_TRUST_ANCHOR = 313, - VAR_VAL_OVERRIDE_DATE = 314, - VAR_BOGUS_TTL = 315, - VAR_VAL_CLEAN_ADDITIONAL = 316, - VAR_VAL_PERMISSIVE_MODE = 317, - VAR_INCOMING_NUM_TCP = 318, - VAR_MSG_BUFFER_SIZE = 319, - VAR_KEY_CACHE_SIZE = 320, - VAR_KEY_CACHE_SLABS = 321, - VAR_TRUSTED_KEYS_FILE = 322, - VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 323, - VAR_USE_SYSLOG = 324, - VAR_OUTGOING_INTERFACE = 325, - VAR_ROOT_HINTS = 326, - VAR_DO_NOT_QUERY_LOCALHOST = 327, - VAR_CACHE_MAX_TTL = 328, - VAR_HARDEN_DNSSEC_STRIPPED = 329, - VAR_ACCESS_CONTROL = 330, - VAR_LOCAL_ZONE = 331, - VAR_LOCAL_DATA = 332, - VAR_INTERFACE_AUTOMATIC = 333, - VAR_STATISTICS_INTERVAL = 334, - VAR_DO_DAEMONIZE = 335, - VAR_USE_CAPS_FOR_ID = 336, - VAR_STATISTICS_CUMULATIVE = 337, - VAR_OUTGOING_PORT_PERMIT = 338, - VAR_OUTGOING_PORT_AVOID = 339, - VAR_DLV_ANCHOR_FILE = 340, - VAR_DLV_ANCHOR = 341, - VAR_NEG_CACHE_SIZE = 342, - VAR_HARDEN_REFERRAL_PATH = 343, - VAR_PRIVATE_ADDRESS = 344, - VAR_PRIVATE_DOMAIN = 345, - VAR_REMOTE_CONTROL = 346, - VAR_CONTROL_ENABLE = 347, - VAR_CONTROL_INTERFACE = 348, - VAR_CONTROL_PORT = 349, - VAR_SERVER_KEY_FILE = 350, - VAR_SERVER_CERT_FILE = 351, - VAR_CONTROL_KEY_FILE = 352, - VAR_CONTROL_CERT_FILE = 353, - VAR_CONTROL_USE_CERT = 354, - VAR_EXTENDED_STATISTICS = 355, - VAR_LOCAL_DATA_PTR = 356, - VAR_JOSTLE_TIMEOUT = 357, - VAR_STUB_PRIME = 358, - VAR_UNWANTED_REPLY_THRESHOLD = 359, - VAR_LOG_TIME_ASCII = 360, - VAR_DOMAIN_INSECURE = 361, - VAR_PYTHON = 362, - VAR_PYTHON_SCRIPT = 363, - VAR_VAL_SIG_SKEW_MIN = 364, - VAR_VAL_SIG_SKEW_MAX = 365, - VAR_CACHE_MIN_TTL = 366, - VAR_VAL_LOG_LEVEL = 367, - VAR_AUTO_TRUST_ANCHOR_FILE = 368, - VAR_KEEP_MISSING = 369, - VAR_ADD_HOLDDOWN = 370, - VAR_DEL_HOLDDOWN = 371, - VAR_SO_RCVBUF = 372, - VAR_EDNS_BUFFER_SIZE = 373, - VAR_PREFETCH = 374, - VAR_PREFETCH_KEY = 375, - VAR_SO_SNDBUF = 376, - VAR_SO_REUSEPORT = 377, - VAR_HARDEN_BELOW_NXDOMAIN = 378, - VAR_IGNORE_CD_FLAG = 379, - VAR_LOG_QUERIES = 380, - VAR_LOG_REPLIES = 381, - VAR_TCP_UPSTREAM = 382, - VAR_SSL_UPSTREAM = 383, - VAR_SSL_SERVICE_KEY = 384, - VAR_SSL_SERVICE_PEM = 385, - VAR_SSL_PORT = 386, - VAR_FORWARD_FIRST = 387, - VAR_STUB_SSL_UPSTREAM = 388, - VAR_FORWARD_SSL_UPSTREAM = 389, - VAR_TLS_CERT_BUNDLE = 390, - VAR_STUB_FIRST = 391, - VAR_MINIMAL_RESPONSES = 392, - VAR_RRSET_ROUNDROBIN = 393, - VAR_MAX_UDP_SIZE = 394, - VAR_DELAY_CLOSE = 395, - VAR_UNBLOCK_LAN_ZONES = 396, - VAR_INSECURE_LAN_ZONES = 397, - VAR_INFRA_CACHE_MIN_RTT = 398, - VAR_DNS64_PREFIX = 399, - VAR_DNS64_SYNTHALL = 400, - VAR_DNSTAP = 401, - VAR_DNSTAP_ENABLE = 402, - VAR_DNSTAP_SOCKET_PATH = 403, - VAR_DNSTAP_SEND_IDENTITY = 404, - VAR_DNSTAP_SEND_VERSION = 405, - VAR_DNSTAP_IDENTITY = 406, - VAR_DNSTAP_VERSION = 407, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 408, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 409, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 410, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 411, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 412, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 413, - VAR_RESPONSE_IP_TAG = 414, - VAR_RESPONSE_IP = 415, - VAR_RESPONSE_IP_DATA = 416, - VAR_HARDEN_ALGO_DOWNGRADE = 417, - VAR_IP_TRANSPARENT = 418, - VAR_DISABLE_DNSSEC_LAME_CHECK = 419, - VAR_IP_RATELIMIT = 420, - VAR_IP_RATELIMIT_SLABS = 421, - VAR_IP_RATELIMIT_SIZE = 422, - VAR_RATELIMIT = 423, - VAR_RATELIMIT_SLABS = 424, - VAR_RATELIMIT_SIZE = 425, - VAR_RATELIMIT_FOR_DOMAIN = 426, - VAR_RATELIMIT_BELOW_DOMAIN = 427, - VAR_IP_RATELIMIT_FACTOR = 428, - VAR_RATELIMIT_FACTOR = 429, - VAR_SEND_CLIENT_SUBNET = 430, - VAR_CLIENT_SUBNET_ZONE = 431, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 432, - VAR_CLIENT_SUBNET_OPCODE = 433, - VAR_MAX_CLIENT_SUBNET_IPV4 = 434, - VAR_MAX_CLIENT_SUBNET_IPV6 = 435, - VAR_CAPS_WHITELIST = 436, - VAR_CACHE_MAX_NEGATIVE_TTL = 437, - VAR_PERMIT_SMALL_HOLDDOWN = 438, - VAR_QNAME_MINIMISATION = 439, - VAR_QNAME_MINIMISATION_STRICT = 440, - VAR_IP_FREEBIND = 441, - VAR_DEFINE_TAG = 442, - VAR_LOCAL_ZONE_TAG = 443, - VAR_ACCESS_CONTROL_TAG = 444, - VAR_LOCAL_ZONE_OVERRIDE = 445, - VAR_ACCESS_CONTROL_TAG_ACTION = 446, - VAR_ACCESS_CONTROL_TAG_DATA = 447, - VAR_VIEW = 448, - VAR_ACCESS_CONTROL_VIEW = 449, - VAR_VIEW_FIRST = 450, - VAR_SERVE_EXPIRED = 451, - VAR_FAKE_DSA = 452, - VAR_FAKE_SHA1 = 453, - VAR_LOG_IDENTITY = 454, - VAR_HIDE_TRUSTANCHOR = 455, - VAR_TRUST_ANCHOR_SIGNALING = 456, - VAR_AGGRESSIVE_NSEC = 457, - VAR_USE_SYSTEMD = 458, - VAR_SHM_ENABLE = 459, - VAR_SHM_KEY = 460, - VAR_ROOT_KEY_SENTINEL = 461, - VAR_DNSCRYPT = 462, - VAR_DNSCRYPT_ENABLE = 463, - VAR_DNSCRYPT_PORT = 464, - VAR_DNSCRYPT_PROVIDER = 465, - VAR_DNSCRYPT_SECRET_KEY = 466, - VAR_DNSCRYPT_PROVIDER_CERT = 467, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 468, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 469, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 470, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 471, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 472, - VAR_IPSECMOD_ENABLED = 473, - VAR_IPSECMOD_HOOK = 474, - VAR_IPSECMOD_IGNORE_BOGUS = 475, - VAR_IPSECMOD_MAX_TTL = 476, - VAR_IPSECMOD_WHITELIST = 477, - VAR_IPSECMOD_STRICT = 478, - VAR_CACHEDB = 479, - VAR_CACHEDB_BACKEND = 480, - VAR_CACHEDB_SECRETSEED = 481, - VAR_CACHEDB_REDISHOST = 482, - VAR_CACHEDB_REDISPORT = 483, - VAR_CACHEDB_REDISTIMEOUT = 484, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 485, - VAR_FOR_UPSTREAM = 486, - VAR_AUTH_ZONE = 487, - VAR_ZONEFILE = 488, - VAR_MASTER = 489, - VAR_URL = 490, - VAR_FOR_DOWNSTREAM = 491, - VAR_FALLBACK_ENABLED = 492, - VAR_TLS_ADDITIONAL_PORT = 493, - VAR_LOW_RTT = 494, - VAR_LOW_RTT_PERMIL = 495, - VAR_ALLOW_NOTIFY = 496, - VAR_TLS_WIN_CERT = 497 + VAR_TCP_IDLE_TIMEOUT = 279, + VAR_EDNS_TCP_KEEPALIVE = 280, + VAR_EDNS_TCP_KEEPALIVE_TIMEOUT = 281, + VAR_CHROOT = 282, + VAR_USERNAME = 283, + VAR_DIRECTORY = 284, + VAR_LOGFILE = 285, + VAR_PIDFILE = 286, + VAR_MSG_CACHE_SIZE = 287, + VAR_MSG_CACHE_SLABS = 288, + VAR_NUM_QUERIES_PER_THREAD = 289, + VAR_RRSET_CACHE_SIZE = 290, + VAR_RRSET_CACHE_SLABS = 291, + VAR_OUTGOING_NUM_TCP = 292, + VAR_INFRA_HOST_TTL = 293, + VAR_INFRA_LAME_TTL = 294, + VAR_INFRA_CACHE_SLABS = 295, + VAR_INFRA_CACHE_NUMHOSTS = 296, + VAR_INFRA_CACHE_LAME_SIZE = 297, + VAR_NAME = 298, + VAR_STUB_ZONE = 299, + VAR_STUB_HOST = 300, + VAR_STUB_ADDR = 301, + VAR_TARGET_FETCH_POLICY = 302, + VAR_HARDEN_SHORT_BUFSIZE = 303, + VAR_HARDEN_LARGE_QUERIES = 304, + VAR_FORWARD_ZONE = 305, + VAR_FORWARD_HOST = 306, + VAR_FORWARD_ADDR = 307, + VAR_DO_NOT_QUERY_ADDRESS = 308, + VAR_HIDE_IDENTITY = 309, + VAR_HIDE_VERSION = 310, + VAR_IDENTITY = 311, + VAR_VERSION = 312, + VAR_HARDEN_GLUE = 313, + VAR_MODULE_CONF = 314, + VAR_TRUST_ANCHOR_FILE = 315, + VAR_TRUST_ANCHOR = 316, + VAR_VAL_OVERRIDE_DATE = 317, + VAR_BOGUS_TTL = 318, + VAR_VAL_CLEAN_ADDITIONAL = 319, + VAR_VAL_PERMISSIVE_MODE = 320, + VAR_INCOMING_NUM_TCP = 321, + VAR_MSG_BUFFER_SIZE = 322, + VAR_KEY_CACHE_SIZE = 323, + VAR_KEY_CACHE_SLABS = 324, + VAR_TRUSTED_KEYS_FILE = 325, + VAR_VAL_NSEC3_KEYSIZE_ITERATIONS = 326, + VAR_USE_SYSLOG = 327, + VAR_OUTGOING_INTERFACE = 328, + VAR_ROOT_HINTS = 329, + VAR_DO_NOT_QUERY_LOCALHOST = 330, + VAR_CACHE_MAX_TTL = 331, + VAR_HARDEN_DNSSEC_STRIPPED = 332, + VAR_ACCESS_CONTROL = 333, + VAR_LOCAL_ZONE = 334, + VAR_LOCAL_DATA = 335, + VAR_INTERFACE_AUTOMATIC = 336, + VAR_STATISTICS_INTERVAL = 337, + VAR_DO_DAEMONIZE = 338, + VAR_USE_CAPS_FOR_ID = 339, + VAR_STATISTICS_CUMULATIVE = 340, + VAR_OUTGOING_PORT_PERMIT = 341, + VAR_OUTGOING_PORT_AVOID = 342, + VAR_DLV_ANCHOR_FILE = 343, + VAR_DLV_ANCHOR = 344, + VAR_NEG_CACHE_SIZE = 345, + VAR_HARDEN_REFERRAL_PATH = 346, + VAR_PRIVATE_ADDRESS = 347, + VAR_PRIVATE_DOMAIN = 348, + VAR_REMOTE_CONTROL = 349, + VAR_CONTROL_ENABLE = 350, + VAR_CONTROL_INTERFACE = 351, + VAR_CONTROL_PORT = 352, + VAR_SERVER_KEY_FILE = 353, + VAR_SERVER_CERT_FILE = 354, + VAR_CONTROL_KEY_FILE = 355, + VAR_CONTROL_CERT_FILE = 356, + VAR_CONTROL_USE_CERT = 357, + VAR_EXTENDED_STATISTICS = 358, + VAR_LOCAL_DATA_PTR = 359, + VAR_JOSTLE_TIMEOUT = 360, + VAR_STUB_PRIME = 361, + VAR_UNWANTED_REPLY_THRESHOLD = 362, + VAR_LOG_TIME_ASCII = 363, + VAR_DOMAIN_INSECURE = 364, + VAR_PYTHON = 365, + VAR_PYTHON_SCRIPT = 366, + VAR_VAL_SIG_SKEW_MIN = 367, + VAR_VAL_SIG_SKEW_MAX = 368, + VAR_CACHE_MIN_TTL = 369, + VAR_VAL_LOG_LEVEL = 370, + VAR_AUTO_TRUST_ANCHOR_FILE = 371, + VAR_KEEP_MISSING = 372, + VAR_ADD_HOLDDOWN = 373, + VAR_DEL_HOLDDOWN = 374, + VAR_SO_RCVBUF = 375, + VAR_EDNS_BUFFER_SIZE = 376, + VAR_PREFETCH = 377, + VAR_PREFETCH_KEY = 378, + VAR_SO_SNDBUF = 379, + VAR_SO_REUSEPORT = 380, + VAR_HARDEN_BELOW_NXDOMAIN = 381, + VAR_IGNORE_CD_FLAG = 382, + VAR_LOG_QUERIES = 383, + VAR_LOG_REPLIES = 384, + VAR_LOG_LOCAL_ACTIONS = 385, + VAR_TCP_UPSTREAM = 386, + VAR_SSL_UPSTREAM = 387, + VAR_SSL_SERVICE_KEY = 388, + VAR_SSL_SERVICE_PEM = 389, + VAR_SSL_PORT = 390, + VAR_FORWARD_FIRST = 391, + VAR_STUB_SSL_UPSTREAM = 392, + VAR_FORWARD_SSL_UPSTREAM = 393, + VAR_TLS_CERT_BUNDLE = 394, + VAR_STUB_FIRST = 395, + VAR_MINIMAL_RESPONSES = 396, + VAR_RRSET_ROUNDROBIN = 397, + VAR_MAX_UDP_SIZE = 398, + VAR_DELAY_CLOSE = 399, + VAR_UNBLOCK_LAN_ZONES = 400, + VAR_INSECURE_LAN_ZONES = 401, + VAR_INFRA_CACHE_MIN_RTT = 402, + VAR_DNS64_PREFIX = 403, + VAR_DNS64_SYNTHALL = 404, + VAR_DNS64_IGNORE_AAAA = 405, + VAR_DNSTAP = 406, + VAR_DNSTAP_ENABLE = 407, + VAR_DNSTAP_SOCKET_PATH = 408, + VAR_DNSTAP_SEND_IDENTITY = 409, + VAR_DNSTAP_SEND_VERSION = 410, + VAR_DNSTAP_IDENTITY = 411, + VAR_DNSTAP_VERSION = 412, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 413, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 414, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 415, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 416, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 417, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 418, + VAR_RESPONSE_IP_TAG = 419, + VAR_RESPONSE_IP = 420, + VAR_RESPONSE_IP_DATA = 421, + VAR_HARDEN_ALGO_DOWNGRADE = 422, + VAR_IP_TRANSPARENT = 423, + VAR_DISABLE_DNSSEC_LAME_CHECK = 424, + VAR_IP_RATELIMIT = 425, + VAR_IP_RATELIMIT_SLABS = 426, + VAR_IP_RATELIMIT_SIZE = 427, + VAR_RATELIMIT = 428, + VAR_RATELIMIT_SLABS = 429, + VAR_RATELIMIT_SIZE = 430, + VAR_RATELIMIT_FOR_DOMAIN = 431, + VAR_RATELIMIT_BELOW_DOMAIN = 432, + VAR_IP_RATELIMIT_FACTOR = 433, + VAR_RATELIMIT_FACTOR = 434, + VAR_SEND_CLIENT_SUBNET = 435, + VAR_CLIENT_SUBNET_ZONE = 436, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 437, + VAR_CLIENT_SUBNET_OPCODE = 438, + VAR_MAX_CLIENT_SUBNET_IPV4 = 439, + VAR_MAX_CLIENT_SUBNET_IPV6 = 440, + VAR_CAPS_WHITELIST = 441, + VAR_CACHE_MAX_NEGATIVE_TTL = 442, + VAR_PERMIT_SMALL_HOLDDOWN = 443, + VAR_QNAME_MINIMISATION = 444, + VAR_QNAME_MINIMISATION_STRICT = 445, + VAR_IP_FREEBIND = 446, + VAR_DEFINE_TAG = 447, + VAR_LOCAL_ZONE_TAG = 448, + VAR_ACCESS_CONTROL_TAG = 449, + VAR_LOCAL_ZONE_OVERRIDE = 450, + VAR_ACCESS_CONTROL_TAG_ACTION = 451, + VAR_ACCESS_CONTROL_TAG_DATA = 452, + VAR_VIEW = 453, + VAR_ACCESS_CONTROL_VIEW = 454, + VAR_VIEW_FIRST = 455, + VAR_SERVE_EXPIRED = 456, + VAR_SERVE_EXPIRED_TTL = 457, + VAR_SERVE_EXPIRED_TTL_RESET = 458, + VAR_FAKE_DSA = 459, + VAR_FAKE_SHA1 = 460, + VAR_LOG_IDENTITY = 461, + VAR_HIDE_TRUSTANCHOR = 462, + VAR_TRUST_ANCHOR_SIGNALING = 463, + VAR_AGGRESSIVE_NSEC = 464, + VAR_USE_SYSTEMD = 465, + VAR_SHM_ENABLE = 466, + VAR_SHM_KEY = 467, + VAR_ROOT_KEY_SENTINEL = 468, + VAR_DNSCRYPT = 469, + VAR_DNSCRYPT_ENABLE = 470, + VAR_DNSCRYPT_PORT = 471, + VAR_DNSCRYPT_PROVIDER = 472, + VAR_DNSCRYPT_SECRET_KEY = 473, + VAR_DNSCRYPT_PROVIDER_CERT = 474, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 475, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 476, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 477, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 478, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 479, + VAR_IPSECMOD_ENABLED = 480, + VAR_IPSECMOD_HOOK = 481, + VAR_IPSECMOD_IGNORE_BOGUS = 482, + VAR_IPSECMOD_MAX_TTL = 483, + VAR_IPSECMOD_WHITELIST = 484, + VAR_IPSECMOD_STRICT = 485, + VAR_CACHEDB = 486, + VAR_CACHEDB_BACKEND = 487, + VAR_CACHEDB_SECRETSEED = 488, + VAR_CACHEDB_REDISHOST = 489, + VAR_CACHEDB_REDISPORT = 490, + VAR_CACHEDB_REDISTIMEOUT = 491, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 492, + VAR_FOR_UPSTREAM = 493, + VAR_AUTH_ZONE = 494, + VAR_ZONEFILE = 495, + VAR_MASTER = 496, + VAR_URL = 497, + VAR_FOR_DOWNSTREAM = 498, + VAR_FALLBACK_ENABLED = 499, + VAR_TLS_ADDITIONAL_PORT = 500, + VAR_LOW_RTT = 501, + VAR_LOW_RTT_PERMIL = 502, + VAR_ALLOW_NOTIFY = 503, + VAR_TLS_WIN_CERT = 504, + VAR_TCP_CONNECTION_LIMIT = 505, + VAR_FORWARD_NO_CACHE = 506, + VAR_STUB_NO_CACHE = 507, + VAR_LOG_SERVFAIL = 508 }; #endif /* Tokens. */ @@ -390,225 +401,236 @@ extern int yydebug; #define VAR_DO_TCP 276 #define VAR_TCP_MSS 277 #define VAR_OUTGOING_TCP_MSS 278 -#define VAR_CHROOT 279 -#define VAR_USERNAME 280 -#define VAR_DIRECTORY 281 -#define VAR_LOGFILE 282 -#define VAR_PIDFILE 283 -#define VAR_MSG_CACHE_SIZE 284 -#define VAR_MSG_CACHE_SLABS 285 -#define VAR_NUM_QUERIES_PER_THREAD 286 -#define VAR_RRSET_CACHE_SIZE 287 -#define VAR_RRSET_CACHE_SLABS 288 -#define VAR_OUTGOING_NUM_TCP 289 -#define VAR_INFRA_HOST_TTL 290 -#define VAR_INFRA_LAME_TTL 291 -#define VAR_INFRA_CACHE_SLABS 292 -#define VAR_INFRA_CACHE_NUMHOSTS 293 -#define VAR_INFRA_CACHE_LAME_SIZE 294 -#define VAR_NAME 295 -#define VAR_STUB_ZONE 296 -#define VAR_STUB_HOST 297 -#define VAR_STUB_ADDR 298 -#define VAR_TARGET_FETCH_POLICY 299 -#define VAR_HARDEN_SHORT_BUFSIZE 300 -#define VAR_HARDEN_LARGE_QUERIES 301 -#define VAR_FORWARD_ZONE 302 -#define VAR_FORWARD_HOST 303 -#define VAR_FORWARD_ADDR 304 -#define VAR_DO_NOT_QUERY_ADDRESS 305 -#define VAR_HIDE_IDENTITY 306 -#define VAR_HIDE_VERSION 307 -#define VAR_IDENTITY 308 -#define VAR_VERSION 309 -#define VAR_HARDEN_GLUE 310 -#define VAR_MODULE_CONF 311 -#define VAR_TRUST_ANCHOR_FILE 312 -#define VAR_TRUST_ANCHOR 313 -#define VAR_VAL_OVERRIDE_DATE 314 -#define VAR_BOGUS_TTL 315 -#define VAR_VAL_CLEAN_ADDITIONAL 316 -#define VAR_VAL_PERMISSIVE_MODE 317 -#define VAR_INCOMING_NUM_TCP 318 -#define VAR_MSG_BUFFER_SIZE 319 -#define VAR_KEY_CACHE_SIZE 320 -#define VAR_KEY_CACHE_SLABS 321 -#define VAR_TRUSTED_KEYS_FILE 322 -#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 323 -#define VAR_USE_SYSLOG 324 -#define VAR_OUTGOING_INTERFACE 325 -#define VAR_ROOT_HINTS 326 -#define VAR_DO_NOT_QUERY_LOCALHOST 327 -#define VAR_CACHE_MAX_TTL 328 -#define VAR_HARDEN_DNSSEC_STRIPPED 329 -#define VAR_ACCESS_CONTROL 330 -#define VAR_LOCAL_ZONE 331 -#define VAR_LOCAL_DATA 332 -#define VAR_INTERFACE_AUTOMATIC 333 -#define VAR_STATISTICS_INTERVAL 334 -#define VAR_DO_DAEMONIZE 335 -#define VAR_USE_CAPS_FOR_ID 336 -#define VAR_STATISTICS_CUMULATIVE 337 -#define VAR_OUTGOING_PORT_PERMIT 338 -#define VAR_OUTGOING_PORT_AVOID 339 -#define VAR_DLV_ANCHOR_FILE 340 -#define VAR_DLV_ANCHOR 341 -#define VAR_NEG_CACHE_SIZE 342 -#define VAR_HARDEN_REFERRAL_PATH 343 -#define VAR_PRIVATE_ADDRESS 344 -#define VAR_PRIVATE_DOMAIN 345 -#define VAR_REMOTE_CONTROL 346 -#define VAR_CONTROL_ENABLE 347 -#define VAR_CONTROL_INTERFACE 348 -#define VAR_CONTROL_PORT 349 -#define VAR_SERVER_KEY_FILE 350 -#define VAR_SERVER_CERT_FILE 351 -#define VAR_CONTROL_KEY_FILE 352 -#define VAR_CONTROL_CERT_FILE 353 -#define VAR_CONTROL_USE_CERT 354 -#define VAR_EXTENDED_STATISTICS 355 -#define VAR_LOCAL_DATA_PTR 356 -#define VAR_JOSTLE_TIMEOUT 357 -#define VAR_STUB_PRIME 358 -#define VAR_UNWANTED_REPLY_THRESHOLD 359 -#define VAR_LOG_TIME_ASCII 360 -#define VAR_DOMAIN_INSECURE 361 -#define VAR_PYTHON 362 -#define VAR_PYTHON_SCRIPT 363 -#define VAR_VAL_SIG_SKEW_MIN 364 -#define VAR_VAL_SIG_SKEW_MAX 365 -#define VAR_CACHE_MIN_TTL 366 -#define VAR_VAL_LOG_LEVEL 367 -#define VAR_AUTO_TRUST_ANCHOR_FILE 368 -#define VAR_KEEP_MISSING 369 -#define VAR_ADD_HOLDDOWN 370 -#define VAR_DEL_HOLDDOWN 371 -#define VAR_SO_RCVBUF 372 -#define VAR_EDNS_BUFFER_SIZE 373 -#define VAR_PREFETCH 374 -#define VAR_PREFETCH_KEY 375 -#define VAR_SO_SNDBUF 376 -#define VAR_SO_REUSEPORT 377 -#define VAR_HARDEN_BELOW_NXDOMAIN 378 -#define VAR_IGNORE_CD_FLAG 379 -#define VAR_LOG_QUERIES 380 -#define VAR_LOG_REPLIES 381 -#define VAR_TCP_UPSTREAM 382 -#define VAR_SSL_UPSTREAM 383 -#define VAR_SSL_SERVICE_KEY 384 -#define VAR_SSL_SERVICE_PEM 385 -#define VAR_SSL_PORT 386 -#define VAR_FORWARD_FIRST 387 -#define VAR_STUB_SSL_UPSTREAM 388 -#define VAR_FORWARD_SSL_UPSTREAM 389 -#define VAR_TLS_CERT_BUNDLE 390 -#define VAR_STUB_FIRST 391 -#define VAR_MINIMAL_RESPONSES 392 -#define VAR_RRSET_ROUNDROBIN 393 -#define VAR_MAX_UDP_SIZE 394 -#define VAR_DELAY_CLOSE 395 -#define VAR_UNBLOCK_LAN_ZONES 396 -#define VAR_INSECURE_LAN_ZONES 397 -#define VAR_INFRA_CACHE_MIN_RTT 398 -#define VAR_DNS64_PREFIX 399 -#define VAR_DNS64_SYNTHALL 400 -#define VAR_DNSTAP 401 -#define VAR_DNSTAP_ENABLE 402 -#define VAR_DNSTAP_SOCKET_PATH 403 -#define VAR_DNSTAP_SEND_IDENTITY 404 -#define VAR_DNSTAP_SEND_VERSION 405 -#define VAR_DNSTAP_IDENTITY 406 -#define VAR_DNSTAP_VERSION 407 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 408 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 409 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 410 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 411 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 412 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 413 -#define VAR_RESPONSE_IP_TAG 414 -#define VAR_RESPONSE_IP 415 -#define VAR_RESPONSE_IP_DATA 416 -#define VAR_HARDEN_ALGO_DOWNGRADE 417 -#define VAR_IP_TRANSPARENT 418 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 419 -#define VAR_IP_RATELIMIT 420 -#define VAR_IP_RATELIMIT_SLABS 421 -#define VAR_IP_RATELIMIT_SIZE 422 -#define VAR_RATELIMIT 423 -#define VAR_RATELIMIT_SLABS 424 -#define VAR_RATELIMIT_SIZE 425 -#define VAR_RATELIMIT_FOR_DOMAIN 426 -#define VAR_RATELIMIT_BELOW_DOMAIN 427 -#define VAR_IP_RATELIMIT_FACTOR 428 -#define VAR_RATELIMIT_FACTOR 429 -#define VAR_SEND_CLIENT_SUBNET 430 -#define VAR_CLIENT_SUBNET_ZONE 431 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 432 -#define VAR_CLIENT_SUBNET_OPCODE 433 -#define VAR_MAX_CLIENT_SUBNET_IPV4 434 -#define VAR_MAX_CLIENT_SUBNET_IPV6 435 -#define VAR_CAPS_WHITELIST 436 -#define VAR_CACHE_MAX_NEGATIVE_TTL 437 -#define VAR_PERMIT_SMALL_HOLDDOWN 438 -#define VAR_QNAME_MINIMISATION 439 -#define VAR_QNAME_MINIMISATION_STRICT 440 -#define VAR_IP_FREEBIND 441 -#define VAR_DEFINE_TAG 442 -#define VAR_LOCAL_ZONE_TAG 443 -#define VAR_ACCESS_CONTROL_TAG 444 -#define VAR_LOCAL_ZONE_OVERRIDE 445 -#define VAR_ACCESS_CONTROL_TAG_ACTION 446 -#define VAR_ACCESS_CONTROL_TAG_DATA 447 -#define VAR_VIEW 448 -#define VAR_ACCESS_CONTROL_VIEW 449 -#define VAR_VIEW_FIRST 450 -#define VAR_SERVE_EXPIRED 451 -#define VAR_FAKE_DSA 452 -#define VAR_FAKE_SHA1 453 -#define VAR_LOG_IDENTITY 454 -#define VAR_HIDE_TRUSTANCHOR 455 -#define VAR_TRUST_ANCHOR_SIGNALING 456 -#define VAR_AGGRESSIVE_NSEC 457 -#define VAR_USE_SYSTEMD 458 -#define VAR_SHM_ENABLE 459 -#define VAR_SHM_KEY 460 -#define VAR_ROOT_KEY_SENTINEL 461 -#define VAR_DNSCRYPT 462 -#define VAR_DNSCRYPT_ENABLE 463 -#define VAR_DNSCRYPT_PORT 464 -#define VAR_DNSCRYPT_PROVIDER 465 -#define VAR_DNSCRYPT_SECRET_KEY 466 -#define VAR_DNSCRYPT_PROVIDER_CERT 467 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 468 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 469 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 470 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 471 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 472 -#define VAR_IPSECMOD_ENABLED 473 -#define VAR_IPSECMOD_HOOK 474 -#define VAR_IPSECMOD_IGNORE_BOGUS 475 -#define VAR_IPSECMOD_MAX_TTL 476 -#define VAR_IPSECMOD_WHITELIST 477 -#define VAR_IPSECMOD_STRICT 478 -#define VAR_CACHEDB 479 -#define VAR_CACHEDB_BACKEND 480 -#define VAR_CACHEDB_SECRETSEED 481 -#define VAR_CACHEDB_REDISHOST 482 -#define VAR_CACHEDB_REDISPORT 483 -#define VAR_CACHEDB_REDISTIMEOUT 484 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 485 -#define VAR_FOR_UPSTREAM 486 -#define VAR_AUTH_ZONE 487 -#define VAR_ZONEFILE 488 -#define VAR_MASTER 489 -#define VAR_URL 490 -#define VAR_FOR_DOWNSTREAM 491 -#define VAR_FALLBACK_ENABLED 492 -#define VAR_TLS_ADDITIONAL_PORT 493 -#define VAR_LOW_RTT 494 -#define VAR_LOW_RTT_PERMIL 495 -#define VAR_ALLOW_NOTIFY 496 -#define VAR_TLS_WIN_CERT 497 +#define VAR_TCP_IDLE_TIMEOUT 279 +#define VAR_EDNS_TCP_KEEPALIVE 280 +#define VAR_EDNS_TCP_KEEPALIVE_TIMEOUT 281 +#define VAR_CHROOT 282 +#define VAR_USERNAME 283 +#define VAR_DIRECTORY 284 +#define VAR_LOGFILE 285 +#define VAR_PIDFILE 286 +#define VAR_MSG_CACHE_SIZE 287 +#define VAR_MSG_CACHE_SLABS 288 +#define VAR_NUM_QUERIES_PER_THREAD 289 +#define VAR_RRSET_CACHE_SIZE 290 +#define VAR_RRSET_CACHE_SLABS 291 +#define VAR_OUTGOING_NUM_TCP 292 +#define VAR_INFRA_HOST_TTL 293 +#define VAR_INFRA_LAME_TTL 294 +#define VAR_INFRA_CACHE_SLABS 295 +#define VAR_INFRA_CACHE_NUMHOSTS 296 +#define VAR_INFRA_CACHE_LAME_SIZE 297 +#define VAR_NAME 298 +#define VAR_STUB_ZONE 299 +#define VAR_STUB_HOST 300 +#define VAR_STUB_ADDR 301 +#define VAR_TARGET_FETCH_POLICY 302 +#define VAR_HARDEN_SHORT_BUFSIZE 303 +#define VAR_HARDEN_LARGE_QUERIES 304 +#define VAR_FORWARD_ZONE 305 +#define VAR_FORWARD_HOST 306 +#define VAR_FORWARD_ADDR 307 +#define VAR_DO_NOT_QUERY_ADDRESS 308 +#define VAR_HIDE_IDENTITY 309 +#define VAR_HIDE_VERSION 310 +#define VAR_IDENTITY 311 +#define VAR_VERSION 312 +#define VAR_HARDEN_GLUE 313 +#define VAR_MODULE_CONF 314 +#define VAR_TRUST_ANCHOR_FILE 315 +#define VAR_TRUST_ANCHOR 316 +#define VAR_VAL_OVERRIDE_DATE 317 +#define VAR_BOGUS_TTL 318 +#define VAR_VAL_CLEAN_ADDITIONAL 319 +#define VAR_VAL_PERMISSIVE_MODE 320 +#define VAR_INCOMING_NUM_TCP 321 +#define VAR_MSG_BUFFER_SIZE 322 +#define VAR_KEY_CACHE_SIZE 323 +#define VAR_KEY_CACHE_SLABS 324 +#define VAR_TRUSTED_KEYS_FILE 325 +#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 326 +#define VAR_USE_SYSLOG 327 +#define VAR_OUTGOING_INTERFACE 328 +#define VAR_ROOT_HINTS 329 +#define VAR_DO_NOT_QUERY_LOCALHOST 330 +#define VAR_CACHE_MAX_TTL 331 +#define VAR_HARDEN_DNSSEC_STRIPPED 332 +#define VAR_ACCESS_CONTROL 333 +#define VAR_LOCAL_ZONE 334 +#define VAR_LOCAL_DATA 335 +#define VAR_INTERFACE_AUTOMATIC 336 +#define VAR_STATISTICS_INTERVAL 337 +#define VAR_DO_DAEMONIZE 338 +#define VAR_USE_CAPS_FOR_ID 339 +#define VAR_STATISTICS_CUMULATIVE 340 +#define VAR_OUTGOING_PORT_PERMIT 341 +#define VAR_OUTGOING_PORT_AVOID 342 +#define VAR_DLV_ANCHOR_FILE 343 +#define VAR_DLV_ANCHOR 344 +#define VAR_NEG_CACHE_SIZE 345 +#define VAR_HARDEN_REFERRAL_PATH 346 +#define VAR_PRIVATE_ADDRESS 347 +#define VAR_PRIVATE_DOMAIN 348 +#define VAR_REMOTE_CONTROL 349 +#define VAR_CONTROL_ENABLE 350 +#define VAR_CONTROL_INTERFACE 351 +#define VAR_CONTROL_PORT 352 +#define VAR_SERVER_KEY_FILE 353 +#define VAR_SERVER_CERT_FILE 354 +#define VAR_CONTROL_KEY_FILE 355 +#define VAR_CONTROL_CERT_FILE 356 +#define VAR_CONTROL_USE_CERT 357 +#define VAR_EXTENDED_STATISTICS 358 +#define VAR_LOCAL_DATA_PTR 359 +#define VAR_JOSTLE_TIMEOUT 360 +#define VAR_STUB_PRIME 361 +#define VAR_UNWANTED_REPLY_THRESHOLD 362 +#define VAR_LOG_TIME_ASCII 363 +#define VAR_DOMAIN_INSECURE 364 +#define VAR_PYTHON 365 +#define VAR_PYTHON_SCRIPT 366 +#define VAR_VAL_SIG_SKEW_MIN 367 +#define VAR_VAL_SIG_SKEW_MAX 368 +#define VAR_CACHE_MIN_TTL 369 +#define VAR_VAL_LOG_LEVEL 370 +#define VAR_AUTO_TRUST_ANCHOR_FILE 371 +#define VAR_KEEP_MISSING 372 +#define VAR_ADD_HOLDDOWN 373 +#define VAR_DEL_HOLDDOWN 374 +#define VAR_SO_RCVBUF 375 +#define VAR_EDNS_BUFFER_SIZE 376 +#define VAR_PREFETCH 377 +#define VAR_PREFETCH_KEY 378 +#define VAR_SO_SNDBUF 379 +#define VAR_SO_REUSEPORT 380 +#define VAR_HARDEN_BELOW_NXDOMAIN 381 +#define VAR_IGNORE_CD_FLAG 382 +#define VAR_LOG_QUERIES 383 +#define VAR_LOG_REPLIES 384 +#define VAR_LOG_LOCAL_ACTIONS 385 +#define VAR_TCP_UPSTREAM 386 +#define VAR_SSL_UPSTREAM 387 +#define VAR_SSL_SERVICE_KEY 388 +#define VAR_SSL_SERVICE_PEM 389 +#define VAR_SSL_PORT 390 +#define VAR_FORWARD_FIRST 391 +#define VAR_STUB_SSL_UPSTREAM 392 +#define VAR_FORWARD_SSL_UPSTREAM 393 +#define VAR_TLS_CERT_BUNDLE 394 +#define VAR_STUB_FIRST 395 +#define VAR_MINIMAL_RESPONSES 396 +#define VAR_RRSET_ROUNDROBIN 397 +#define VAR_MAX_UDP_SIZE 398 +#define VAR_DELAY_CLOSE 399 +#define VAR_UNBLOCK_LAN_ZONES 400 +#define VAR_INSECURE_LAN_ZONES 401 +#define VAR_INFRA_CACHE_MIN_RTT 402 +#define VAR_DNS64_PREFIX 403 +#define VAR_DNS64_SYNTHALL 404 +#define VAR_DNS64_IGNORE_AAAA 405 +#define VAR_DNSTAP 406 +#define VAR_DNSTAP_ENABLE 407 +#define VAR_DNSTAP_SOCKET_PATH 408 +#define VAR_DNSTAP_SEND_IDENTITY 409 +#define VAR_DNSTAP_SEND_VERSION 410 +#define VAR_DNSTAP_IDENTITY 411 +#define VAR_DNSTAP_VERSION 412 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 413 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 414 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 415 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 416 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 417 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 418 +#define VAR_RESPONSE_IP_TAG 419 +#define VAR_RESPONSE_IP 420 +#define VAR_RESPONSE_IP_DATA 421 +#define VAR_HARDEN_ALGO_DOWNGRADE 422 +#define VAR_IP_TRANSPARENT 423 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 424 +#define VAR_IP_RATELIMIT 425 +#define VAR_IP_RATELIMIT_SLABS 426 +#define VAR_IP_RATELIMIT_SIZE 427 +#define VAR_RATELIMIT 428 +#define VAR_RATELIMIT_SLABS 429 +#define VAR_RATELIMIT_SIZE 430 +#define VAR_RATELIMIT_FOR_DOMAIN 431 +#define VAR_RATELIMIT_BELOW_DOMAIN 432 +#define VAR_IP_RATELIMIT_FACTOR 433 +#define VAR_RATELIMIT_FACTOR 434 +#define VAR_SEND_CLIENT_SUBNET 435 +#define VAR_CLIENT_SUBNET_ZONE 436 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 437 +#define VAR_CLIENT_SUBNET_OPCODE 438 +#define VAR_MAX_CLIENT_SUBNET_IPV4 439 +#define VAR_MAX_CLIENT_SUBNET_IPV6 440 +#define VAR_CAPS_WHITELIST 441 +#define VAR_CACHE_MAX_NEGATIVE_TTL 442 +#define VAR_PERMIT_SMALL_HOLDDOWN 443 +#define VAR_QNAME_MINIMISATION 444 +#define VAR_QNAME_MINIMISATION_STRICT 445 +#define VAR_IP_FREEBIND 446 +#define VAR_DEFINE_TAG 447 +#define VAR_LOCAL_ZONE_TAG 448 +#define VAR_ACCESS_CONTROL_TAG 449 +#define VAR_LOCAL_ZONE_OVERRIDE 450 +#define VAR_ACCESS_CONTROL_TAG_ACTION 451 +#define VAR_ACCESS_CONTROL_TAG_DATA 452 +#define VAR_VIEW 453 +#define VAR_ACCESS_CONTROL_VIEW 454 +#define VAR_VIEW_FIRST 455 +#define VAR_SERVE_EXPIRED 456 +#define VAR_SERVE_EXPIRED_TTL 457 +#define VAR_SERVE_EXPIRED_TTL_RESET 458 +#define VAR_FAKE_DSA 459 +#define VAR_FAKE_SHA1 460 +#define VAR_LOG_IDENTITY 461 +#define VAR_HIDE_TRUSTANCHOR 462 +#define VAR_TRUST_ANCHOR_SIGNALING 463 +#define VAR_AGGRESSIVE_NSEC 464 +#define VAR_USE_SYSTEMD 465 +#define VAR_SHM_ENABLE 466 +#define VAR_SHM_KEY 467 +#define VAR_ROOT_KEY_SENTINEL 468 +#define VAR_DNSCRYPT 469 +#define VAR_DNSCRYPT_ENABLE 470 +#define VAR_DNSCRYPT_PORT 471 +#define VAR_DNSCRYPT_PROVIDER 472 +#define VAR_DNSCRYPT_SECRET_KEY 473 +#define VAR_DNSCRYPT_PROVIDER_CERT 474 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 475 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 476 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 477 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 478 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 479 +#define VAR_IPSECMOD_ENABLED 480 +#define VAR_IPSECMOD_HOOK 481 +#define VAR_IPSECMOD_IGNORE_BOGUS 482 +#define VAR_IPSECMOD_MAX_TTL 483 +#define VAR_IPSECMOD_WHITELIST 484 +#define VAR_IPSECMOD_STRICT 485 +#define VAR_CACHEDB 486 +#define VAR_CACHEDB_BACKEND 487 +#define VAR_CACHEDB_SECRETSEED 488 +#define VAR_CACHEDB_REDISHOST 489 +#define VAR_CACHEDB_REDISPORT 490 +#define VAR_CACHEDB_REDISTIMEOUT 491 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 492 +#define VAR_FOR_UPSTREAM 493 +#define VAR_AUTH_ZONE 494 +#define VAR_ZONEFILE 495 +#define VAR_MASTER 496 +#define VAR_URL 497 +#define VAR_FOR_DOWNSTREAM 498 +#define VAR_FALLBACK_ENABLED 499 +#define VAR_TLS_ADDITIONAL_PORT 500 +#define VAR_LOW_RTT 501 +#define VAR_LOW_RTT_PERMIL 502 +#define VAR_ALLOW_NOTIFY 503 +#define VAR_TLS_WIN_CERT 504 +#define VAR_TCP_CONNECTION_LIMIT 505 +#define VAR_FORWARD_NO_CACHE 506 +#define VAR_STUB_NO_CACHE 507 +#define VAR_LOG_SERVFAIL 508 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -619,7 +641,7 @@ union YYSTYPE char* str; -#line 623 "util/configparser.c" /* yacc.c:355 */ +#line 645 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -636,7 +658,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 640 "util/configparser.c" /* yacc.c:358 */ +#line 662 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -878,21 +900,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 491 +#define YYLAST 512 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 243 +#define YYNTOKENS 254 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 263 +#define YYNNTS 274 /* YYNRULES -- Number of rules. */ -#define YYNRULES 503 +#define YYNRULES 525 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 753 +#define YYNSTATES 787 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 497 +#define YYMAXUTOK 508 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -950,64 +972,67 @@ static const yytype_uint8 yytranslate[] = 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 238, 239, 240, 241, 242 + 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 247, 248, 249, 250, 251, 252, 253 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 163, 163, 163, 164, 164, 165, 165, 166, 166, - 166, 167, 167, 168, 172, 177, 178, 179, 179, 179, - 180, 180, 181, 181, 182, 182, 183, 183, 184, 184, - 184, 185, 185, 185, 186, 186, 187, 187, 188, 188, - 189, 189, 190, 190, 191, 191, 192, 192, 193, 193, - 194, 194, 194, 195, 195, 195, 196, 196, 196, 197, - 197, 198, 198, 199, 199, 200, 200, 201, 201, 201, - 202, 202, 203, 203, 204, 204, 204, 205, 205, 206, - 206, 207, 207, 208, 208, 208, 209, 209, 210, 210, - 211, 211, 212, 212, 213, 213, 214, 214, 214, 215, - 215, 216, 216, 216, 217, 217, 217, 218, 218, 218, - 219, 219, 219, 219, 220, 220, 220, 221, 221, 221, - 222, 222, 223, 223, 224, 224, 225, 225, 226, 226, - 226, 227, 227, 228, 228, 229, 230, 230, 231, 231, - 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, - 237, 237, 238, 238, 239, 239, 240, 240, 241, 241, - 242, 242, 242, 243, 243, 243, 244, 244, 244, 245, - 245, 246, 247, 247, 248, 248, 249, 249, 250, 250, - 251, 251, 251, 252, 252, 254, 266, 267, 268, 268, - 268, 268, 268, 269, 271, 283, 284, 285, 285, 285, - 285, 286, 288, 302, 303, 304, 304, 304, 304, 305, - 305, 305, 307, 323, 324, 325, 325, 325, 325, 326, - 326, 326, 327, 329, 338, 347, 358, 367, 376, 385, - 396, 405, 416, 429, 444, 455, 472, 489, 502, 517, - 526, 535, 544, 553, 562, 571, 580, 589, 598, 607, - 616, 625, 634, 643, 652, 661, 668, 675, 684, 691, - 700, 708, 717, 726, 740, 749, 758, 767, 774, 781, - 807, 815, 822, 829, 836, 843, 851, 859, 867, 874, - 885, 896, 903, 912, 921, 930, 937, 944, 952, 960, - 970, 980, 990, 1003, 1014, 1022, 1035, 1044, 1053, 1062, - 1072, 1082, 1090, 1103, 1112, 1120, 1129, 1137, 1150, 1159, - 1166, 1176, 1186, 1196, 1206, 1216, 1226, 1236, 1246, 1253, - 1260, 1267, 1276, 1285, 1294, 1301, 1311, 1329, 1336, 1354, - 1367, 1380, 1389, 1398, 1407, 1416, 1426, 1436, 1447, 1456, - 1465, 1478, 1491, 1500, 1507, 1516, 1525, 1534, 1543, 1551, - 1564, 1572, 1601, 1608, 1623, 1633, 1643, 1650, 1657, 1666, - 1680, 1699, 1718, 1730, 1742, 1754, 1765, 1784, 1794, 1803, - 1811, 1819, 1832, 1845, 1858, 1871, 1880, 1889, 1898, 1907, - 1917, 1927, 1940, 1953, 1964, 1977, 1988, 2001, 2011, 2018, - 2025, 2034, 2044, 2054, 2064, 2071, 2078, 2087, 2097, 2107, - 2114, 2121, 2128, 2136, 2146, 2156, 2166, 2176, 2206, 2216, - 2224, 2233, 2248, 2257, 2262, 2263, 2264, 2264, 2264, 2265, - 2265, 2265, 2266, 2266, 2268, 2278, 2287, 2294, 2301, 2308, - 2315, 2322, 2329, 2334, 2335, 2336, 2336, 2337, 2337, 2338, - 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2346, 2354, 2361, - 2369, 2377, 2384, 2391, 2400, 2409, 2418, 2427, 2436, 2445, - 2450, 2451, 2452, 2454, 2460, 2470, 2477, 2486, 2494, 2500, - 2501, 2503, 2503, 2503, 2504, 2504, 2505, 2506, 2507, 2508, - 2509, 2511, 2521, 2531, 2538, 2547, 2554, 2563, 2571, 2584, - 2592, 2605, 2610, 2611, 2612, 2612, 2613, 2613, 2613, 2615, - 2629, 2644, 2656, 2671 + 0, 166, 166, 166, 167, 167, 168, 168, 169, 169, + 169, 170, 170, 171, 175, 180, 181, 182, 182, 182, + 183, 183, 184, 184, 185, 185, 186, 186, 186, 187, + 187, 188, 188, 188, 189, 189, 189, 190, 190, 191, + 191, 192, 192, 193, 193, 194, 194, 195, 195, 196, + 196, 197, 197, 198, 198, 198, 199, 199, 199, 200, + 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, + 205, 205, 205, 206, 206, 207, 207, 208, 208, 208, + 209, 209, 210, 210, 211, 211, 212, 212, 212, 213, + 213, 214, 214, 215, 215, 216, 216, 217, 217, 218, + 218, 218, 219, 219, 220, 220, 220, 221, 221, 221, + 222, 222, 222, 223, 223, 223, 223, 224, 225, 225, + 225, 226, 226, 226, 227, 227, 228, 228, 229, 229, + 229, 230, 230, 231, 231, 231, 232, 232, 233, 233, + 234, 235, 235, 236, 236, 237, 237, 238, 239, 239, + 240, 240, 241, 241, 242, 242, 242, 243, 243, 244, + 244, 245, 245, 246, 246, 247, 247, 248, 248, 248, + 249, 249, 249, 250, 250, 250, 251, 251, 252, 253, + 253, 254, 254, 255, 255, 256, 256, 257, 257, 257, + 258, 258, 259, 259, 261, 273, 274, 275, 275, 275, + 275, 275, 276, 276, 278, 290, 291, 292, 292, 292, + 292, 293, 293, 295, 309, 310, 311, 311, 311, 311, + 312, 312, 312, 314, 330, 331, 332, 332, 332, 332, + 333, 333, 333, 334, 336, 345, 354, 365, 374, 383, + 392, 403, 412, 423, 436, 451, 462, 479, 496, 509, + 524, 533, 542, 551, 560, 569, 578, 587, 596, 605, + 614, 623, 632, 641, 654, 663, 676, 685, 694, 703, + 710, 717, 726, 733, 742, 750, 759, 768, 782, 791, + 800, 809, 818, 827, 834, 841, 867, 875, 882, 889, + 896, 903, 911, 919, 927, 934, 945, 956, 963, 972, + 981, 990, 997, 1004, 1012, 1020, 1030, 1040, 1050, 1063, + 1074, 1082, 1095, 1104, 1113, 1122, 1132, 1142, 1150, 1163, + 1172, 1180, 1189, 1197, 1210, 1219, 1226, 1236, 1246, 1256, + 1266, 1276, 1286, 1296, 1306, 1313, 1320, 1327, 1336, 1345, + 1354, 1361, 1371, 1389, 1396, 1414, 1427, 1440, 1449, 1458, + 1467, 1476, 1486, 1496, 1507, 1516, 1525, 1534, 1543, 1556, + 1569, 1578, 1585, 1594, 1603, 1612, 1621, 1629, 1642, 1650, + 1679, 1686, 1701, 1711, 1721, 1728, 1735, 1744, 1752, 1766, + 1785, 1804, 1816, 1828, 1840, 1851, 1870, 1880, 1889, 1897, + 1905, 1918, 1931, 1944, 1957, 1966, 1975, 1984, 1993, 2003, + 2013, 2026, 2039, 2050, 2063, 2074, 2087, 2097, 2104, 2111, + 2120, 2129, 2139, 2149, 2159, 2166, 2173, 2182, 2191, 2201, + 2211, 2218, 2225, 2232, 2240, 2250, 2260, 2270, 2280, 2310, + 2320, 2328, 2337, 2352, 2361, 2366, 2367, 2368, 2368, 2368, + 2369, 2369, 2369, 2370, 2370, 2372, 2382, 2391, 2398, 2405, + 2412, 2419, 2426, 2433, 2438, 2439, 2440, 2440, 2441, 2441, + 2442, 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2450, 2458, + 2465, 2473, 2481, 2488, 2495, 2504, 2513, 2522, 2531, 2540, + 2549, 2554, 2555, 2556, 2558, 2564, 2574, 2581, 2590, 2598, + 2604, 2605, 2607, 2607, 2607, 2608, 2608, 2609, 2610, 2611, + 2612, 2613, 2615, 2625, 2635, 2642, 2651, 2658, 2667, 2675, + 2688, 2696, 2709, 2714, 2715, 2716, 2716, 2717, 2717, 2717, + 2719, 2733, 2748, 2760, 2775, 2788 }; #endif @@ -1020,11 +1045,13 @@ static const char *const yytname[] = "COLON", "ANY", "ZONESTR", "STRING_ARG", "VAR_SERVER", "VAR_VERBOSITY", "VAR_NUM_THREADS", "VAR_PORT", "VAR_OUTGOING_RANGE", "VAR_INTERFACE", "VAR_DO_IP4", "VAR_DO_IP6", "VAR_PREFER_IP6", "VAR_DO_UDP", "VAR_DO_TCP", - "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS", "VAR_CHROOT", "VAR_USERNAME", - "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE", "VAR_MSG_CACHE_SIZE", - "VAR_MSG_CACHE_SLABS", "VAR_NUM_QUERIES_PER_THREAD", - "VAR_RRSET_CACHE_SIZE", "VAR_RRSET_CACHE_SLABS", "VAR_OUTGOING_NUM_TCP", - "VAR_INFRA_HOST_TTL", "VAR_INFRA_LAME_TTL", "VAR_INFRA_CACHE_SLABS", + "VAR_TCP_MSS", "VAR_OUTGOING_TCP_MSS", "VAR_TCP_IDLE_TIMEOUT", + "VAR_EDNS_TCP_KEEPALIVE", "VAR_EDNS_TCP_KEEPALIVE_TIMEOUT", "VAR_CHROOT", + "VAR_USERNAME", "VAR_DIRECTORY", "VAR_LOGFILE", "VAR_PIDFILE", + "VAR_MSG_CACHE_SIZE", "VAR_MSG_CACHE_SLABS", + "VAR_NUM_QUERIES_PER_THREAD", "VAR_RRSET_CACHE_SIZE", + "VAR_RRSET_CACHE_SLABS", "VAR_OUTGOING_NUM_TCP", "VAR_INFRA_HOST_TTL", + "VAR_INFRA_LAME_TTL", "VAR_INFRA_CACHE_SLABS", "VAR_INFRA_CACHE_NUMHOSTS", "VAR_INFRA_CACHE_LAME_SIZE", "VAR_NAME", "VAR_STUB_ZONE", "VAR_STUB_HOST", "VAR_STUB_ADDR", "VAR_TARGET_FETCH_POLICY", "VAR_HARDEN_SHORT_BUFSIZE", @@ -1055,16 +1082,16 @@ static const char *const yytname[] = "VAR_SO_RCVBUF", "VAR_EDNS_BUFFER_SIZE", "VAR_PREFETCH", "VAR_PREFETCH_KEY", "VAR_SO_SNDBUF", "VAR_SO_REUSEPORT", "VAR_HARDEN_BELOW_NXDOMAIN", "VAR_IGNORE_CD_FLAG", "VAR_LOG_QUERIES", - "VAR_LOG_REPLIES", "VAR_TCP_UPSTREAM", "VAR_SSL_UPSTREAM", - "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", - "VAR_FORWARD_FIRST", "VAR_STUB_SSL_UPSTREAM", "VAR_FORWARD_SSL_UPSTREAM", - "VAR_TLS_CERT_BUNDLE", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", - "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", - "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", + "VAR_LOG_REPLIES", "VAR_LOG_LOCAL_ACTIONS", "VAR_TCP_UPSTREAM", + "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", + "VAR_SSL_PORT", "VAR_FORWARD_FIRST", "VAR_STUB_SSL_UPSTREAM", + "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_STUB_FIRST", + "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", + "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL", - "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", - "VAR_DNSTAP_SEND_IDENTITY", "VAR_DNSTAP_SEND_VERSION", - "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", + "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", + "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_SEND_IDENTITY", + "VAR_DNSTAP_SEND_VERSION", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES", "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES", "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES", @@ -1086,7 +1113,8 @@ static const char *const yytname[] = "VAR_LOCAL_ZONE_TAG", "VAR_ACCESS_CONTROL_TAG", "VAR_LOCAL_ZONE_OVERRIDE", "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", - "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", + "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_SERVE_EXPIRED_TTL", + "VAR_SERVE_EXPIRED_TTL_RESET", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING", "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "VAR_ROOT_KEY_SENTINEL", "VAR_DNSCRYPT", @@ -1104,12 +1132,14 @@ static const char *const yytname[] = "VAR_FOR_UPSTREAM", "VAR_AUTH_ZONE", "VAR_ZONEFILE", "VAR_MASTER", "VAR_URL", "VAR_FOR_DOWNSTREAM", "VAR_FALLBACK_ENABLED", "VAR_TLS_ADDITIONAL_PORT", "VAR_LOW_RTT", "VAR_LOW_RTT_PERMIL", - "VAR_ALLOW_NOTIFY", "VAR_TLS_WIN_CERT", "$accept", "toplevelvars", - "toplevelvar", "serverstart", "contents_server", "content_server", - "stubstart", "contents_stub", "content_stub", "forwardstart", - "contents_forward", "content_forward", "viewstart", "contents_view", - "content_view", "authstart", "contents_auth", "content_auth", - "server_num_threads", "server_verbosity", "server_statistics_interval", + "VAR_ALLOW_NOTIFY", "VAR_TLS_WIN_CERT", "VAR_TCP_CONNECTION_LIMIT", + "VAR_FORWARD_NO_CACHE", "VAR_STUB_NO_CACHE", "VAR_LOG_SERVFAIL", + "$accept", "toplevelvars", "toplevelvar", "serverstart", + "contents_server", "content_server", "stubstart", "contents_stub", + "content_stub", "forwardstart", "contents_forward", "content_forward", + "viewstart", "contents_view", "content_view", "authstart", + "contents_auth", "content_auth", "server_num_threads", + "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", "server_shm_enable", "server_shm_key", "server_port", "server_send_client_subnet", "server_client_subnet_zone", @@ -1120,13 +1150,15 @@ static const char *const yytname[] = "server_outgoing_num_tcp", "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", "server_do_ip6", "server_do_udp", "server_do_tcp", "server_prefer_ip6", "server_tcp_mss", - "server_outgoing_tcp_mss", "server_tcp_upstream", - "server_udp_upstream_without_downstream", "server_ssl_upstream", - "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", - "server_tls_cert_bundle", "server_tls_win_cert", - "server_tls_additional_port", "server_use_systemd", - "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", - "server_log_queries", "server_log_replies", "server_chroot", + "server_outgoing_tcp_mss", "server_tcp_idle_timeout", + "server_tcp_keepalive", "server_tcp_keepalive_timeout", + "server_tcp_upstream", "server_udp_upstream_without_downstream", + "server_ssl_upstream", "server_ssl_service_key", + "server_ssl_service_pem", "server_ssl_port", "server_tls_cert_bundle", + "server_tls_win_cert", "server_tls_additional_port", + "server_use_systemd", "server_do_daemonize", "server_use_syslog", + "server_log_time_ascii", "server_log_queries", "server_log_replies", + "server_log_servfail", "server_log_local_actions", "server_chroot", "server_username", "server_directory", "server_logfile", "server_pidfile", "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", "server_auto_trust_anchor_file", @@ -1159,30 +1191,32 @@ static const char *const yytname[] = "server_cache_max_negative_ttl", "server_cache_min_ttl", "server_bogus_ttl", "server_val_clean_additional", "server_val_permissive_mode", "server_aggressive_nsec", - "server_ignore_cd_flag", "server_serve_expired", "server_fake_dsa", - "server_fake_sha1", "server_val_log_level", + "server_ignore_cd_flag", "server_serve_expired", + "server_serve_expired_ttl", "server_serve_expired_ttl_reset", + "server_fake_dsa", "server_fake_sha1", "server_val_log_level", "server_val_nsec3_keysize_iterations", "server_add_holddown", "server_del_holddown", "server_keep_missing", "server_permit_small_holddown", "server_key_cache_size", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", "server_local_data_ptr", "server_minimal_responses", "server_rrset_roundrobin", "server_max_udp_size", "server_dns64_prefix", - "server_dns64_synthall", "server_define_tag", "server_local_zone_tag", - "server_access_control_tag", "server_access_control_tag_action", - "server_access_control_tag_data", "server_local_zone_override", - "server_access_control_view", "server_response_ip_tag", - "server_ip_ratelimit", "server_ratelimit", "server_ip_ratelimit_size", - "server_ratelimit_size", "server_ip_ratelimit_slabs", - "server_ratelimit_slabs", "server_ratelimit_for_domain", - "server_ratelimit_below_domain", "server_ip_ratelimit_factor", - "server_ratelimit_factor", "server_low_rtt", "server_low_rtt_permil", - "server_qname_minimisation", "server_qname_minimisation_strict", - "server_ipsecmod_enabled", "server_ipsecmod_ignore_bogus", - "server_ipsecmod_hook", "server_ipsecmod_max_ttl", - "server_ipsecmod_whitelist", "server_ipsecmod_strict", "stub_name", - "stub_host", "stub_addr", "stub_first", "stub_ssl_upstream", - "stub_prime", "forward_name", "forward_host", "forward_addr", - "forward_first", "forward_ssl_upstream", "auth_name", "auth_zonefile", + "server_dns64_synthall", "server_dns64_ignore_aaaa", "server_define_tag", + "server_local_zone_tag", "server_access_control_tag", + "server_access_control_tag_action", "server_access_control_tag_data", + "server_local_zone_override", "server_access_control_view", + "server_response_ip_tag", "server_ip_ratelimit", "server_ratelimit", + "server_ip_ratelimit_size", "server_ratelimit_size", + "server_ip_ratelimit_slabs", "server_ratelimit_slabs", + "server_ratelimit_for_domain", "server_ratelimit_below_domain", + "server_ip_ratelimit_factor", "server_ratelimit_factor", + "server_low_rtt", "server_low_rtt_permil", "server_qname_minimisation", + "server_qname_minimisation_strict", "server_ipsecmod_enabled", + "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook", + "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist", + "server_ipsecmod_strict", "stub_name", "stub_host", "stub_addr", + "stub_first", "stub_no_cache", "stub_ssl_upstream", "stub_prime", + "forward_name", "forward_host", "forward_addr", "forward_first", + "forward_no_cache", "forward_ssl_upstream", "auth_name", "auth_zonefile", "auth_master", "auth_url", "auth_allow_notify", "auth_for_downstream", "auth_for_upstream", "auth_fallback_enabled", "view_name", "view_local_zone", "view_response_ip", "view_response_ip_data", @@ -1210,7 +1244,7 @@ static const char *const yytname[] = "dnsc_dnscrypt_nonce_cache_size", "dnsc_dnscrypt_nonce_cache_slabs", "cachedbstart", "contents_cachedb", "content_cachedb", "cachedb_backend_name", "cachedb_secret_seed", "redis_server_host", - "redis_server_port", "redis_timeout", YY_NULLPTR + "redis_server_port", "redis_timeout", "server_tcp_connection_limit", YY_NULLPTR }; #endif @@ -1243,14 +1277,15 @@ static const yytype_uint16 yytoknum[] = 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 + 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, + 505, 506, 507, 508 }; # endif -#define YYPACT_NINF -184 +#define YYPACT_NINF -150 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-184))) + (!!((Yystate) == (-150))) #define YYTABLE_NINF -1 @@ -1261,82 +1296,85 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -184, 0, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, 221, -37, -32, -38, -39, -62, - -129, -104, -160, -183, -3, -1, 2, 3, 4, 5, - 30, 48, 49, 50, 51, 52, 54, 55, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 82, 83, 84, 85, 87, 88, 91, 93, - 94, 95, 96, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 114, 115, 116, - 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 148, - 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 189, 190, 191, 193, 194, 195, 196, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, - 219, 220, 251, 252, 253, 254, 258, 259, 260, 302, - 303, 304, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, 305, 306, 307, 308, 309, 310, -184, -184, -184, - -184, -184, -184, -184, 314, 318, 319, 343, 344, -184, - -184, -184, -184, -184, -184, 345, 347, 357, 358, 359, - 360, 361, -184, -184, -184, -184, -184, -184, -184, -184, - 362, 363, 364, 365, 366, 367, 368, 369, -184, -184, - -184, -184, -184, -184, -184, -184, -184, 404, 406, 418, - 419, 420, 421, 422, 423, -184, -184, -184, -184, -184, - -184, -184, -184, -184, 424, 425, 426, 427, 428, 435, - 436, 437, 438, 439, 440, 442, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, 443, - -184, -184, 444, 445, 446, 447, 448, 452, 454, 455, - 456, 457, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, 458, 459, 460, 461, 462, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - 463, 464, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, 465, 466, 467, -184, -184, - -184, -184, -184, -184, -184, -184, -184, 468, 469, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, 470, 471, 472, 473, 474, 475, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, 476, -184, -184, 477, 478, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, 479, 480, 481, -184, -184, -184, -184, - -184, -184, -184 + -150, 208, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -12, 99, 159, 143, 39, 215, + 107, -80, 104, -149, 22, 23, 24, 28, 29, 30, + 78, 79, 80, 84, 88, 89, 114, 115, 116, 118, + 129, 130, 131, 133, 136, 137, 138, 139, 140, 141, + 178, 193, 194, 196, 197, 199, 202, 210, 211, 214, + 216, 217, 218, 219, 220, 221, 222, 230, 232, 233, + 234, 235, 236, 238, 239, 240, 241, 243, 244, 245, + 246, 247, 261, 262, 263, 264, 265, 266, 268, 274, + 275, 276, 278, 279, 280, 281, 282, 283, 284, 286, + 288, 289, 290, 291, 293, 294, 295, 296, 297, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 334, 335, 336, 337, 338, 339, 340, + 342, 343, 344, 345, 346, 347, 348, 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, 397, 398, 399, 401, 402, 403, 404, + 405, 406, 407, 408, 409, 410, 411, 413, 414, 415, + 416, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, 417, + 418, 419, 420, 421, 422, 423, -150, -150, -150, -150, + -150, -150, -150, -150, 424, 425, 426, 427, 428, 430, + -150, -150, -150, -150, -150, -150, -150, 431, 432, 433, + 434, 435, 436, 438, -150, -150, -150, -150, -150, -150, + -150, -150, 439, 440, 441, 442, 443, 444, 445, 446, + -150, -150, -150, -150, -150, -150, -150, -150, -150, 447, + 448, 449, 450, 451, 452, 453, 454, -150, -150, -150, + -150, -150, -150, -150, -150, -150, 455, 456, 457, 458, + 459, 460, 461, 462, 463, 464, 465, 466, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, 467, -150, -150, 468, 469, 470, 471, 472, 473, + 474, 475, 476, 477, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, 478, 479, 480, 481, 482, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, 483, 484, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, 485, 486, 487, -150, -150, -150, -150, -150, + -150, -150, -150, -150, 488, 489, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, 490, 491, 492, 493, 494, 495, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, 496, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, 497, -150, -150, + 498, 499, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, 500, 501, 502, -150, + -150, -150, -150, -150, -150, -150, -150 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1344,9 +1382,9 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 14, 185, 194, 413, 459, 432, 202, - 468, 491, 212, 3, 16, 187, 196, 204, 214, 415, - 434, 461, 470, 493, 4, 5, 6, 10, 13, 8, + 2, 0, 1, 14, 194, 204, 434, 480, 453, 213, + 489, 512, 223, 3, 16, 196, 206, 215, 225, 436, + 455, 482, 491, 514, 4, 5, 6, 10, 13, 8, 9, 7, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1364,126 +1402,131 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 15, 17, 18, 77, 80, 89, 166, 167, - 19, 139, 140, 141, 142, 143, 144, 28, 68, 20, - 81, 82, 39, 61, 76, 21, 22, 24, 25, 23, - 26, 27, 112, 178, 113, 114, 115, 116, 180, 184, - 181, 162, 78, 67, 93, 110, 111, 29, 30, 31, - 32, 33, 69, 83, 84, 99, 55, 65, 56, 170, - 171, 94, 49, 50, 169, 51, 52, 103, 107, 120, - 128, 149, 104, 62, 34, 35, 36, 91, 121, 122, - 123, 37, 38, 40, 41, 43, 44, 42, 126, 45, - 46, 47, 53, 72, 108, 86, 127, 79, 145, 87, - 88, 105, 106, 92, 48, 70, 73, 54, 57, 95, - 96, 71, 146, 97, 58, 59, 60, 179, 109, 159, - 160, 168, 98, 66, 100, 101, 102, 147, 63, 64, - 85, 74, 75, 90, 117, 118, 119, 124, 125, 150, - 151, 153, 155, 156, 154, 157, 163, 129, 130, 133, - 134, 131, 132, 135, 136, 138, 137, 182, 183, 148, - 158, 172, 174, 173, 175, 176, 177, 152, 161, 164, - 165, 0, 0, 0, 0, 0, 0, 186, 188, 189, - 190, 192, 193, 191, 0, 0, 0, 0, 0, 195, - 197, 198, 199, 200, 201, 0, 0, 0, 0, 0, - 0, 0, 203, 205, 206, 209, 210, 207, 211, 208, - 0, 0, 0, 0, 0, 0, 0, 0, 213, 215, - 216, 217, 218, 222, 219, 220, 221, 0, 0, 0, - 0, 0, 0, 0, 0, 414, 416, 418, 417, 423, - 419, 420, 421, 422, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 433, 435, 436, 437, - 438, 439, 440, 441, 442, 443, 444, 445, 446, 0, - 460, 462, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 469, 471, 472, 473, 475, 476, 474, 477, - 478, 479, 480, 0, 0, 0, 0, 0, 492, 494, - 495, 496, 497, 498, 224, 223, 230, 239, 237, 245, - 246, 249, 247, 248, 250, 251, 267, 268, 269, 270, - 271, 294, 295, 296, 301, 302, 242, 303, 304, 307, - 305, 306, 309, 310, 311, 324, 282, 283, 285, 286, - 312, 327, 276, 278, 328, 334, 335, 336, 243, 293, - 348, 349, 277, 343, 263, 238, 272, 325, 331, 313, - 0, 0, 352, 244, 225, 262, 317, 226, 240, 241, - 273, 274, 350, 315, 319, 320, 227, 353, 297, 323, - 264, 281, 329, 330, 333, 342, 275, 346, 344, 345, - 287, 292, 321, 322, 288, 289, 314, 338, 265, 266, - 252, 254, 255, 256, 257, 258, 354, 355, 356, 298, - 299, 300, 308, 357, 358, 0, 0, 0, 316, 290, - 464, 367, 371, 369, 368, 372, 370, 0, 0, 375, - 376, 231, 232, 233, 234, 235, 236, 318, 332, 347, - 379, 380, 291, 359, 0, 0, 0, 0, 0, 0, - 339, 340, 341, 465, 284, 279, 337, 261, 228, 229, - 280, 381, 383, 382, 384, 385, 386, 253, 260, 377, - 378, 259, 387, 388, 389, 392, 391, 390, 393, 394, - 395, 396, 397, 406, 0, 410, 411, 0, 0, 412, - 398, 404, 399, 400, 401, 403, 405, 402, 424, 426, - 425, 428, 429, 430, 431, 427, 447, 448, 449, 450, - 451, 452, 453, 454, 455, 456, 457, 458, 463, 481, - 482, 483, 486, 484, 485, 487, 488, 489, 490, 499, - 500, 501, 502, 503, 326, 351, 366, 466, 467, 373, - 374, 360, 361, 0, 0, 0, 365, 407, 408, 409, - 364, 362, 363 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 17, 18, 80, 83, 92, 173, 174, 19, + 144, 145, 146, 147, 148, 149, 31, 71, 20, 84, + 85, 42, 64, 79, 21, 22, 24, 25, 23, 26, + 27, 28, 29, 30, 115, 185, 116, 118, 119, 120, + 187, 191, 188, 169, 81, 70, 96, 113, 114, 193, + 117, 32, 33, 34, 35, 36, 72, 86, 87, 102, + 58, 68, 59, 177, 178, 97, 52, 53, 176, 54, + 55, 106, 110, 124, 133, 154, 107, 65, 37, 38, + 39, 94, 125, 126, 127, 40, 41, 43, 44, 46, + 47, 45, 131, 48, 49, 50, 56, 75, 111, 89, + 132, 82, 150, 90, 91, 108, 109, 95, 51, 73, + 76, 57, 60, 98, 99, 74, 151, 100, 61, 62, + 63, 186, 112, 164, 165, 166, 167, 175, 101, 69, + 103, 104, 105, 152, 66, 67, 88, 77, 78, 93, + 121, 122, 123, 128, 129, 130, 155, 156, 158, 160, + 161, 159, 162, 170, 134, 135, 138, 139, 136, 137, + 140, 141, 143, 142, 189, 190, 153, 163, 179, 181, + 180, 182, 183, 184, 157, 168, 171, 172, 192, 0, + 0, 0, 0, 0, 0, 0, 195, 197, 198, 199, + 201, 202, 203, 200, 0, 0, 0, 0, 0, 0, + 205, 207, 208, 209, 210, 211, 212, 0, 0, 0, + 0, 0, 0, 0, 214, 216, 217, 220, 221, 218, + 222, 219, 0, 0, 0, 0, 0, 0, 0, 0, + 224, 226, 227, 228, 229, 233, 230, 231, 232, 0, + 0, 0, 0, 0, 0, 0, 0, 435, 437, 439, + 438, 444, 440, 441, 442, 443, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 454, 456, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, + 467, 0, 481, 483, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 490, 492, 493, 494, 496, 497, + 495, 498, 499, 500, 501, 0, 0, 0, 0, 0, + 513, 515, 516, 517, 518, 519, 235, 234, 241, 250, + 248, 256, 257, 260, 258, 259, 261, 262, 263, 264, + 265, 283, 284, 285, 286, 287, 310, 311, 312, 317, + 318, 253, 319, 320, 323, 321, 322, 325, 326, 327, + 340, 298, 299, 301, 302, 328, 343, 292, 294, 344, + 350, 351, 352, 254, 309, 366, 367, 293, 361, 277, + 249, 288, 341, 347, 329, 0, 0, 370, 255, 236, + 276, 333, 237, 251, 252, 289, 290, 368, 331, 335, + 336, 238, 371, 313, 339, 278, 297, 345, 346, 349, + 360, 291, 364, 362, 363, 303, 308, 337, 338, 304, + 305, 330, 354, 279, 280, 282, 266, 268, 269, 270, + 271, 272, 372, 373, 374, 314, 315, 316, 324, 375, + 376, 377, 0, 0, 0, 332, 306, 485, 386, 390, + 388, 387, 391, 389, 0, 0, 394, 395, 242, 243, + 244, 245, 246, 247, 334, 348, 365, 398, 399, 307, + 378, 0, 0, 0, 0, 0, 0, 355, 356, 357, + 358, 359, 486, 300, 295, 353, 275, 239, 240, 296, + 400, 402, 401, 403, 404, 405, 267, 274, 396, 397, + 273, 0, 281, 406, 407, 408, 412, 411, 409, 410, + 413, 414, 415, 416, 418, 417, 427, 0, 431, 432, + 0, 0, 433, 419, 425, 420, 421, 422, 424, 426, + 423, 445, 447, 446, 449, 450, 451, 452, 448, 468, + 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, + 479, 484, 502, 503, 504, 507, 505, 506, 508, 509, + 510, 511, 520, 521, 522, 523, 524, 342, 369, 385, + 487, 488, 392, 393, 379, 380, 0, 0, 0, 384, + 525, 428, 429, 430, 383, 381, 382 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184 + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150, -150, -150, -150, -150, -150, -150, + -150, -150, -150, -150 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 13, 14, 24, 202, 15, 25, 377, 16, - 26, 389, 17, 27, 402, 18, 28, 418, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 238, 239, 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, 378, 379, 380, 381, 382, 383, 390, 391, - 392, 393, 394, 419, 420, 421, 422, 423, 424, 425, - 426, 403, 404, 405, 406, 407, 408, 409, 19, 29, - 435, 436, 437, 438, 439, 440, 441, 442, 443, 20, - 30, 456, 457, 458, 459, 460, 461, 462, 463, 464, - 465, 466, 467, 468, 21, 31, 470, 471, 367, 368, - 369, 370, 22, 32, 482, 483, 484, 485, 486, 487, - 488, 489, 490, 491, 492, 23, 33, 498, 499, 500, - 501, 502, 503 + -1, 1, 13, 14, 24, 211, 15, 25, 396, 16, + 26, 410, 17, 27, 424, 18, 28, 440, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 234, 235, 236, 237, 238, 239, 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, + 397, 398, 399, 400, 401, 402, 403, 411, 412, 413, + 414, 415, 416, 441, 442, 443, 444, 445, 446, 447, + 448, 425, 426, 427, 428, 429, 430, 431, 19, 29, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 20, + 30, 478, 479, 480, 481, 482, 483, 484, 485, 486, + 487, 488, 489, 490, 21, 31, 492, 493, 384, 385, + 386, 387, 22, 32, 504, 505, 506, 507, 508, 509, + 510, 511, 512, 513, 514, 23, 33, 520, 521, 522, + 523, 524, 525, 388 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1491,167 +1534,173 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 410, 395, 371, 469, 372, 373, 504, 384, 505, - 0, 3, 506, 507, 508, 509, 385, 386, 444, 445, - 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, - 427, 428, 429, 430, 431, 432, 433, 434, 396, 397, - 510, 4, 493, 494, 495, 496, 497, 5, 472, 473, - 474, 475, 476, 477, 478, 479, 480, 481, 511, 512, - 513, 514, 515, 398, 516, 517, 374, 518, 519, 520, - 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, - 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, - 541, 6, 542, 543, 544, 545, 375, 546, 547, 376, - 387, 548, 388, 549, 550, 551, 552, 7, 553, 554, - 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, - 565, 566, 399, 400, 567, 568, 569, 570, 571, 572, - 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - 583, 584, 585, 586, 587, 588, 8, 589, 590, 591, - 592, 593, 594, 595, 596, 597, 598, 401, 599, 600, - 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, - 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, - 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, - 631, 632, 411, 9, 412, 413, 414, 415, 416, 633, - 634, 635, 417, 636, 637, 638, 639, 10, 640, 641, - 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, - 652, 653, 654, 655, 11, 656, 657, 658, 659, 660, - 661, 0, 12, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 662, 663, 664, 665, 62, 63, 64, 666, 667, - 668, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 669, 670, 671, 672, 673, 674, 675, 676, - 677, 106, 107, 108, 678, 109, 110, 111, 679, 680, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 681, 682, 683, 135, 684, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 685, 686, 687, - 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 698, 179, 699, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 700, 701, - 702, 703, 704, 705, 706, 707, 708, 709, 710, 191, - 192, 193, 194, 195, 196, 711, 712, 713, 714, 715, - 716, 197, 717, 718, 719, 720, 721, 722, 723, 198, - 199, 200, 724, 201, 725, 726, 727, 728, 729, 730, - 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, - 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, - 751, 752 + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 491, 526, 527, 528, 65, 66, 67, 529, 530, + 531, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 432, 515, 516, 517, 518, 519, 532, 533, + 534, 109, 110, 111, 535, 112, 113, 114, 536, 537, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 538, 539, 540, 139, 541, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 542, + 543, 544, 389, 545, 390, 391, 546, 547, 548, 549, + 550, 551, 150, 151, 152, 153, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 417, 184, 552, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 404, 553, 554, 392, 555, 556, 2, 557, + 405, 406, 558, 198, 199, 200, 201, 202, 203, 3, + 559, 560, 418, 419, 561, 204, 562, 563, 564, 565, + 566, 567, 568, 205, 206, 207, 393, 208, 209, 394, + 569, 210, 570, 571, 572, 573, 574, 420, 575, 576, + 577, 578, 4, 579, 580, 581, 582, 583, 5, 466, + 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, + 477, 584, 585, 586, 587, 588, 589, 433, 590, 434, + 435, 436, 437, 438, 591, 592, 593, 439, 594, 595, + 596, 597, 598, 599, 600, 407, 601, 408, 602, 603, + 604, 605, 6, 606, 607, 608, 609, 610, 421, 422, + 449, 450, 451, 452, 453, 454, 455, 456, 7, 494, + 495, 496, 497, 498, 499, 500, 501, 502, 503, 611, + 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, + 622, 623, 624, 423, 625, 626, 627, 628, 629, 630, + 631, 395, 632, 633, 634, 635, 636, 637, 638, 8, + 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, + 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, + 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, + 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, + 679, 680, 681, 682, 683, 684, 9, 685, 686, 687, + 409, 688, 689, 690, 691, 692, 693, 694, 695, 696, + 697, 698, 10, 699, 700, 701, 702, 703, 704, 705, + 706, 707, 708, 709, 710, 711, 712, 713, 714, 11, + 715, 716, 717, 718, 719, 720, 721, 12, 722, 723, + 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, + 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, + 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, + 754, 755, 756, 757, 758, 759, 760, 761, 762, 763, + 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, + 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, + 784, 785, 786 }; -static const yytype_int16 yycheck[] = +static const yytype_uint8 yycheck[] = { - 0, 40, 40, 40, 108, 42, 43, 10, 40, 10, - -1, 11, 10, 10, 10, 10, 48, 49, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 92, 93, 94, 95, 96, 97, 98, 99, 76, 77, - 10, 41, 225, 226, 227, 228, 229, 47, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 10, 10, - 10, 10, 10, 101, 10, 10, 103, 10, 10, 10, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 111, 10, 10, 10, 47, 48, 49, 10, 10, + 10, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 43, 232, 233, 234, 235, 236, 10, 10, + 10, 103, 104, 105, 10, 107, 108, 109, 10, 10, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 10, 10, 10, 139, 10, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 10, + 10, 10, 43, 10, 45, 46, 10, 10, 10, 10, + 10, 10, 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, 43, 199, 10, 201, + 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, + 212, 213, 43, 10, 10, 106, 10, 10, 0, 10, + 51, 52, 10, 225, 226, 227, 228, 229, 230, 11, + 10, 10, 79, 80, 10, 237, 10, 10, 10, 10, + 10, 10, 10, 245, 246, 247, 137, 249, 250, 140, + 10, 253, 10, 10, 10, 10, 10, 104, 10, 10, + 10, 10, 44, 10, 10, 10, 10, 10, 50, 152, + 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, + 163, 10, 10, 10, 10, 10, 10, 238, 10, 240, + 241, 242, 243, 244, 10, 10, 10, 248, 10, 10, + 10, 10, 10, 10, 10, 136, 10, 138, 10, 10, + 10, 10, 94, 10, 10, 10, 10, 10, 165, 166, + 95, 96, 97, 98, 99, 100, 101, 102, 110, 215, + 216, 217, 218, 219, 220, 221, 222, 223, 224, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 200, 10, 10, 10, 10, 10, 10, + 10, 252, 10, 10, 10, 10, 10, 10, 10, 151, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 91, 10, 10, 10, 10, 133, 10, 10, 136, - 132, 10, 134, 10, 10, 10, 10, 107, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 160, 161, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 146, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 195, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 198, 10, 10, 10, + 251, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 214, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 231, + 10, 10, 10, 10, 10, 10, 10, 239, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 231, 193, 233, 234, 235, 236, 237, 10, - 10, 10, 241, 10, 10, 10, 10, 207, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 224, 10, 10, 10, 10, 10, - 10, -1, 232, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 10, 10, 10, 10, 44, 45, 46, 10, 10, - 10, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 100, 101, 102, 10, 104, 105, 106, 10, 10, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 10, 10, 10, 135, 10, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 10, 194, 10, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 218, - 219, 220, 221, 222, 223, 10, 10, 10, 10, 10, - 10, 230, 10, 10, 10, 10, 10, 10, 10, 238, - 239, 240, 10, 242, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10 + 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 244, 0, 11, 41, 47, 91, 107, 146, 193, - 207, 224, 232, 245, 246, 249, 252, 255, 258, 451, - 462, 477, 485, 498, 247, 250, 253, 256, 259, 452, - 463, 478, 486, 499, 12, 13, 14, 15, 16, 17, + 0, 255, 0, 11, 44, 50, 94, 110, 151, 198, + 214, 231, 239, 256, 257, 260, 263, 266, 269, 472, + 483, 498, 506, 519, 258, 261, 264, 267, 270, 473, + 484, 499, 507, 520, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 44, 45, 46, 50, 51, 52, 53, 54, + 38, 39, 40, 41, 42, 47, 48, 49, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 100, 101, 102, 104, - 105, 106, 109, 110, 111, 112, 113, 114, 115, 116, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 103, + 104, 105, 107, 108, 109, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 135, 137, 138, 139, 140, - 141, 142, 143, 144, 145, 159, 160, 161, 162, 163, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 139, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 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, 194, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 218, 219, 220, 221, 222, 223, 230, 238, 239, - 240, 242, 248, 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, 422, 423, 424, 481, 482, 483, - 484, 40, 42, 43, 103, 133, 136, 251, 425, 426, - 427, 428, 429, 430, 40, 48, 49, 132, 134, 254, - 431, 432, 433, 434, 435, 40, 76, 77, 101, 160, - 161, 195, 257, 444, 445, 446, 447, 448, 449, 450, - 40, 231, 233, 234, 235, 236, 237, 241, 260, 436, - 437, 438, 439, 440, 441, 442, 443, 92, 93, 94, - 95, 96, 97, 98, 99, 453, 454, 455, 456, 457, - 458, 459, 460, 461, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158, 464, 465, 466, 467, - 468, 469, 470, 471, 472, 473, 474, 475, 476, 108, - 479, 480, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 487, 488, 489, 490, 491, 492, 493, 494, - 495, 496, 497, 225, 226, 227, 228, 229, 500, 501, - 502, 503, 504, 505, 10, 10, 10, 10, 10, 10, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 199, 201, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 225, 226, + 227, 228, 229, 230, 237, 245, 246, 247, 249, 250, + 253, 259, 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, 422, 423, 424, 425, 426, 427, 428, 429, + 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, + 440, 441, 442, 443, 502, 503, 504, 505, 527, 43, + 45, 46, 106, 137, 140, 252, 262, 444, 445, 446, + 447, 448, 449, 450, 43, 51, 52, 136, 138, 251, + 265, 451, 452, 453, 454, 455, 456, 43, 79, 80, + 104, 165, 166, 200, 268, 465, 466, 467, 468, 469, + 470, 471, 43, 238, 240, 241, 242, 243, 244, 248, + 271, 457, 458, 459, 460, 461, 462, 463, 464, 95, + 96, 97, 98, 99, 100, 101, 102, 474, 475, 476, + 477, 478, 479, 480, 481, 482, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 485, 486, + 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, + 497, 111, 500, 501, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 508, 509, 510, 511, 512, 513, + 514, 515, 516, 517, 518, 232, 233, 234, 235, 236, + 521, 522, 523, 524, 525, 526, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1676,36 +1725,37 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 243, 244, 244, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 246, 247, 247, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 249, 250, 250, 251, 251, - 251, 251, 251, 251, 252, 253, 253, 254, 254, 254, - 254, 254, 255, 256, 256, 257, 257, 257, 257, 257, - 257, 257, 258, 259, 259, 260, 260, 260, 260, 260, - 260, 260, 260, 261, 262, 263, 264, 265, 266, 267, - 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 0, 254, 255, 255, 256, 256, 256, 256, 256, 256, + 256, 256, 256, 256, 257, 258, 258, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 260, 261, 261, 262, 262, 262, + 262, 262, 262, 262, 263, 264, 264, 265, 265, 265, + 265, 265, 265, 266, 267, 267, 268, 268, 268, 268, + 268, 268, 268, 269, 270, 270, 271, 271, 271, 271, + 271, 271, 271, 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, @@ -1723,16 +1773,18 @@ static const yytype_uint16 yyr1[] = 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, 452, 453, 453, 453, 453, - 453, 453, 453, 453, 454, 455, 456, 457, 458, 459, - 460, 461, 462, 463, 463, 464, 464, 464, 464, 464, - 464, 464, 464, 464, 464, 464, 464, 465, 466, 467, - 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, - 478, 478, 479, 480, 481, 482, 483, 484, 485, 486, - 486, 487, 487, 487, 487, 487, 487, 487, 487, 487, - 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, - 497, 498, 499, 499, 500, 500, 500, 500, 500, 501, - 502, 503, 504, 505 + 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, 473, 474, 474, 474, + 474, 474, 474, 474, 474, 475, 476, 477, 478, 479, + 480, 481, 482, 483, 484, 484, 485, 485, 485, 485, + 485, 485, 485, 485, 485, 485, 485, 485, 486, 487, + 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, + 498, 499, 499, 500, 501, 502, 503, 504, 505, 506, + 507, 507, 508, 508, 508, 508, 508, 508, 508, 508, + 508, 508, 509, 510, 511, 512, 513, 514, 515, 516, + 517, 518, 519, 520, 520, 521, 521, 521, 521, 521, + 522, 523, 524, 525, 526, 527 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1756,11 +1808,12 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 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, 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, 2, 2, + 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1770,25 +1823,26 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 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, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, - 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, 3, + 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, 3, 3, 3, + 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, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 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, - 1, 1, 1, 1, 1, 1, 1, 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 + 2, 2, 2, 2, 2, 3 }; @@ -2465,15 +2519,15 @@ yyreduce: switch (yyn) { case 14: -#line 173 "util/configparser.y" /* yacc.c:1646 */ +#line 176 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2473 "util/configparser.c" /* yacc.c:1646 */ +#line 2527 "util/configparser.c" /* yacc.c:1646 */ break; - case 185: -#line 255 "util/configparser.y" /* yacc.c:1646 */ + case 194: +#line 262 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2484,11 +2538,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2488 "util/configparser.c" /* yacc.c:1646 */ +#line 2542 "util/configparser.c" /* yacc.c:1646 */ break; - case 194: -#line 272 "util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 279 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2499,11 +2553,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2503 "util/configparser.c" /* yacc.c:1646 */ +#line 2557 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: -#line 289 "util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 296 "util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2516,11 +2570,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2520 "util/configparser.c" /* yacc.c:1646 */ +#line 2574 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 308 "util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 315 "util/configparser.y" /* yacc.c:1646 */ { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2535,11 +2589,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2539 "util/configparser.c" /* yacc.c:1646 */ +#line 2593 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 330 "util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 337 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2547,11 +2601,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2551 "util/configparser.c" /* yacc.c:1646 */ +#line 2605 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 339 "util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 346 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2559,11 +2613,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2563 "util/configparser.c" /* yacc.c:1646 */ +#line 2617 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 348 "util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 355 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2573,11 +2627,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2577 "util/configparser.c" /* yacc.c:1646 */ +#line 2631 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 359 "util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 366 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2585,11 +2639,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2589 "util/configparser.c" /* yacc.c:1646 */ +#line 2643 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 368 "util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 375 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2597,11 +2651,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2601 "util/configparser.c" /* yacc.c:1646 */ +#line 2655 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 377 "util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 384 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2609,11 +2663,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2613 "util/configparser.c" /* yacc.c:1646 */ +#line 2667 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 386 "util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 393 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2623,11 +2677,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2627 "util/configparser.c" /* yacc.c:1646 */ +#line 2681 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 397 "util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 404 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2635,11 +2689,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2639 "util/configparser.c" /* yacc.c:1646 */ +#line 2693 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 406 "util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 413 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2649,11 +2703,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2653 "util/configparser.c" /* yacc.c:1646 */ +#line 2707 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 417 "util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 424 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2664,11 +2718,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2668 "util/configparser.c" /* yacc.c:1646 */ +#line 2722 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 430 "util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 437 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2682,11 +2736,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2686 "util/configparser.c" /* yacc.c:1646 */ +#line 2740 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 445 "util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 452 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2696,11 +2750,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2700 "util/configparser.c" /* yacc.c:1646 */ +#line 2754 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 456 "util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 463 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2716,11 +2770,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2720 "util/configparser.c" /* yacc.c:1646 */ +#line 2774 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 473 "util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 480 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2736,11 +2790,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2740 "util/configparser.c" /* yacc.c:1646 */ +#line 2794 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 490 "util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 497 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2752,11 +2806,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2756 "util/configparser.c" /* yacc.c:1646 */ +#line 2810 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 503 "util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 510 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2770,11 +2824,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2774 "util/configparser.c" /* yacc.c:1646 */ +#line 2828 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 518 "util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 525 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2782,11 +2836,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2786 "util/configparser.c" /* yacc.c:1646 */ +#line 2840 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 527 "util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 534 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2794,11 +2848,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2798 "util/configparser.c" /* yacc.c:1646 */ +#line 2852 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 536 "util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 543 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2806,11 +2860,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2810 "util/configparser.c" /* yacc.c:1646 */ +#line 2864 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 545 "util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 552 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2818,11 +2872,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2822 "util/configparser.c" /* yacc.c:1646 */ +#line 2876 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 554 "util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 561 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2830,11 +2884,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2834 "util/configparser.c" /* yacc.c:1646 */ +#line 2888 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 563 "util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 570 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2842,11 +2896,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2846 "util/configparser.c" /* yacc.c:1646 */ +#line 2900 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 572 "util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 579 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2854,11 +2908,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2858 "util/configparser.c" /* yacc.c:1646 */ +#line 2912 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 581 "util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 588 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2866,11 +2920,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2870 "util/configparser.c" /* yacc.c:1646 */ +#line 2924 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 590 "util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 597 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2878,11 +2932,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2882 "util/configparser.c" /* yacc.c:1646 */ +#line 2936 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 599 "util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 606 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2890,11 +2944,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2894 "util/configparser.c" /* yacc.c:1646 */ +#line 2948 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 608 "util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 615 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2902,11 +2956,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2906 "util/configparser.c" /* yacc.c:1646 */ +#line 2960 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 617 "util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 624 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2914,11 +2968,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2918 "util/configparser.c" /* yacc.c:1646 */ +#line 2972 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 626 "util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 633 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2926,11 +2980,55 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2930 "util/configparser.c" /* yacc.c:1646 */ +#line 2984 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 635 "util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 642 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str)) > 120000) + cfg_parser->cfg->tcp_idle_timeout = 120000; + else if (atoi((yyvsp[0].str)) < 1) + cfg_parser->cfg->tcp_idle_timeout = 1; + else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 3000 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 264: +#line 655 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3012 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 265: +#line 664 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str)) > 6553500) + cfg_parser->cfg->tcp_keepalive_timeout = 6553500; + else if (atoi((yyvsp[0].str)) < 1) + cfg_parser->cfg->tcp_keepalive_timeout = 0; + else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 3028 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 266: +#line 677 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2938,11 +3036,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2942 "util/configparser.c" /* yacc.c:1646 */ +#line 3040 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 644 "util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 686 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -2950,11 +3048,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2954 "util/configparser.c" /* yacc.c:1646 */ +#line 3052 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 653 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 695 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2962,31 +3060,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2966 "util/configparser.c" /* yacc.c:1646 */ +#line 3064 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 662 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 704 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 2976 "util/configparser.c" /* yacc.c:1646 */ +#line 3074 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 669 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 711 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 2986 "util/configparser.c" /* yacc.c:1646 */ +#line 3084 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 676 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 718 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2994,21 +3092,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2998 "util/configparser.c" /* yacc.c:1646 */ +#line 3096 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 685 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 727 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 3008 "util/configparser.c" /* yacc.c:1646 */ +#line 3106 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 692 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 734 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3016,22 +3114,22 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3020 "util/configparser.c" /* yacc.c:1646 */ +#line 3118 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 701 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 743 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3031 "util/configparser.c" /* yacc.c:1646 */ +#line 3129 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 709 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 751 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3039,11 +3137,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3043 "util/configparser.c" /* yacc.c:1646 */ +#line 3141 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 718 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 760 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3051,11 +3149,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3055 "util/configparser.c" /* yacc.c:1646 */ +#line 3153 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 727 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 769 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3068,11 +3166,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3072 "util/configparser.c" /* yacc.c:1646 */ +#line 3170 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 741 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 783 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3080,11 +3178,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3084 "util/configparser.c" /* yacc.c:1646 */ +#line 3182 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 750 "util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 792 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3092,11 +3190,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3096 "util/configparser.c" /* yacc.c:1646 */ +#line 3194 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 759 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 801 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3104,31 +3202,55 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3108 "util/configparser.c" /* yacc.c:1646 */ +#line 3206 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 768 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 810 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3218 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 282: +#line 819 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3230 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 283: +#line 828 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 3118 "util/configparser.c" /* yacc.c:1646 */ +#line 3240 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 775 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 835 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 3128 "util/configparser.c" /* yacc.c:1646 */ +#line 3250 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 782 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 842 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3153,105 +3275,105 @@ yyreduce: } } } -#line 3157 "util/configparser.c" /* yacc.c:1646 */ +#line 3279 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 808 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 868 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 3168 "util/configparser.c" /* yacc.c:1646 */ +#line 3290 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 816 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 876 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3178 "util/configparser.c" /* yacc.c:1646 */ +#line 3300 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 823 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 883 "util/configparser.y" /* yacc.c:1646 */ { 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 3188 "util/configparser.c" /* yacc.c:1646 */ +#line 3310 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 830 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 890 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 3198 "util/configparser.c" /* yacc.c:1646 */ +#line 3320 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 837 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 897 "util/configparser.y" /* yacc.c:1646 */ { 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 3208 "util/configparser.c" /* yacc.c:1646 */ +#line 3330 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 844 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 904 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str))) yyerror("out of memory"); } -#line 3219 "util/configparser.c" /* yacc.c:1646 */ +#line 3341 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 852 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 912 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3230 "util/configparser.c" /* yacc.c:1646 */ +#line 3352 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 860 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 920 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3241 "util/configparser.c" /* yacc.c:1646 */ +#line 3363 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 868 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 928 "util/configparser.y" /* yacc.c:1646 */ { 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 3251 "util/configparser.c" /* yacc.c:1646 */ +#line 3373 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 875 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 935 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3261,11 +3383,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3265 "util/configparser.c" /* yacc.c:1646 */ +#line 3387 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 886 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 946 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3275,21 +3397,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3279 "util/configparser.c" /* yacc.c:1646 */ +#line 3401 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 897 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 957 "util/configparser.y" /* yacc.c:1646 */ { 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 3289 "util/configparser.c" /* yacc.c:1646 */ +#line 3411 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 904 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 964 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3297,11 +3419,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3301 "util/configparser.c" /* yacc.c:1646 */ +#line 3423 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 913 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 973 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3309,11 +3431,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3313 "util/configparser.c" /* yacc.c:1646 */ +#line 3435 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 922 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 982 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3321,53 +3443,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3325 "util/configparser.c" /* yacc.c:1646 */ +#line 3447 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 931 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 991 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3335 "util/configparser.c" /* yacc.c:1646 */ +#line 3457 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 938 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 998 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3345 "util/configparser.c" /* yacc.c:1646 */ +#line 3467 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 945 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1005 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 3356 "util/configparser.c" /* yacc.c:1646 */ +#line 3478 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 953 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1013 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 3367 "util/configparser.c" /* yacc.c:1646 */ +#line 3489 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 961 "util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1021 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3376,11 +3498,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3380 "util/configparser.c" /* yacc.c:1646 */ +#line 3502 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 971 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1031 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3389,11 +3511,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3393 "util/configparser.c" /* yacc.c:1646 */ +#line 3515 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 981 "util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1041 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3402,11 +3524,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3406 "util/configparser.c" /* yacc.c:1646 */ +#line 3528 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 991 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1051 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3418,11 +3540,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3422 "util/configparser.c" /* yacc.c:1646 */ +#line 3544 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1004 "util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1064 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3432,22 +3554,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3436 "util/configparser.c" /* yacc.c:1646 */ +#line 3558 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1015 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1075 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 3447 "util/configparser.c" /* yacc.c:1646 */ +#line 3569 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1023 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1083 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3459,11 +3581,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3463 "util/configparser.c" /* yacc.c:1646 */ +#line 3585 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1036 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1096 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3471,11 +3593,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3475 "util/configparser.c" /* yacc.c:1646 */ +#line 3597 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1045 "util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1105 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3483,11 +3605,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3487 "util/configparser.c" /* yacc.c:1646 */ +#line 3609 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1054 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1114 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3495,11 +3617,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3499 "util/configparser.c" /* yacc.c:1646 */ +#line 3621 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1063 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1123 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3508,11 +3630,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3512 "util/configparser.c" /* yacc.c:1646 */ +#line 3634 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1073 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1133 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3521,22 +3643,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3525 "util/configparser.c" /* yacc.c:1646 */ +#line 3647 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1083 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1143 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 3536 "util/configparser.c" /* yacc.c:1646 */ +#line 3658 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1091 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1151 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3548,11 +3670,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3552 "util/configparser.c" /* yacc.c:1646 */ +#line 3674 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1104 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1164 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3560,22 +3682,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3564 "util/configparser.c" /* yacc.c:1646 */ +#line 3686 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1113 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1173 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); free((yyvsp[0].str)); } -#line 3575 "util/configparser.c" /* yacc.c:1646 */ +#line 3697 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1121 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1181 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3583,22 +3705,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3587 "util/configparser.c" /* yacc.c:1646 */ +#line 3709 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1130 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1190 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); free((yyvsp[0].str)); } -#line 3598 "util/configparser.c" /* yacc.c:1646 */ +#line 3720 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1138 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1198 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3610,11 +3732,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3614 "util/configparser.c" /* yacc.c:1646 */ +#line 3736 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1151 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1211 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3622,21 +3744,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3626 "util/configparser.c" /* yacc.c:1646 */ +#line 3748 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1160 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1220 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 3636 "util/configparser.c" /* yacc.c:1646 */ +#line 3758 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1167 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1227 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3645,11 +3767,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3649 "util/configparser.c" /* yacc.c:1646 */ +#line 3771 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1177 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1237 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3658,11 +3780,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3662 "util/configparser.c" /* yacc.c:1646 */ +#line 3784 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1187 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1247 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3671,11 +3793,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3675 "util/configparser.c" /* yacc.c:1646 */ +#line 3797 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1197 "util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1257 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3684,11 +3806,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3688 "util/configparser.c" /* yacc.c:1646 */ +#line 3810 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1207 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1267 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3697,11 +3819,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3701 "util/configparser.c" /* yacc.c:1646 */ +#line 3823 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1217 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1277 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3710,11 +3832,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3714 "util/configparser.c" /* yacc.c:1646 */ +#line 3836 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1227 "util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1287 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3723,11 +3845,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3727 "util/configparser.c" /* yacc.c:1646 */ +#line 3849 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1237 "util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1297 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -3736,41 +3858,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3740 "util/configparser.c" /* yacc.c:1646 */ +#line 3862 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1247 "util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1307 "util/configparser.y" /* yacc.c:1646 */ { 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 3750 "util/configparser.c" /* yacc.c:1646 */ +#line 3872 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1254 "util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1314 "util/configparser.y" /* yacc.c:1646 */ { 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 3760 "util/configparser.c" /* yacc.c:1646 */ +#line 3882 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1261 "util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1321 "util/configparser.y" /* yacc.c:1646 */ { 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 3770 "util/configparser.c" /* yacc.c:1646 */ +#line 3892 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1268 "util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1328 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3778,11 +3900,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3782 "util/configparser.c" /* yacc.c:1646 */ +#line 3904 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1277 "util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1337 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3790,11 +3912,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3794 "util/configparser.c" /* yacc.c:1646 */ +#line 3916 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1286 "util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1346 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3802,21 +3924,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3806 "util/configparser.c" /* yacc.c:1646 */ +#line 3928 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1295 "util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1355 "util/configparser.y" /* yacc.c:1646 */ { 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 3816 "util/configparser.c" /* yacc.c:1646 */ +#line 3938 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1302 "util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1362 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -3825,11 +3947,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3829 "util/configparser.c" /* yacc.c:1646 */ +#line 3951 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1312 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1372 "util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -3846,21 +3968,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3850 "util/configparser.c" /* yacc.c:1646 */ +#line 3972 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1330 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1390 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 3860 "util/configparser.c" /* yacc.c:1646 */ +#line 3982 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1337 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1397 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3877,11 +3999,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3881 "util/configparser.c" /* yacc.c:1646 */ +#line 4003 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1355 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1415 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3893,11 +4015,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3897 "util/configparser.c" /* yacc.c:1646 */ +#line 4019 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1368 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1428 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3909,11 +4031,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3913 "util/configparser.c" /* yacc.c:1646 */ +#line 4035 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1381 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1441 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3921,11 +4043,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3925 "util/configparser.c" /* yacc.c:1646 */ +#line 4047 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1390 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1450 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3933,11 +4055,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3937 "util/configparser.c" /* yacc.c:1646 */ +#line 4059 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1399 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1459 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3945,11 +4067,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3949 "util/configparser.c" /* yacc.c:1646 */ +#line 4071 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1408 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1468 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3957,11 +4079,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3961 "util/configparser.c" /* yacc.c:1646 */ +#line 4083 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1417 "util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1477 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3970,11 +4092,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3974 "util/configparser.c" /* yacc.c:1646 */ +#line 4096 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1427 "util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1487 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3983,11 +4105,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3987 "util/configparser.c" /* yacc.c:1646 */ +#line 4109 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1437 "util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1497 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3997,11 +4119,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4001 "util/configparser.c" /* yacc.c:1646 */ +#line 4123 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1448 "util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1508 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4009,11 +4131,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4013 "util/configparser.c" /* yacc.c:1646 */ +#line 4135 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1457 "util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1517 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4021,11 +4143,35 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4025 "util/configparser.c" /* yacc.c:1646 */ +#line 4147 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1466 "util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1526 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str)); + free((yyvsp[0].str)); + } +#line 4159 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 357: +#line 1535 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4171 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 358: +#line 1544 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4037,11 +4183,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4041 "util/configparser.c" /* yacc.c:1646 */ +#line 4187 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1479 "util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1557 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4053,11 +4199,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4057 "util/configparser.c" /* yacc.c:1646 */ +#line 4203 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1492 "util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1570 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4065,21 +4211,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4069 "util/configparser.c" /* yacc.c:1646 */ +#line 4215 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1501 "util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1579 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 4079 "util/configparser.c" /* yacc.c:1646 */ +#line 4225 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1508 "util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1586 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4087,11 +4233,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4091 "util/configparser.c" /* yacc.c:1646 */ +#line 4237 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1517 "util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1595 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4099,11 +4245,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4103 "util/configparser.c" /* yacc.c:1646 */ +#line 4249 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1526 "util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1604 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4111,11 +4257,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4115 "util/configparser.c" /* yacc.c:1646 */ +#line 4261 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1535 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1613 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4124,22 +4270,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4128 "util/configparser.c" /* yacc.c:1646 */ +#line 4274 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1544 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1622 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 4139 "util/configparser.c" /* yacc.c:1646 */ +#line 4285 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1552 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1630 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4151,22 +4297,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4155 "util/configparser.c" /* yacc.c:1646 */ +#line 4301 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1565 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1643 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 4166 "util/configparser.c" /* yacc.c:1646 */ +#line 4312 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1573 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1651 "util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -4194,21 +4340,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4198 "util/configparser.c" /* yacc.c:1646 */ +#line 4344 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1602 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1680 "util/configparser.y" /* yacc.c:1646 */ { 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 4208 "util/configparser.c" /* yacc.c:1646 */ +#line 4354 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1609 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1687 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4222,11 +4368,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4226 "util/configparser.c" /* yacc.c:1646 */ +#line 4372 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1624 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1702 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4235,11 +4381,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4239 "util/configparser.c" /* yacc.c:1646 */ +#line 4385 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1634 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1712 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4248,31 +4394,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4252 "util/configparser.c" /* yacc.c:1646 */ +#line 4398 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1644 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1722 "util/configparser.y" /* yacc.c:1646 */ { 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 4262 "util/configparser.c" /* yacc.c:1646 */ +#line 4408 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1651 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1729 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4272 "util/configparser.c" /* yacc.c:1646 */ +#line 4418 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1658 "util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1736 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4280,11 +4426,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4284 "util/configparser.c" /* yacc.c:1646 */ +#line 4430 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1667 "util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1745 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa, + (yyvsp[0].str))) + fatal_exit("out of memory adding dns64-ignore-aaaa"); + } +#line 4441 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 378: +#line 1753 "util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4297,11 +4454,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4301 "util/configparser.c" /* yacc.c:1646 */ +#line 4458 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1681 "util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1767 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4319,11 +4476,11 @@ yyreduce: } } } -#line 4323 "util/configparser.c" /* yacc.c:1646 */ +#line 4480 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1700 "util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1786 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4341,11 +4498,11 @@ yyreduce: } } } -#line 4345 "util/configparser.c" /* yacc.c:1646 */ +#line 4502 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1719 "util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1805 "util/configparser.y" /* yacc.c:1646 */ { 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, @@ -4356,11 +4513,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4360 "util/configparser.c" /* yacc.c:1646 */ +#line 4517 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1731 "util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1817 "util/configparser.y" /* yacc.c:1646 */ { 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, @@ -4371,11 +4528,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4375 "util/configparser.c" /* yacc.c:1646 */ +#line 4532 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1743 "util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1829 "util/configparser.y" /* yacc.c:1646 */ { 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, @@ -4386,11 +4543,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4390 "util/configparser.c" /* yacc.c:1646 */ +#line 4547 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1755 "util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1841 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4400,11 +4557,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4404 "util/configparser.c" /* yacc.c:1646 */ +#line 4561 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1766 "util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1852 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4422,11 +4579,11 @@ yyreduce: } } } -#line 4426 "util/configparser.c" /* yacc.c:1646 */ +#line 4583 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1785 "util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 1871 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4434,11 +4591,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4438 "util/configparser.c" /* yacc.c:1646 */ +#line 4595 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1795 "util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 1881 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4446,33 +4603,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4450 "util/configparser.c" /* yacc.c:1646 */ +#line 4607 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1804 "util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 1890 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 4461 "util/configparser.c" /* yacc.c:1646 */ +#line 4618 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1812 "util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 1898 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 4472 "util/configparser.c" /* yacc.c:1646 */ +#line 4629 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1820 "util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 1906 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4484,11 +4641,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4488 "util/configparser.c" /* yacc.c:1646 */ +#line 4645 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1833 "util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 1919 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4500,11 +4657,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4504 "util/configparser.c" /* yacc.c:1646 */ +#line 4661 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 1846 "util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 1932 "util/configparser.y" /* yacc.c:1646 */ { 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) { @@ -4516,11 +4673,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4520 "util/configparser.c" /* yacc.c:1646 */ +#line 4677 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 1859 "util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 1945 "util/configparser.y" /* yacc.c:1646 */ { 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) { @@ -4532,11 +4689,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4536 "util/configparser.c" /* yacc.c:1646 */ +#line 4693 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 1872 "util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 1958 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4544,11 +4701,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4548 "util/configparser.c" /* yacc.c:1646 */ +#line 4705 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 1881 "util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 1967 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4556,11 +4713,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4560 "util/configparser.c" /* yacc.c:1646 */ +#line 4717 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 1890 "util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 1976 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_low_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4568,11 +4725,11 @@ yyreduce: else cfg_parser->cfg->low_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4572 "util/configparser.c" /* yacc.c:1646 */ +#line 4729 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 1899 "util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 1985 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_low_rtt_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4580,11 +4737,11 @@ yyreduce: else cfg_parser->cfg->low_rtt_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4584 "util/configparser.c" /* yacc.c:1646 */ +#line 4741 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 1908 "util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 1994 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4593,11 +4750,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4597 "util/configparser.c" /* yacc.c:1646 */ +#line 4754 "util/configparser.c" /* yacc.c:1646 */ break; - case 380: -#line 1918 "util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2004 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4606,11 +4763,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4610 "util/configparser.c" /* yacc.c:1646 */ +#line 4767 "util/configparser.c" /* yacc.c:1646 */ break; - case 381: -#line 1928 "util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2014 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4622,11 +4779,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4626 "util/configparser.c" /* yacc.c:1646 */ +#line 4783 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 1941 "util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 2027 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4638,11 +4795,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4642 "util/configparser.c" /* yacc.c:1646 */ +#line 4799 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 1954 "util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 2040 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4652,11 +4809,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4656 "util/configparser.c" /* yacc.c:1646 */ +#line 4813 "util/configparser.c" /* yacc.c:1646 */ break; - case 384: -#line 1965 "util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 2051 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4668,11 +4825,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4672 "util/configparser.c" /* yacc.c:1646 */ +#line 4829 "util/configparser.c" /* yacc.c:1646 */ break; - case 385: -#line 1978 "util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 2064 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4682,11 +4839,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4686 "util/configparser.c" /* yacc.c:1646 */ +#line 4843 "util/configparser.c" /* yacc.c:1646 */ break; - case 386: -#line 1989 "util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 2075 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4698,11 +4855,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4702 "util/configparser.c" /* yacc.c:1646 */ +#line 4859 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 2002 "util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 2088 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4711,31 +4868,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4715 "util/configparser.c" /* yacc.c:1646 */ +#line 4872 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 2012 "util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 2098 "util/configparser.y" /* yacc.c:1646 */ { 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 4725 "util/configparser.c" /* yacc.c:1646 */ +#line 4882 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 2019 "util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 2105 "util/configparser.y" /* yacc.c:1646 */ { 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 4735 "util/configparser.c" /* yacc.c:1646 */ +#line 4892 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2026 "util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 2112 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4743,11 +4900,23 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4747 "util/configparser.c" /* yacc.c:1646 */ +#line 4904 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2035 "util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 2121 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4916 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 411: +#line 2130 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4756,11 +4925,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4760 "util/configparser.c" /* yacc.c:1646 */ +#line 4929 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 2045 "util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2140 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4769,11 +4938,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4773 "util/configparser.c" /* yacc.c:1646 */ +#line 4942 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 2055 "util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2150 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4782,31 +4951,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4786 "util/configparser.c" /* yacc.c:1646 */ +#line 4955 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2065 "util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2160 "util/configparser.y" /* yacc.c:1646 */ { 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 4796 "util/configparser.c" /* yacc.c:1646 */ +#line 4965 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2072 "util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2167 "util/configparser.y" /* yacc.c:1646 */ { 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 4806 "util/configparser.c" /* yacc.c:1646 */ +#line 4975 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2079 "util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2174 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4814,11 +4983,23 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4818 "util/configparser.c" /* yacc.c:1646 */ +#line 4987 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2088 "util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2183 "util/configparser.y" /* yacc.c:1646 */ + { + 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[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4999 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 418: +#line 2192 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4827,11 +5008,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4831 "util/configparser.c" /* yacc.c:1646 */ +#line 5012 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2098 "util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 2202 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -4840,52 +5021,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 4844 "util/configparser.c" /* yacc.c:1646 */ +#line 5025 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 2108 "util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 2212 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 4854 "util/configparser.c" /* yacc.c:1646 */ +#line 5035 "util/configparser.c" /* yacc.c:1646 */ break; - case 400: -#line 2115 "util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 2219 "util/configparser.y" /* yacc.c:1646 */ { 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 4864 "util/configparser.c" /* yacc.c:1646 */ +#line 5045 "util/configparser.c" /* yacc.c:1646 */ break; - case 401: -#line 2122 "util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 2226 "util/configparser.y" /* yacc.c:1646 */ { 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 4874 "util/configparser.c" /* yacc.c:1646 */ +#line 5055 "util/configparser.c" /* yacc.c:1646 */ break; - case 402: -#line 2129 "util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 2233 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4885 "util/configparser.c" /* yacc.c:1646 */ +#line 5066 "util/configparser.c" /* yacc.c:1646 */ break; - case 403: -#line 2137 "util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2241 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4894,11 +5075,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4898 "util/configparser.c" /* yacc.c:1646 */ +#line 5079 "util/configparser.c" /* yacc.c:1646 */ break; - case 404: -#line 2147 "util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2251 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4907,11 +5088,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4911 "util/configparser.c" /* yacc.c:1646 */ +#line 5092 "util/configparser.c" /* yacc.c:1646 */ break; - case 405: -#line 2157 "util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2261 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4920,11 +5101,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4924 "util/configparser.c" /* yacc.c:1646 */ +#line 5105 "util/configparser.c" /* yacc.c:1646 */ break; - case 406: -#line 2167 "util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2271 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4933,11 +5114,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4937 "util/configparser.c" /* yacc.c:1646 */ +#line 5118 "util/configparser.c" /* yacc.c:1646 */ break; - case 407: -#line 2177 "util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2281 "util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -4966,11 +5147,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4970 "util/configparser.c" /* yacc.c:1646 */ +#line 5151 "util/configparser.c" /* yacc.c:1646 */ break; - case 408: -#line 2207 "util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2311 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -4979,22 +5160,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4983 "util/configparser.c" /* yacc.c:1646 */ +#line 5164 "util/configparser.c" /* yacc.c:1646 */ break; - case 409: -#line 2217 "util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2321 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 4994 "util/configparser.c" /* yacc.c:1646 */ +#line 5175 "util/configparser.c" /* yacc.c:1646 */ break; - case 410: -#line 2225 "util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2329 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { @@ -5002,11 +5183,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5006 "util/configparser.c" /* yacc.c:1646 */ +#line 5187 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 2234 "util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2338 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5020,11 +5201,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5024 "util/configparser.c" /* yacc.c:1646 */ +#line 5205 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 2249 "util/configparser.y" /* yacc.c:1646 */ + case 433: +#line 2353 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5032,19 +5213,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5036 "util/configparser.c" /* yacc.c:1646 */ +#line 5217 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2258 "util/configparser.y" /* yacc.c:1646 */ + case 434: +#line 2362 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 5044 "util/configparser.c" /* yacc.c:1646 */ +#line 5225 "util/configparser.c" /* yacc.c:1646 */ break; - case 424: -#line 2269 "util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2373 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5053,11 +5234,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5057 "util/configparser.c" /* yacc.c:1646 */ +#line 5238 "util/configparser.c" /* yacc.c:1646 */ break; - case 425: -#line 2279 "util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2383 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5065,142 +5246,142 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5069 "util/configparser.c" /* yacc.c:1646 */ +#line 5250 "util/configparser.c" /* yacc.c:1646 */ break; - case 426: -#line 2288 "util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2392 "util/configparser.y" /* yacc.c:1646 */ { 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 5079 "util/configparser.c" /* yacc.c:1646 */ +#line 5260 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2295 "util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2399 "util/configparser.y" /* yacc.c:1646 */ { 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 5089 "util/configparser.c" /* yacc.c:1646 */ +#line 5270 "util/configparser.c" /* yacc.c:1646 */ break; - case 428: -#line 2302 "util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2406 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 5099 "util/configparser.c" /* yacc.c:1646 */ +#line 5280 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2309 "util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2413 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 5109 "util/configparser.c" /* yacc.c:1646 */ +#line 5290 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2316 "util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2420 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 5119 "util/configparser.c" /* yacc.c:1646 */ +#line 5300 "util/configparser.c" /* yacc.c:1646 */ break; - case 431: -#line 2323 "util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2427 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 5129 "util/configparser.c" /* yacc.c:1646 */ +#line 5310 "util/configparser.c" /* yacc.c:1646 */ break; - case 432: -#line 2330 "util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2434 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 5137 "util/configparser.c" /* yacc.c:1646 */ +#line 5318 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2347 "util/configparser.y" /* yacc.c:1646 */ + case 468: +#line 2451 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str), "yes")==0); } -#line 5148 "util/configparser.c" /* yacc.c:1646 */ +#line 5329 "util/configparser.c" /* yacc.c:1646 */ break; - case 448: -#line 2355 "util/configparser.y" /* yacc.c:1646 */ + case 469: +#line 2459 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str); } -#line 5158 "util/configparser.c" /* yacc.c:1646 */ +#line 5339 "util/configparser.c" /* yacc.c:1646 */ break; - case 449: -#line 2362 "util/configparser.y" /* yacc.c:1646 */ + case 470: +#line 2466 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str), "yes")==0); } -#line 5169 "util/configparser.c" /* yacc.c:1646 */ +#line 5350 "util/configparser.c" /* yacc.c:1646 */ break; - case 450: -#line 2370 "util/configparser.y" /* yacc.c:1646 */ + case 471: +#line 2474 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str), "yes")==0); } -#line 5180 "util/configparser.c" /* yacc.c:1646 */ +#line 5361 "util/configparser.c" /* yacc.c:1646 */ break; - case 451: -#line 2378 "util/configparser.y" /* yacc.c:1646 */ + case 472: +#line 2482 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 5190 "util/configparser.c" /* yacc.c:1646 */ +#line 5371 "util/configparser.c" /* yacc.c:1646 */ break; - case 452: -#line 2385 "util/configparser.y" /* yacc.c:1646 */ + case 473: +#line 2489 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 5200 "util/configparser.c" /* yacc.c:1646 */ +#line 5381 "util/configparser.c" /* yacc.c:1646 */ break; - case 453: -#line 2392 "util/configparser.y" /* yacc.c:1646 */ + case 474: +#line 2496 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -5208,11 +5389,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5212 "util/configparser.c" /* yacc.c:1646 */ +#line 5393 "util/configparser.c" /* yacc.c:1646 */ break; - case 454: -#line 2401 "util/configparser.y" /* yacc.c:1646 */ + case 475: +#line 2505 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -5220,11 +5401,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5224 "util/configparser.c" /* yacc.c:1646 */ +#line 5405 "util/configparser.c" /* yacc.c:1646 */ break; - case 455: -#line 2410 "util/configparser.y" /* yacc.c:1646 */ + case 476: +#line 2514 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -5232,11 +5413,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5236 "util/configparser.c" /* yacc.c:1646 */ +#line 5417 "util/configparser.c" /* yacc.c:1646 */ break; - case 456: -#line 2419 "util/configparser.y" /* yacc.c:1646 */ + case 477: +#line 2523 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -5244,11 +5425,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5248 "util/configparser.c" /* yacc.c:1646 */ +#line 5429 "util/configparser.c" /* yacc.c:1646 */ break; - case 457: -#line 2428 "util/configparser.y" /* yacc.c:1646 */ + case 478: +#line 2532 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -5256,11 +5437,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5260 "util/configparser.c" /* yacc.c:1646 */ +#line 5441 "util/configparser.c" /* yacc.c:1646 */ break; - case 458: -#line 2437 "util/configparser.y" /* yacc.c:1646 */ + case 479: +#line 2541 "util/configparser.y" /* yacc.c:1646 */ { 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) @@ -5268,29 +5449,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5272 "util/configparser.c" /* yacc.c:1646 */ +#line 5453 "util/configparser.c" /* yacc.c:1646 */ break; - case 459: -#line 2446 "util/configparser.y" /* yacc.c:1646 */ + case 480: +#line 2550 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 5280 "util/configparser.c" /* yacc.c:1646 */ +#line 5461 "util/configparser.c" /* yacc.c:1646 */ break; - case 463: -#line 2455 "util/configparser.y" /* yacc.c:1646 */ + case 484: +#line 2559 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 5290 "util/configparser.c" /* yacc.c:1646 */ +#line 5471 "util/configparser.c" /* yacc.c:1646 */ break; - case 464: -#line 2461 "util/configparser.y" /* yacc.c:1646 */ + case 485: +#line 2565 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5299,21 +5480,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5303 "util/configparser.c" /* yacc.c:1646 */ +#line 5484 "util/configparser.c" /* yacc.c:1646 */ break; - case 465: -#line 2471 "util/configparser.y" /* yacc.c:1646 */ + case 486: +#line 2575 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 5313 "util/configparser.c" /* yacc.c:1646 */ +#line 5494 "util/configparser.c" /* yacc.c:1646 */ break; - case 466: -#line 2478 "util/configparser.y" /* yacc.c:1646 */ + case 487: +#line 2582 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5321,31 +5502,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5325 "util/configparser.c" /* yacc.c:1646 */ +#line 5506 "util/configparser.c" /* yacc.c:1646 */ break; - case 467: -#line 2487 "util/configparser.y" /* yacc.c:1646 */ + case 488: +#line 2591 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5336 "util/configparser.c" /* yacc.c:1646 */ +#line 5517 "util/configparser.c" /* yacc.c:1646 */ break; - case 468: -#line 2495 "util/configparser.y" /* yacc.c:1646 */ + case 489: +#line 2599 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 5345 "util/configparser.c" /* yacc.c:1646 */ +#line 5526 "util/configparser.c" /* yacc.c:1646 */ break; - case 481: -#line 2512 "util/configparser.y" /* yacc.c:1646 */ + case 502: +#line 2616 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5353,11 +5534,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5357 "util/configparser.c" /* yacc.c:1646 */ +#line 5538 "util/configparser.c" /* yacc.c:1646 */ break; - case 482: -#line 2522 "util/configparser.y" /* yacc.c:1646 */ + case 503: +#line 2626 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5366,21 +5547,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5370 "util/configparser.c" /* yacc.c:1646 */ +#line 5551 "util/configparser.c" /* yacc.c:1646 */ break; - case 483: -#line 2532 "util/configparser.y" /* yacc.c:1646 */ + case 504: +#line 2636 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 5380 "util/configparser.c" /* yacc.c:1646 */ +#line 5561 "util/configparser.c" /* yacc.c:1646 */ break; - case 484: -#line 2539 "util/configparser.y" /* yacc.c:1646 */ + case 505: +#line 2643 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -5388,21 +5569,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5392 "util/configparser.c" /* yacc.c:1646 */ +#line 5573 "util/configparser.c" /* yacc.c:1646 */ break; - case 485: -#line 2548 "util/configparser.y" /* yacc.c:1646 */ + case 506: +#line 2652 "util/configparser.y" /* yacc.c:1646 */ { 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 5402 "util/configparser.c" /* yacc.c:1646 */ +#line 5583 "util/configparser.c" /* yacc.c:1646 */ break; - case 486: -#line 2555 "util/configparser.y" /* yacc.c:1646 */ + case 507: +#line 2659 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -5410,22 +5591,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5414 "util/configparser.c" /* yacc.c:1646 */ +#line 5595 "util/configparser.c" /* yacc.c:1646 */ break; - case 487: -#line 2564 "util/configparser.y" /* yacc.c:1646 */ + case 508: +#line 2668 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 5425 "util/configparser.c" /* yacc.c:1646 */ +#line 5606 "util/configparser.c" /* yacc.c:1646 */ break; - case 488: -#line 2572 "util/configparser.y" /* yacc.c:1646 */ + case 509: +#line 2676 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5437,22 +5618,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5441 "util/configparser.c" /* yacc.c:1646 */ +#line 5622 "util/configparser.c" /* yacc.c:1646 */ break; - case 489: -#line 2585 "util/configparser.y" /* yacc.c:1646 */ + case 510: +#line 2689 "util/configparser.y" /* yacc.c:1646 */ { 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[0].str)); } -#line 5452 "util/configparser.c" /* yacc.c:1646 */ +#line 5633 "util/configparser.c" /* yacc.c:1646 */ break; - case 490: -#line 2593 "util/configparser.y" /* yacc.c:1646 */ + case 511: +#line 2697 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5464,19 +5645,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5468 "util/configparser.c" /* yacc.c:1646 */ +#line 5649 "util/configparser.c" /* yacc.c:1646 */ break; - case 491: -#line 2606 "util/configparser.y" /* yacc.c:1646 */ + case 512: +#line 2710 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 5476 "util/configparser.c" /* yacc.c:1646 */ +#line 5657 "util/configparser.c" /* yacc.c:1646 */ break; - case 499: -#line 2616 "util/configparser.y" /* yacc.c:1646 */ + case 520: +#line 2720 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5489,11 +5670,11 @@ yyreduce: OUTYY(("P(Compiled without cachedb, ignoring)\n")); #endif } -#line 5493 "util/configparser.c" /* yacc.c:1646 */ +#line 5674 "util/configparser.c" /* yacc.c:1646 */ break; - case 500: -#line 2630 "util/configparser.y" /* yacc.c:1646 */ + case 521: +#line 2734 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5507,11 +5688,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5511 "util/configparser.c" /* yacc.c:1646 */ +#line 5692 "util/configparser.c" /* yacc.c:1646 */ break; - case 501: -#line 2645 "util/configparser.y" /* yacc.c:1646 */ + case 522: +#line 2749 "util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -5522,11 +5703,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5526 "util/configparser.c" /* yacc.c:1646 */ +#line 5707 "util/configparser.c" /* yacc.c:1646 */ break; - case 502: -#line 2657 "util/configparser.y" /* yacc.c:1646 */ + case 523: +#line 2761 "util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -5540,11 +5721,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5544 "util/configparser.c" /* yacc.c:1646 */ +#line 5725 "util/configparser.c" /* yacc.c:1646 */ break; - case 503: -#line 2672 "util/configparser.y" /* yacc.c:1646 */ + case 524: +#line 2776 "util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -5556,11 +5737,25 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5560 "util/configparser.c" /* yacc.c:1646 */ +#line 5741 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 525: +#line 2789 "util/configparser.y" /* yacc.c:1646 */ + { + 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[-1].str), (yyvsp[0].str))) + fatal_exit("out of memory adding tcp connection limit"); + } + } +#line 5755 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5564 "util/configparser.c" /* yacc.c:1646 */ +#line 5759 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5788,7 +5983,7 @@ yyreturn: #endif return yyresult; } -#line 2684 "util/configparser.y" /* yacc.c:1906 */ +#line 2799 "util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ |