You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2014/11/13 20:31:37 UTC
svn commit: r1639493 -
/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
Author: jross
Date: Thu Nov 13 19:31:37 2014
New Revision: 1639493
URL: http://svn.apache.org/r1639493
Log:
QPID-6203: Fix a test failure introduced by revision 1637122
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp?rev=1639493&r1=1639492&r2=1639493&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Thu Nov 13 19:31:37 2014
@@ -123,11 +123,12 @@ typedef int (*sasl_callback_ft)(void);
#endif
// passed to sasl_server_init()
-static sasl_callback_t callbacks[] =
+static sasl_callback_t _callbacks[] =
{
{ SASL_CB_VERIFYFILE, (sasl_callback_ft)&_sasl_verifyfile_callback, NULL },
{ SASL_CB_LIST_END, NULL, NULL }
};
+sasl_callback_t *callbacks = _callbacks;
// Initialize the SASL mechanism; throw if it fails.
void SaslAuthenticator::init(const std::string& saslName, std::string const & saslConfigPath )
@@ -136,6 +137,8 @@ void SaslAuthenticator::init(const std::
#if (SASL_VERSION_FULL >= ((2<<16)|(1<<8)|22))
// If we are not given a sasl path, do nothing and allow the default to be used.
if ( saslConfigPath.empty() ) {
+ // don't pass callbacks if there is no config path
+ callbacks = NULL;
QPID_LOG ( info, "SASL: no config path set - using default." );
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org