Merge pull request #8940 from pieterlexis/resolver-query-local-address6

Merge query-local-address6 into query-local-address

diff --cc docs/settings.rst
Simple merge

diff --cc pdns/Makefile.am
Simple merge

diff --cc pdns/common_startup.cc
Simple merge

diff --cc pdns/communicator.cc
Simple merge

diff --cc pdns/ixfrdist.cc
Simple merge

diff --cc pdns/ixplore.cc
Simple merge

diff --cc pdns/mastercommunicator.cc
Simple merge

diff --cc pdns/pdns_recursor.cc
index 0db01c9d34419bea68d57e1e37e1a340691e86e9,96bdffd322e10431edaa53016a321a7b8960176d..c209fc81603d4dbcb897eeec9d1ce232d02beadf
--- 1/pdns/pdns_recursor.cc
--- 2/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@@ -4946,19 -4798,10 +4918,19 @@@ int main(int argc, char **argv
      ::arg().set("socket-group","Group of socket")="";
      ::arg().set("socket-mode", "Permissions for socket")="";
  
 -    ::arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+"/pdns-recursor when unset and not chrooted" )="";
 +    ::arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+"/pdns-recursor when unset and not chrooted"
 +#ifdef HAVE_SYSTEMD
 +      + ". Set to the RUNTIME_DIRECTORY environment variable when that variable has a value (e.g. under systemd).")="";
 +   auto runtimeDir = getenv("RUNTIME_DIRECTORY");
 +   if (runtimeDir != nullptr) {
 +     ::arg().set("socket-dir") = runtimeDir;
 +   }
 +#else
 +      )="";
 +#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","Source IPv6 address for sending queries. IF UNSET, IPv6 WILL NOT BE USED FOR OUTGOING QUERIES")="";
+     ::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 --cc pdns/recursordist/Makefile.am
Simple merge

diff --cc pdns/recursordist/docs/settings.rst
Simple merge

diff --cc pdns/rfc2136handler.cc
Simple merge

diff --cc pdns/slavecommunicator.cc
Simple merge

diff --cc pdns/syncres.hh
Simple merge

diff --cc pdns/tcpreceiver.cc
Simple merge