diff options
| author | Gordon Sim <gsim@apache.org> | 2009-11-09 15:30:18 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2009-11-09 15:30:18 +0000 |
| commit | 58efa10f3ed794dac024a1995e871a1368faeddc (patch) | |
| tree | 7a96ce8642acfdc19546512fadfc8783fbc252d3 /cpp/src/qpid/client/ConnectionHandler.cpp | |
| parent | bb32d235be89547bb7e8621ce56c66e4dabdd43a (diff) | |
| download | qpid-python-58efa10f3ed794dac024a1995e871a1368faeddc.tar.gz | |
QPID-1899: Applied patch from Ken Giusti to tie in SASL enctryption to the handling of the --require-encrypted option
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@834108 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/client/ConnectionHandler.cpp')
| -rw-r--r-- | cpp/src/qpid/client/ConnectionHandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/cpp/src/qpid/client/ConnectionHandler.cpp index bb348675c6..8f1cc7b03f 100644 --- a/cpp/src/qpid/client/ConnectionHandler.cpp +++ b/cpp/src/qpid/client/ConnectionHandler.cpp @@ -212,7 +212,8 @@ void ConnectionHandler::start(const FieldTable& /*serverProps*/, const Array& me } if (sasl.get()) { - string response = sasl->start(mechanism.empty() ? mechlist : mechanism); + string response = sasl->start(mechanism.empty() ? mechlist : mechanism, + getSSF ? getSSF() : 0); proxy.startOk(properties, sasl->getMechanism(), response, locale); } else { //TODO: verify that desired mechanism and locale are supported |