From 43be4ba3778682580ec21b97ef5ec78e6c11c2fe Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 23 Oct 2014 18:06:40 +0000 Subject: QPID-2374: Ensure --require-encryption works as expected for ssl even when sasl support libs are not available git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633904 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp index f68bda0b54..55a10063f8 100644 --- a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp +++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp @@ -192,13 +192,10 @@ void NullAuthenticator::getMechanisms(Array& mechanisms) 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."); -- cgit v1.2.1