Handle a few remaining remnants of POC code

diff --git a/pdns/recursordist/rec-rust-lib/table.py b/pdns/recursordist/rec-rust-lib/table.py
index 93600481b8ebef934b70e9111e89df11d152742e..e07e176a65f3e2b4b19cf435e6f1c71b9c5e38c1 100644 (file)
--- a/pdns/recursordist/rec-rust-lib/table.py
+++ b/pdns/recursordist/rec-rust-lib/table.py
@@ -3208,10 +3208,10 @@ IP address for the webserver to listen on.
         'section' : 'webservice',
         'type' : LType.ListIncomingWSConfigs,
         'default' : '',
-        'help' : 'XXXX',
+        'help' : 'IP addresses and associated attributes for the webserver to listen on',
         'doc' : '''
 IP addresses and associated attributes for the webserver to listen on.
-If this setting has a non-default value, :ref:`setting-yaml-webservice.address` and :ref:`setting-yaml-webservice.port` will be ignored.
+If this setting has a non-default value, :ref:`setting-yaml-webservice.address` and :ref:`setting-yaml-webservice.port` will be ignored. Note multiple listen addresses can be configured and https is supported as well, in contrast to earlier (pre 5.3.0) versions.
  ''',
         'skip-old': 'No equivalent old-style setting',
         'versionadded': '5.3.0',

diff --git a/pdns/recursordist/reczones.cc b/pdns/recursordist/reczones.cc
index b92d6daed69016b9e6e98a018af72d0130fba912..d40df7a31f3be8979e95e9252af892c62f437f6d 100644 (file)
--- a/pdns/recursordist/reczones.cc
+++ b/pdns/recursordist/reczones.cc
@@ -34,11 +34,7 @@
 #include "zoneparser-tng.hh"
 #include "rec-rust-lib/cxxsettings.hh"
 #include "rec-system-resolve.hh"
-
-// XXX consider including rec-main.hh?
-extern int g_argc;
-extern char** g_argv;
-extern string g_yamlSettingsSuffix;
+#include "rec-main.hh"
 
 bool primeHints(time_t now)
 {
@@ -198,7 +194,6 @@ string reloadZoneConfiguration(bool yaml)
       oldAndNewDomains.insert(entry.first);
     }
 
-    extern LockGuarded<std::shared_ptr<SyncRes::domainmap_t>> g_initialDomainMap; // XXX
     {
       auto lock = g_initialDomainMap.lock();
       if (*lock) {
@@ -221,7 +216,6 @@ string reloadZoneConfiguration(bool yaml)
       wipeCaches(entry, true, 0xffff);
     }
     *g_initialDomainMap.lock() = std::move(newDomainMap);
-    extern LockGuarded<std::shared_ptr<notifyset_t>> g_initialAllowNotifyFor; // XXX
     *g_initialAllowNotifyFor.lock() = std::move(newNotifySet);
     return "ok\n";
   }