From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 12 Oct 2023 12:51:12 +0000 (+0200)
Subject: Merge branch 'master' into cachedb-no-store
X-Git-Tag: release-1.19.0rc1~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18ebe165bac9210ef5b34055705ae15a051553c2;p=thirdparty%2Funbound.git

Merge branch 'master' into cachedb-no-store
---

18ebe165bac9210ef5b34055705ae15a051553c2
diff --cc util/configparser.y
index 6363368e5,ef55216ad..da5d6608f
--- a/util/configparser.y
+++ b/util/configparser.y
@@@ -199,7 -199,7 +199,7 @@@ extern struct config_parser_state* cfg_
  %token VAR_INTERFACE_ACTION VAR_INTERFACE_VIEW VAR_INTERFACE_TAG
  %token VAR_INTERFACE_TAG_ACTION VAR_INTERFACE_TAG_DATA
  %token VAR_PROXY_PROTOCOL_PORT VAR_STATISTICS_INHIBIT_ZERO
- %token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_CACHEDB_NO_STORE
 -%token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_DISABLE_EDNS_DO
++%token VAR_HARDEN_UNKNOWN_ADDITIONAL VAR_DISABLE_EDNS_DO VAR_CACHEDB_NO_STORE
  
  %%
  toplevelvars: /* empty */ | toplevelvars toplevelvar ;