From c71c6ea62eb67aa7580dfadee981607559d1247c Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Tue, 29 Sep 2020 14:42:17 +0200
Subject: [PATCH] auth: remove local-ipv6, query-local-address6

---
 docs/settings.rst      | 3 +--
 pdns/common_startup.cc | 6 ------
 pdns/nameserver.cc     | 4 ----
 pdns/tcpreceiver.cc    | 1 -
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 8b51211258..a29c7d6ae8 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1309,8 +1309,7 @@ the network).
 ``query-local-address6``
 ------------------------
 .. deprecated:: 4.4.0
-  Use :ref:`setting-query-local-address`. The default has been changed
-  from '::' to unset.
+  Removed. Use :ref:`setting-query-local-address`.
 
 -  IPv6 Address
 -  Default: unset
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 05b0cca571..8807c10c61 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -97,12 +97,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";
 
@@ -634,10 +632,6 @@ void mainthread()
   }
 
   pdns::parseQueryLocalAddress(::arg()["query-local-address"]);
-  if (!::arg()["query-local-address6"].empty()) {
-    g_log<<Logger::Warning<<"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"]);
-  }
 
   // NOW SAFE TO CREATE THREADS!
   dl->go();
diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 6d658155a3..57ee709442 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 318c252d6e..a574a66f46 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1142,7 +1142,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");
-- 
2.47.2