Author: mgoulish Date: Fri Oct 22 07:13:34 2010 New Revision: 1026227 URL: http://svn.apache.org/viewvc?rev=1026227&view=rev Log: 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 .
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1026227&r1=1026226&r2=1026227&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri Oct 22 07:13:34 2010 @@ -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& co */ 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"); } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org