You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/10/23 20:06:40 UTC
svn commit: r1633904 -
/qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
Author: gsim
Date: Thu Oct 23 18:06:40 2014
New Revision: 1633904
URL: http://svn.apache.org/r1633904
Log:
QPID-2374: Ensure --require-encryption works as expected for ssl even when sasl support libs are not available
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=1633904&r1=1633903&r2=1633904&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp Thu Oct 23 18:06:40 2014
@@ -192,13 +192,10 @@ void NullAuthenticator::getMechanisms(Ar
void NullAuthenticator::start(const string& mechanism, const string* response)
{
if (encrypt) {
-#if HAVE_SASL
// encryption required - check to see if we are running over an
// encrypted SSL connection.
SecuritySettings external = connection.getExternalSecuritySettings();
- sasl_ssf_t external_ssf = (sasl_ssf_t) external.ssf;
- if (external_ssf < 1) // < 1 == unencrypted
-#endif
+ if (external.ssf < 1) // < 1 == unencrypted
{
QPID_LOG(error, "Rejected un-encrypted connection.");
throw ConnectionForcedException("Connection must be encrypted.");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org