summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2010-10-22 07:13:34 +0000
committerMichael Goulish <mgoulish@apache.org>2010-10-22 07:13:34 +0000
commit51cfdc9e0b65ad5397a979c5498de6e7f9044f42 (patch)
tree4681d1bc3085a27928758e2bb0030e0cc95cc6b7 /cpp/src
parent8bb029ed9064635af04afe1a0e667efd71494ab0 (diff)
downloadqpid-python-51cfdc9e0b65ad5397a979c5498de6e7f9044f42.tar.gz
Make the "SASL enabled" log message also print out the SASL version number. This will be useful in one test that depends on some SASL functionality that was not available before 2.1.22 .
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1026227 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index c93949e33f..7f036ab6fd 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -55,6 +55,8 @@
#include "qpid/Url.h"
#include "qpid/Version.h"
+#include "sasl/sasl.h"
+
#include <boost/bind.hpp>
#include <boost/format.hpp>
@@ -271,7 +273,9 @@ Broker::Broker(const Broker::Options& conf) :
*/
if (conf.auth) {
SaslAuthenticator::init(qpid::saslName, conf.saslConfigPath);
- QPID_LOG(info, "SASL enabled");
+ int saslVersion = (SASL_VERSION_MAJOR << 16) + (SASL_VERSION_MINOR << 8) +
+ SASL_VERSION_STEP;
+ QPID_LOG(info, "SASL enabled : version " << saslVersion);
} else {
QPID_LOG(notice, "SASL disabled: No Authentication Performed");
}