summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
index edc66444ec..6334b1d8d7 100644
--- a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
@@ -19,16 +19,14 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include "Connection.h"
#include "qpid/log/Statement.h"
#include "qpid/framing/reply_exceptions.h"
#include <boost/format.hpp>
-#if HAVE_SASL
+#ifdef QPID_HAS_SASL
#include <sasl/sasl.h>
#include "qpid/sys/cyrus/CyrusSecurityLayer.h"
using qpid::sys::cyrus::CyrusSecurityLayer;
@@ -57,7 +55,7 @@ public:
std::auto_ptr<SecurityLayer> getSecurityLayer(uint16_t maxFrameSize);
};
-#if HAVE_SASL
+#ifdef QPID_HAS_SASL
class CyrusAuthenticator : public SaslAuthenticator
{
@@ -181,7 +179,7 @@ std::auto_ptr<SecurityLayer> NullAuthenticator::getSecurityLayer(uint16_t)
}
-#if HAVE_SASL
+#ifdef QPID_HAS_SASL
CyrusAuthenticator::CyrusAuthenticator(Connection& c, bool _encrypt) :