openssl/ssl2.h #defines CERT, #undef it. While there move an include not needed in...

file to the .cc file and add an error message in dnsparser.hh

diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index b31dbe2cc61a4614932012126ae8b80b3b0ec909..3a2f6d1fba7802262bc0eb417cf43e4cfc87475a 100644 (file)
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -457,6 +457,10 @@ private:
 };
 
 
+#ifdef CERT
+#error likely openssl/ssl2.h is included, defining CERT, avoid that or undef CERT before including dnsrecords.hh
+#endif
+
 class CERTRecordContent : public DNSRecordContent
 {
 public:

diff --git a/pdns/recursordist/rec-tcpout.cc b/pdns/recursordist/rec-tcpout.cc
index 5d05fb596e7222cdd1bcf93585fb6ba5765dbf83..97ccb16853d08efc2ca724ad88496c7230ef1a06 100644 (file)
--- a/pdns/recursordist/rec-tcpout.cc
+++ b/pdns/recursordist/rec-tcpout.cc
@@ -22,6 +22,12 @@
 
 #include "rec-tcpout.hh"
 
+// This line from /usr/include/openssl/ssl2.h: # define CERT char
+// throws dnsrecords.hh off the rails.
+#undef CERT
+
+#include "syncres.hh"
+
 timeval TCPOutConnectionManager::maxIdleTime;
 size_t TCPOutConnectionManager::maxQueries;
 size_t TCPOutConnectionManager::maxIdlePerAuth;

diff --git a/pdns/recursordist/rec-tcpout.hh b/pdns/recursordist/rec-tcpout.hh
index fb2361f5bdc449243d173a47c817b7b9a25ab4b8..70620800f2d789b4d206f274868ba6174319aca3 100644 (file)
--- a/pdns/recursordist/rec-tcpout.hh
+++ b/pdns/recursordist/rec-tcpout.hh
@@ -24,7 +24,6 @@
 
 #include "iputils.hh"
 #include "tcpiohandler.hh"
-#include "syncres.hh"
 
 class TCPOutConnectionManager
 {