diff options
| author | Justin Ross <jross@apache.org> | 2014-11-13 19:31:37 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2014-11-13 19:31:37 +0000 |
| commit | 39e17735f25a8c22c6f16c7a9ff6a3f4859f3f0a (patch) | |
| tree | 1baca3df58e17bc38fa18faf17ad65b1ed1ae34f /qpid/cpp/src | |
| parent | 6a46b152b4ca9d63c99cef6daa6e0d16dd9cb95e (diff) | |
| download | qpid-python-39e17735f25a8c22c6f16c7a9ff6a3f4859f3f0a.tar.gz | |
QPID-6203: Fix a test failure introduced by revision 1637122
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1639493 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp index 41b56e1d82..cfbd7aaa66 100644 --- a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp +++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp @@ -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::string& saslName, std::string const & sa #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 { |