Merge pull request #7854 from Habbie/gsql-stou

auth gsql getAllDomains: ignore stou errors

diff --git a/m4/pdns_check_os.m4 b/m4/pdns_check_os.m4
index 860f9aa0e35029fc897694041e36ab55f4decc57..40d266a91d7bef77aadd18b78ce171c634926216 100644 (file)
--- a/m4/pdns_check_os.m4
+++ b/m4/pdns_check_os.m4
@@ -36,7 +36,7 @@ AC_DEFUN([PDNS_CHECK_OS],[
   AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"])
 
   case "$host" in
-  mips* | powerpc-* )
+  arc-* | mips* | powerpc-* )
     AC_MSG_CHECKING([whether the linker accepts -latomic])
     LDFLAGS="-latomic $LDFLAGS"
     AC_LINK_IFELSE([m4_default([],[AC_LANG_PROGRAM()])],

diff --git a/pdns/dnsdistdist/docs/reference/config.rst b/pdns/dnsdistdist/docs/reference/config.rst
index 32fa89cdda06bb8273ab7a08277bd4756be53888..623ef6c2d4ac4ea223344a0138c0e08406841ef8 100644 (file)
--- a/pdns/dnsdistdist/docs/reference/config.rst
+++ b/pdns/dnsdistdist/docs/reference/config.rst
@@ -391,7 +391,7 @@ Servers
       setCD=BOOL,            -- Set the CD (Checking Disabled) flag in the health-check query, default: false
       maxCheckFailures=NUM,  -- Allow NUM check failures before declaring the backend down, default: 1
       checkInterval=NUM      -- The time in seconds between health checks
-      mustResolve=BOOL,      -- Set to true when the health check MUST return a NOERROR RCODE and an answer
+      mustResolve=BOOL,      -- Set to true when the health check MUST return a RCODE different from NXDomain, ServFail and Refused. Default is false, meaning that every RCODE except ServFail is considered valid
       useClientSubnet=BOOL,  -- Add the client's IP address in the EDNS Client Subnet option when forwarding the query to this backend
       source=STRING,         -- The source address or interface to use for queries to this backend, by default this is left to the kernel's address selection
                              -- The following formats are supported:

diff --git a/pdns/dnsdistdist/tcpiohandler.cc b/pdns/dnsdistdist/tcpiohandler.cc
index bef5ce2faa9abe9699b0f63786f344fb01a910db..959648134f2d7a3f201485ad1cfba86fbde0b825 100644 (file)
--- a/pdns/dnsdistdist/tcpiohandler.cc
+++ b/pdns/dnsdistdist/tcpiohandler.cc
@@ -360,7 +360,7 @@ public:
     }
   }
 
-  std::string getServerNameIndication()
+  std::string getServerNameIndication() override
   {
     if (d_conn) {
       const char* value = SSL_get_servername(d_conn.get(), TLSEXT_NAMETYPE_host_name);
@@ -872,7 +872,7 @@ public:
     return got;
   }
 
-  std::string getServerNameIndication()
+  std::string getServerNameIndication() override
   {
     if (d_conn) {
       unsigned int type;