variables get_option and set_option also for dnscrypt.

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

diff --git a/doc/Changelog b/doc/Changelog
index 1265d7ccd86f56a45188666e0972e330b29ce4d1..56d75142d108dea84ca241b30c76928f3d0f6612 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,6 @@
 24 April 2017: Wouter
        - unbound-checkconf -o allows query of dnstap config variables.
-         Also unbound-control get_option.
+         Also unbound-control get_option.  Also for dnscrypt.
 
 21 April 2017: Ralph
        - Fix #1254: clarify ratelimit-{for,below}-domain (from Manu Bretelle).

diff --git a/util/config_file.c b/util/config_file.c
index 3b356e1ee668b00c4d02f367c119edb1bece61b8..9690bc1de0d95941e57fec54496e3c4debd81cc6 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -542,6 +542,13 @@ int config_set_option(struct config_file* cfg, const char* opt,
                dnstap_log_forwarder_query_messages)
        else S_YNO("dnstap-log-forwarder-response-messages:",
                dnstap_log_forwarder_response_messages)
+#endif
+#ifdef USE_DNSCRYPT
+       else S_YNO("dnscrypt-enable:", dnscrypt)
+       else S_NUMBER_NONZERO("dnscrypt-port:", dnscrypt_port)
+       else S_STR("dnscrypt-provider:", dnscrypt_provider)
+       else S_STRLIST("dnscrypt-provider-cert:", dnscrypt_provider_cert)
+       else S_STRLIST("dnscrypt-secret-key:", dnscrypt_secret_key)
 #endif
        else if(strcmp(opt, "ip-ratelimit:") == 0) {
            IS_NUMBER_OR_ZERO; cfg->ip_ratelimit = atoi(val);
@@ -886,6 +893,13 @@ config_get_option(struct config_file* cfg, const char* opt,
                dnstap_log_forwarder_query_messages)
        else O_YNO(opt, "dnstap-log-forwarder-response-messages",
                dnstap_log_forwarder_response_messages)
+#endif
+#ifdef USE_DNSCRYPT
+       else O_YNO(opt, "dnscrypt-enable", dnscrypt)
+       else O_DEC(opt, "dnscrypt-port", dnscrypt_port)
+       else O_STR(opt, "dnscrypt-provider", dnscrypt_provider)
+       else O_LST(opt, "dnscrypt-provider-cert", dnscrypt_provider_cert)
+       else O_LST(opt, "dnscrypt-secret-key", dnscrypt_secret_key)
 #endif
        else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones)
        else O_YNO(opt, "insecure-lan-zones", insecure_lan_zones)