summaryrefslogtreecommitdiff
path: root/cpp/src/qpid
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2010-10-26 15:25:40 +0000
committerMichael Goulish <mgoulish@apache.org>2010-10-26 15:25:40 +0000
commit9a0b147fce9af6609e8b1ce1338aaec2dd369ebc (patch)
treec16431d373fcdc3d681fb3c81f2b4811dbd9ca34 /cpp/src/qpid
parent20aeba57098bd0b55894bfdf00f4fc0d545188f0 (diff)
downloadqpid-python-9a0b147fce9af6609e8b1ce1338aaec2dd369ebc.tar.gz
This code's purpose was only to print out the sasl version into the logs
so that I could grep for it in the sasl_fed test. But it is breaking the windows build. So I am backing it out, and temporarily disabling the sasl_fed test until I can implement something a little less grotesque. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1027594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 7f036ab6fd..c93949e33f 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -55,8 +55,6 @@
#include "qpid/Url.h"
#include "qpid/Version.h"
-#include "sasl/sasl.h"
-
#include <boost/bind.hpp>
#include <boost/format.hpp>
@@ -273,9 +271,7 @@ Broker::Broker(const Broker::Options& conf) :
*/
if (conf.auth) {
SaslAuthenticator::init(qpid::saslName, conf.saslConfigPath);
- int saslVersion = (SASL_VERSION_MAJOR << 16) + (SASL_VERSION_MINOR << 8) +
- SASL_VERSION_STEP;
- QPID_LOG(info, "SASL enabled : version " << saslVersion);
+ QPID_LOG(info, "SASL enabled");
} else {
QPID_LOG(notice, "SASL disabled: No Authentication Performed");
}