Merge remote-tracking branch 'origin/master' into rec-dnstap

diff --cc pdns/pdns_recursor.cc
Simple merge

diff --cc pdns/recursordist/Makefile.am
index b0703c7dcea17213977f652f51073c806af1c50e,9d1faba044ac987482530ecab1f219a206a5bf3d..12d93f680fd8040b3b8f54757be5ebd3a7d334ca
--- 1/pdns/recursordist/Makefile.am
--- 2/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@@ -375,36 -373,15 +386,32 @@@ endi
  BUILT_SOURCES += dnsmessage.pb.cc
  pdns_recursor_LDADD += $(PROTOBUF_LIBS)
  nodist_pdns_recursor_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
 +nodist_testrunner_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
 +
 +if FSTRM
 +BUILT_SOURCES += dnstap.pb.cc
 +pdns_recursor.$(OBJEXT): dnstap.pb.cc dnsmessage.pb.cc
 +testrunner$(OBJEXT): dnstap.pb.cc dnsmessage.pb.cc
 +nodist_pdns_recursor_SOURCES += dnstap.pb.cc dnstap.pb.h
 +nodist_testrunner_SOURCES += dnstap.pb.cc dnstap.pb.h
 +else
  pdns_recursor.$(OBJEXT): dnsmessage.pb.cc
 +testrunner$(OBJEXT): dnsmessage.pb.cc
 +endif
  
 -nodist_testrunner_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
  testrunner_LDADD += $(PROTOBUF_LIBS)
 -testrunner$(OBJEXT): dnsmessage.pb.cc
  
  endif
- 
- pdns_recursor_SOURCES += \
-       uuid-utils.hh uuid-utils.cc
- 
  endif
  
 +if FSTRM
 +pdns_recursor_SOURCES += \
 +      dnstap.cc dnstap.hh rec-dnstap.hh
 +
 +pdns_recursor_LDADD += \
 +      $(FSTRM_LIBS)
 +endif
 +
  rec_control_SOURCES = \
        arguments.cc arguments.hh \
        dnsname.hh dnsname.cc \

diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge

diff --cc pdns/syncres.cc
Simple merge

diff --cc pdns/syncres.hh
index 787fd795dc59597509c9d38cd245872c2029fca2,b316c92d4bf4de8473cdfd87a4a40d7c1ddbb484..db606870f56f90deb3673255d0e47882234fdd2b
--- 1/pdns/syncres.hh
--- 2/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@@ -56,11 -57,11 +57,14 @@@
  
  #ifdef HAVE_PROTOBUF
  #include <boost/uuid/uuid.hpp>
 +#ifdef HAVE_FSTRM
 +#include "fstrm_logger.hh"
 +#endif /* HAVE_FSTRM */
  #endif
  
+ extern GlobalStateHolder<SuffixMatchNode> g_dontThrottleNames;
+ extern GlobalStateHolder<NetmaskGroup> g_dontThrottleNetmasks;
+ 
  class RecursorLua4;
  
  typedef map<