- Fix tls-* and ssl-* documented alternate syntax to also be available

  through remote-control and unbound-checkconf.

diff --git a/doc/Changelog b/doc/Changelog
index 34ed2037843d9dddb24b0328620df8a767be3656..d9c30a99c5c342f289d80f835c6e634ebcab12af 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+29 January 2022: George
+       - Fix tls-* and ssl-* documented alternate syntax to also be available
+         through remote-control and unbound-checkconf.
+
 26 January 2022: George
        - Fix #599: [FR] RFC 9156 (obsoletes RFC 7816), by noting the new RFC
          document.

diff --git a/util/config_file.c b/util/config_file.c
index 39050f553e612a3cfd1fb9d16fb0cf04e18f52ea..6bbd85ca19bea960c88906b8aea7c75653515c68 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -531,11 +531,17 @@ int config_set_option(struct config_file* cfg, const char* opt,
        else S_YNO("edns-tcp-keepalive:", do_tcp_keepalive)
        else S_NUMBER_NONZERO("edns-tcp-keepalive-timeout:", tcp_keepalive_timeout)
        else S_YNO("ssl-upstream:", ssl_upstream)
+       else S_YNO("tls-upstream:", ssl_upstream)
        else S_STR("ssl-service-key:", ssl_service_key)
+       else S_STR("tls-service-key:", ssl_service_key)
        else S_STR("ssl-service-pem:", ssl_service_pem)
+       else S_STR("tls-service-pem:", ssl_service_pem)
        else S_NUMBER_NONZERO("ssl-port:", ssl_port)
+       else S_NUMBER_NONZERO("tls-port:", ssl_port)
+       else S_STR("ssl-cert-bundle:", tls_cert_bundle)
        else S_STR("tls-cert-bundle:", tls_cert_bundle)
        else S_YNO("tls-win-cert:", tls_win_cert)
+       else S_STRLIST("additional-ssl-port:", tls_additional_port)
        else S_STRLIST("additional-tls-port:", tls_additional_port)
        else S_STRLIST("tls-additional-ports:", tls_additional_port)
        else S_STRLIST("tls-additional-port:", tls_additional_port)
@@ -1029,11 +1035,19 @@ config_get_option(struct config_file* cfg, const char* opt,
        else O_YNO(opt, "edns-tcp-keepalive", do_tcp_keepalive)
        else O_DEC(opt, "edns-tcp-keepalive-timeout", tcp_keepalive_timeout)
        else O_YNO(opt, "ssl-upstream", ssl_upstream)
+       else O_YNO(opt, "tls-upstream", ssl_upstream)
        else O_STR(opt, "ssl-service-key", ssl_service_key)
+       else O_STR(opt, "tls-service-key", ssl_service_key)
        else O_STR(opt, "ssl-service-pem", ssl_service_pem)
+       else O_STR(opt, "tls-service-pem", ssl_service_pem)
        else O_DEC(opt, "ssl-port", ssl_port)
+       else O_DEC(opt, "tls-port", ssl_port)
+       else O_STR(opt, "ssl-cert-bundle", tls_cert_bundle)
        else O_STR(opt, "tls-cert-bundle", tls_cert_bundle)
        else O_YNO(opt, "tls-win-cert", tls_win_cert)
+       else O_LST(opt, "additional-ssl-port", tls_additional_port)
+       else O_LST(opt, "additional-tls-port", tls_additional_port)
+       else O_LST(opt, "tls-additional-ports", tls_additional_port)
        else O_LST(opt, "tls-additional-port", tls_additional_port)
        else O_LST(opt, "tls-session-ticket-keys", tls_session_ticket_keys.first)
        else O_STR(opt, "tls-ciphers", tls_ciphers)