Respect RUNTIME_DIRECTORY as a default for socket-dir

This was lost with the conversion to the new settings.

(cherry picked from commit f2e6cf3ae0f4622bea9364d75dc205728a553e5b)

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index ed853cfbacdf0f8230ba0ae986f9fe432f3df342..f020346090cf51e5f994cc7d7370cb61f83c4f18 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2939,6 +2939,13 @@ static void handleRuntimeDefaults(Logr::log_t log)
     ::arg().set("server-id") = myHostname.has_value() ? *myHostname : "";
   }
 
+  if (::arg()["socket-dir"].empty()) {
+    auto* runtimeDir = getenv("RUNTIME_DIRECTORY"); // NOLINT(concurrency-mt-unsafe,cppcoreguidelines-pro-type-vararg)
+    if (runtimeDir != nullptr) {
+      ::arg().set("socket-dir") = runtimeDir;
+    }
+  }
+
   if (::arg()["socket-dir"].empty()) {
     if (::arg()["chroot"].empty()) {
       ::arg().set("socket-dir") = std::string(LOCALSTATEDIR) + "/pdns-recursor";