diff options
| author | Gordon Sim <gsim@apache.org> | 2014-10-23 18:06:40 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2014-10-23 18:06:40 +0000 |
| commit | 43be4ba3778682580ec21b97ef5ec78e6c11c2fe (patch) | |
| tree | cd20fd4843bb0b7d92483c93f9bd667ef8305fc6 /qpid/cpp | |
| parent | 882aa4e7dba8471ca3616bd431146a18645574a9 (diff) | |
| download | qpid-python-43be4ba3778682580ec21b97ef5ec78e6c11c2fe.tar.gz | |
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
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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."); |