From c81009ff85f150544a4364b13b5f1516c0579e44 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 11 Nov 2019 12:18:02 +0100
Subject: [PATCH] Revert "Rec 8020 docs fix"

---
 pdns/pdns_recursor.cc               | 10 ++--------
 pdns/rec_channel.cc                 |  2 --
 pdns/rec_channel.hh                 |  2 --
 pdns/rec_channel_rec.cc             | 11 +++++------
 pdns/recursordist/docs/settings.rst |  6 +++---
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index c6200a1e5f..d36625e4d9 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4279,8 +4279,6 @@ static int serviceMain(int argc, char*argv[])
     infos.isListener = true;
     infos.isWorker = true;
     recursorThread(currentThreadId++, "worker");
-    
-    handlerInfos.thread.join();
   }
   else {
 
@@ -4315,9 +4313,7 @@ static int serviceMain(int argc, char*argv[])
     infos.isHandler = true;
     infos.thread = std::thread(recursorThread, 0, "web+stat");
 
-    for (auto & ti : s_threadInfos) {
-      ti.thread.join();
-    }
+    s_threadInfos.at(0).thread.join();
   }
   return 0;
 }
@@ -4452,8 +4448,7 @@ try
   time_t carbonInterval=::arg().asNum("carbon-interval");
   time_t luaMaintenanceInterval=::arg().asNum("lua-maintenance-interval");
   counter.store(0); // used to periodically execute certain tasks
-
-  while (!RecursorControlChannel::stop) {
+  for(;;) {
     while(MT->schedule(&g_now)); // MTasker letting the mthreads do their thing
 
     if(!(counter%500)) {
@@ -4521,7 +4516,6 @@ try
       }
     }
   }
-  return 0;
 }
 catch(PDNSException &ae) {
   g_log<<Logger::Error<<"Exception: "<<ae.reason<<endl;
diff --git a/pdns/rec_channel.cc b/pdns/rec_channel.cc
index 65afbe092d..0884afaa63 100644
--- a/pdns/rec_channel.cc
+++ b/pdns/rec_channel.cc
@@ -17,8 +17,6 @@
 
 #include "namespaces.hh"
 
-volatile sig_atomic_t RecursorControlChannel::stop;
-
 RecursorControlChannel::RecursorControlChannel()
 {
   d_fd=-1;
diff --git a/pdns/rec_channel.hh b/pdns/rec_channel.hh
index 732bd81eac..ee653752ba 100644
--- a/pdns/rec_channel.hh
+++ b/pdns/rec_channel.hh
@@ -27,7 +27,6 @@
 #include <vector>
 #include <inttypes.h>
 #include <sys/un.h>
-#include <signal.h>
 #include <pthread.h>
 #include "iputils.hh"
 #include "dnsname.hh"
@@ -54,7 +53,6 @@ public:
   std::string recv(std::string* remote=0, unsigned int timeout=5);
 
   int d_fd;
-  static volatile sig_atomic_t stop;
 private:
   struct sockaddr_un d_local;
 };
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index a294e62ac7..a86500ba12 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -1165,16 +1165,15 @@ void doExitGeneric(bool nicely)
 {
   g_log<<Logger::Error<<"Exiting on user request"<<endl;
   extern RecursorControlChannel s_rcc;
-  s_rcc.~RecursorControlChannel();
+  s_rcc.~RecursorControlChannel(); 
 
   extern string s_pidfname;
-  if(!s_pidfname.empty())
+  if(!s_pidfname.empty()) 
     unlink(s_pidfname.c_str()); // we can at least try..
-  if(nicely) {
-    RecursorControlChannel::stop = 1;
-  } else {
+  if(nicely)
+    exit(1);
+  else
     _exit(1);
-  }
 }
 
 void doExit()
diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index de27b29988..ab66bf0fbb 100644
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -1150,16 +1150,16 @@ matching ``*.foo.example.net`` will be answered with NXDOMAIN directly
 without consulting authoritative servers.
 
 no
-^^
+~~
 No :rfc:`8020` processing is done.
 
 dnssec
-^^^^^^
+~~~~~~
 :rfc:`8020` processing is only done using cached NXDOMAIN records that are
 DNSSEC validated.
 
 yes
-^^^
+~~~
 :rfc:`8020` processing is done using any non-Bogus NXDOMAIN record
 available in the cache.
 
-- 
2.47.2