From 1a554a52513fea6fe4f7c108b88f6ad82725ebd8 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 29 Sep 2020 15:02:35 +0200
Subject: [PATCH] Recursor: Remove query-local-address6

---
 pdns/pdns_recursor.cc               | 6 ------
 pdns/recursordist/docs/settings.rst | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 1a9f8d416d..1321b286bb 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4198,11 +4198,6 @@ static int serviceMain(int argc, char*argv[])
   checkLinuxIPv6Limits();
   try {
     pdns::parseQueryLocalAddress(::arg()["query-local-address"]);
-    if (!::arg()["query-local-address6"].empty()) {
-      // TODO remove in 4.5.0
-      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"]);
-    }
   }
   catch(std::exception& e) {
     g_log<<Logger::Error<<"Assigning local query addresses: "<<e.what();
@@ -5068,7 +5063,6 @@ int main(int argc, char **argv)
 #endif
     ::arg().set("delegation-only","Which domains we only accept delegations from")="";
     ::arg().set("query-local-address","Source IP address for sending queries")="0.0.0.0";
-    ::arg().set("query-local-address6","DEPRECATED: Use query-local-address for IPv6 as well. Source IPv6 address for sending queries. IF UNSET, IPv6 WILL NOT BE USED FOR OUTGOING QUERIES")="";
     ::arg().set("client-tcp-timeout","Timeout in seconds when talking to TCP clients")="2";
     ::arg().set("max-mthreads", "Maximum number of simultaneous Mtasker threads")="2048";
     ::arg().set("max-tcp-clients","Maximum number of simultaneous TCP clients")="128";
diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index 6520769d9b..fb384ae021 100644
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -1344,6 +1344,9 @@ In the default configuration this means that IPv6 is not used for outgoing queri
 .. deprecated:: 4.4.0
   Use :ref:`setting-query-local-address` for IPv4 and IPv6.
 
+.. deprecated:: 4.5.0
+  Removed, use :ref:`setting-query-local-address`.
+
 -  IPv6 addresses, comma separated
 -  Default: unset
 
-- 
2.47.2