From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 23 May 2016 10:49:36 +0000 (+0200)
Subject: Remove the statbag from the recursor
X-Git-Tag: auth-4.0.0-beta1~14^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=acbfb1c15f5c5364a22a54853518990a0a2720be;p=pdns

Remove the statbag from the recursor
---

diff --git a/pdns/dnssecinfra.cc b/pdns/dnssecinfra.cc
index 3fff9febf..d9f277044 100644
--- 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 661f23d71..84a4b7a0f 100644
--- 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 b87a34cd2..cfe594e9b 100644
--- 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 e58336a00..0704e9b26 100644
--- 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 6666a592f..983bb0399 100644
--- 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
index a070542eb..000000000
--- 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
index 1b48b1284..000000000
--- a/pdns/recursordist/statbag.hh
+++ /dev/null
@@ -1 +0,0 @@
-../statbag.hh
\ No newline at end of file