Remove the statbag from the recursor

diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index 3fff9febf23f4693186d18b43eb21b95cf8cc173..d9f2770447958f0417433eb61c4bbf137ddd7cfc 100644 (file)
--- a/pdns/dnssecinfra.cc
+++ b/pdns/dnssecinfra.cc
@@ -6,7 +6,9 @@
 #include "misc.hh"
 #include "dnswriter.hh"
 #include "dnsrecords.hh"
+#ifndef RECURSOR
 #include "statbag.hh"
+#endif
 #include "iputils.hh"
 
 #include <boost/algorithm/string.hpp>

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 661f23d710c7012d1397b489de7fb67daccb1142..84a4b7a0f02c89b167f19e166d8e2e602d4a1734 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -93,11 +93,6 @@ extern SortList g_sortlist;
 #include <systemd/sd-daemon.h>
 #endif
 
-#ifndef RECURSOR
-#include "statbag.hh"
-StatBag S;
-#endif
-
 __thread FDMultiplexer* t_fdm;
 __thread unsigned int t_id;
 unsigned int g_maxTCPPerClient;

diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index b87a34cd2cc2389e495cb994bbb7f43c252f4b68..cfe594e9be1117fff15b79506e44c589b838b26e 100644 (file)
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -29,11 +29,6 @@
 
 #include "namespaces.hh"
 
-#ifndef RECURSOR
-#include "statbag.hh"
-StatBag S;
-#endif
-
 ArgvMap &arg()
 {
   static ArgvMap arg;

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index e58336a00b9c3e4a63c390781a0095ad5716532a..0704e9b26a1ca6313b43905af52927cdd1de0051 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -122,7 +122,6 @@ pdns_recursor_SOURCES = \
        sillyrecords.cc \
        sortlist.cc sortlist.hh \
        sstuff.hh \
-       statbag.hh statbag.cc \
        syncres.cc syncres.hh \
        ueberbackend.hh \
        unix_utility.cc \
@@ -196,7 +195,6 @@ rec_control_SOURCES = \
        qtype.cc \
        rec_channel.cc rec_channel.hh \
        rec_control.cc \
-       statbag.cc \
        unix_utility.cc
 
 dnslabeltext.cc: dnslabeltext.rl

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 6666a592f6e500ae32941c3e1041a139d9cd0980..983bb0399dbc8dcadcac6364e419460b1d41816f 100644 (file)
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -27,6 +27,10 @@ AC_DEFINE([_GNU_SOURCE], [1],
   [Define _GNU_SOURCE so that we get all necessary prototypes]
 )
 
+AC_DEFINE([RECURSOR], [1],
+  [This is the PowerDNS Recursor]
+)
+
 # Warn when pkg.m4 is missing
 m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config])
 

diff --git a/pdns/recursordist/statbag.cc b/pdns/recursordist/statbag.cc
deleted file mode 120000 (symlink)
index a070542..0000000
--- a/pdns/recursordist/statbag.cc
+++ /dev/null
@@ -1 +0,0 @@
-../statbag.cc
\ No newline at end of file

diff --git a/pdns/recursordist/statbag.hh b/pdns/recursordist/statbag.hh
deleted file mode 120000 (symlink)
index 1b48b12..0000000
--- a/pdns/recursordist/statbag.hh
+++ /dev/null
@@ -1 +0,0 @@
-../statbag.hh
\ No newline at end of file