From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 31 Mar 2021 10:57:16 +0000 (+0200)
Subject: auth: remove local-ipv6, query-local-address6 (redo of #9552). Closes #5368
X-Git-Tag: dnsdist-1.6.0-rc1~38^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ff9e574c4ebcf692dc3fcbb86beb70e74b08e9b;p=thirdparty%2Fpdns.git

auth: remove local-ipv6, query-local-address6 (redo of #9552). Closes #5368
---

diff --git a/docs/settings.rst b/docs/settings.rst
index f45208dae9..b3c0547940 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -775,15 +775,8 @@ Fail to start if one or more of the
 
 ``local-ipv6``
 --------------
-.. deprecated:: 4.3.0
-  This setting has been deprecated, use :ref:`setting-local-address`
-
--  IPv6 Addresses, separated by commas or whitespace
--  Default: ``::``
-
-Local IPv6 address to which we bind. It is highly advised to bind to
-specific interfaces and not use the default 'bind to any'. This causes
-big problems if you have multiple IP addresses.
+.. deprecated:: 4.5.0
+  Remove, use :ref:`setting-local-address`
 
 .. _setting-local-ipv6-nonexist-fail:
 
@@ -1235,14 +1228,8 @@ the network).
 
 ``query-local-address6``
 ------------------------
-.. deprecated:: 4.4.0
-  Use :ref:`setting-query-local-address`. The default has been changed
-  from '::' to unset.
-
--  IPv6 Address
--  Default: unset
-
-Source IP address for sending IPv6 queries.
+.. deprecated:: 4.5.0
+  Removed. Use :ref:`setting-query-local-address`.
 
 .. _setting-query-logging:
 
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index db4b4aa5dc..fc13ec9ed1 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -98,12 +98,10 @@ void declareArguments()
   ::arg().setSwitch("log-dns-details","If PDNS should log DNS non-erroneous details")="no";
   ::arg().setSwitch("log-dns-queries","If PDNS should log all incoming DNS queries")="no";
   ::arg().set("local-address","Local IP addresses to which we bind")="0.0.0.0, ::";
-  ::arg().set("local-ipv6","DEPRECATED, will be removed, move your IPs to local-address")="";
   ::arg().setSwitch("local-address-nonexist-fail","Fail to start if one or more of the local-address's do not exist on this server")="yes";
   ::arg().setSwitch("non-local-bind", "Enable binding to non-local addresses by using FREEBIND / BINDANY socket options")="no";
   ::arg().setSwitch("reuseport","Enable higher performance on compliant kernels by using SO_REUSEPORT allowing each receiver thread to open its own socket")="no";
   ::arg().set("query-local-address","Source IP addresses for sending queries")="0.0.0.0 ::";
-  ::arg().set("query-local-address6","DEPRECATED: Use query-local-address. Source IPv6 address for sending queries")="";
   ::arg().set("overload-queue-length","Maximum queuelength moving to packetcache only")="0";
   ::arg().set("max-queue-length","Maximum queuelength before considering situation lost")="5000";
 
@@ -637,10 +635,6 @@ void mainthread()
   }
 
   pdns::parseQueryLocalAddress(::arg()["query-local-address"]);
-  if (!::arg()["query-local-address6"].empty()) {
-    g_log<<Logger::Error<<"NOTE: query-local-address6 is deprecated and will be removed in a future version. Please use query-local-address for IPv6 addresses as well"<<endl;
-    pdns::parseQueryLocalAddress(::arg()["query-local-address6"]);
-  }
 
   pdns::parseTrustedNotificationProxy(::arg()["trusted-notification-proxy"]);
 
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 8a7310a9ae..a09953e635 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -89,10 +89,6 @@ vector<ComboAddress> g_localaddresses; // not static, our unit tests need to pok
 void UDPNameserver::bindAddresses()
 {
   vector<string>locals;
-  stringtok(locals,::arg()["local-ipv6"]," ,");
-  if (!locals.empty()) {
-    g_log<<Logger::Error<<"NOTE: Deprecated local-ipv6 setting used. Please move those addresses to the local-address setting."<<endl;
-  }
   stringtok(locals,::arg()["local-address"]," ,");
 
   int one = 1;
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 3fefed1413..7b6b5fa332 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1122,7 +1122,6 @@ TCPNameserver::TCPNameserver()
   d_maxTCPConnections = ::arg().asNum( "max-tcp-connections" );
 
   vector<string>locals;
-  stringtok(locals,::arg()["local-ipv6"]," ,");
   stringtok(locals,::arg()["local-address"]," ,");
   if(locals.empty())
     throw PDNSException("No local addresses specified");