- For addr with #authname and no @port notation, the default is 853.

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

diff --git a/config.h.in b/config.h.in
index e9e3a95237e5a49a6b78f1ccb5a3a67bbcaa4bfc..9223894287764de418915d84cea59a59b846e3a8 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1245,6 +1245,8 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file,
 
 /** default port for DNS traffic. */
 #define UNBOUND_DNS_PORT 53
+/** default port for DNS over TLS traffic. */
+#define UNBOUND_DNS_OVER_TLS_PORT 853
 /** default port for unbound control traffic, registered port with IANA,
     ub-dns-control  8953/tcp    unbound dns nameserver control */
 #define UNBOUND_CONTROL_PORT 8953

diff --git a/configure.ac b/configure.ac
index a149fe6372ccd8ce9479449ae9fb3a78710ff0b2..435147eebdecc950fe18aa01a0f50aeb5efce8d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1806,6 +1806,8 @@ void *unbound_stat_realloc_log(void *ptr, size_t size, const char* file,
 
 /** default port for DNS traffic. */
 #define UNBOUND_DNS_PORT 53
+/** default port for DNS over TLS traffic. */
+#define UNBOUND_DNS_OVER_TLS_PORT 853
 /** default port for unbound control traffic, registered port with IANA,
     ub-dns-control  8953/tcp    unbound dns nameserver control */
 #define UNBOUND_CONTROL_PORT 8953

diff --git a/doc/Changelog b/doc/Changelog
index 6ed2754dff7ae806fdbdd7dbcebb34dd09641b53..2f6e4dceae181c47e0026a1d23956ca6cb5c7f9f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
          1.1.1.1@853#cloudflare-dns.com
        - Fix #658: unbound using TLS in a forwarding configuration does not
          verify the server's certificate (RFC 8310 support).
+       - For addr with #authname and no @port notation, the default is 853.
 
 18 April 2018: Wouter
        - Fix auth-zone retry timer to be on schedule with retry timeout,

diff --git a/util/config_file.c b/util/config_file.c
index 7c7458a512247123acfa09ed9984290511e3cf12..03756128a60d65f30a9dc8e01dfe675d73ad80f0 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -106,7 +106,7 @@ config_create(void)
        cfg->outgoing_tcp_mss = 0;
        cfg->ssl_service_key = NULL;
        cfg->ssl_service_pem = NULL;
-       cfg->ssl_port = 853;
+       cfg->ssl_port = UNBOUND_DNS_OVER_TLS_PORT;
        cfg->ssl_upstream = 0;
        cfg->tls_cert_bundle = NULL;
        cfg->use_syslog = 1;

diff --git a/util/net_help.c b/util/net_help.c
index d371519d7d7f51011cfeeff9807ffe9fa8258235..d8250f9362fbfb4fffa02a6195c436bec780231b 100644 (file)
--- a/util/net_help.c
+++ b/util/net_help.c
@@ -306,6 +306,7 @@ int authextstrtoaddr(char* str, struct sockaddr_storage* addr,
                }
                (void)strlcpy(buf, str, sizeof(buf));
                buf[len] = 0;
+               port = UNBOUND_DNS_OVER_TLS_PORT;
                *auth_name = s+1;
                return ipstrtoaddr(buf, port, addr, addrlen);
        }