diff options
Diffstat (limited to '')
-rw-r--r-- | src/security/sasl/SASLMechanismFactory.cpp | 4 | ||||
-rw-r--r-- | src/security/sasl/SASLSession.cpp | 2 | ||||
-rw-r--r-- | src/security/sasl/SASLSocket.cpp | 4 | ||||
-rw-r--r-- | src/security/sasl/builtinSASLMechanism.cpp | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/security/sasl/SASLMechanismFactory.cpp b/src/security/sasl/SASLMechanismFactory.cpp index 37858199..a866e0cf 100644 --- a/src/security/sasl/SASLMechanismFactory.cpp +++ b/src/security/sasl/SASLMechanismFactory.cpp @@ -115,14 +115,14 @@ const std::vector <string> SASLMechanismFactory::getSupportedMechanisms() const } } - free(out); + gsasl_free(out); } return list; } -const bool SASLMechanismFactory::isMechanismSupported(const string& name) const +bool SASLMechanismFactory::isMechanismSupported(const string& name) const { return (gsasl_client_support_p(m_gsaslContext, name.c_str()) != 0 || m_mechs.find(name) != m_mechs.end()); diff --git a/src/security/sasl/SASLSession.cpp b/src/security/sasl/SASLSession.cpp index 01da8ee9..f7f80f59 100644 --- a/src/security/sasl/SASLSession.cpp +++ b/src/security/sasl/SASLSession.cpp @@ -92,7 +92,7 @@ ref <SASLContext> SASLSession::getContext() } -const bool SASLSession::evaluateChallenge +bool SASLSession::evaluateChallenge (const byte_t* challenge, const int challengeLen, byte_t** response, int* responseLen) { diff --git a/src/security/sasl/SASLSocket.cpp b/src/security/sasl/SASLSocket.cpp index 50c31e1b..5f86aed5 100644 --- a/src/security/sasl/SASLSocket.cpp +++ b/src/security/sasl/SASLSocket.cpp @@ -63,7 +63,7 @@ void SASLSocket::disconnect() } -const bool SASLSocket::isConnected() const +bool SASLSocket::isConnected() const { return m_wrapped->isConnected(); } @@ -77,7 +77,7 @@ void SASLSocket::receive(string& buffer) } -const int SASLSocket::receiveRaw(char* buffer, const int count) +int SASLSocket::receiveRaw(char* buffer, const int count) { if (m_pendingLen != 0) { diff --git a/src/security/sasl/builtinSASLMechanism.cpp b/src/security/sasl/builtinSASLMechanism.cpp index 168b34cb..1c958311 100644 --- a/src/security/sasl/builtinSASLMechanism.cpp +++ b/src/security/sasl/builtinSASLMechanism.cpp @@ -56,7 +56,7 @@ const string builtinSASLMechanism::getName() const } -const bool builtinSASLMechanism::step +bool builtinSASLMechanism::step (ref <SASLSession> sess, const byte_t* challenge, const int challengeLen, byte_t** response, int* responseLen) { @@ -77,7 +77,7 @@ const bool builtinSASLMechanism::step *response = res; *responseLen = outputLen; - free(output); + gsasl_free(output); } else { @@ -108,7 +108,7 @@ const bool builtinSASLMechanism::step } -const bool builtinSASLMechanism::isComplete() const +bool builtinSASLMechanism::isComplete() const { return m_complete; } @@ -139,11 +139,11 @@ void builtinSASLMechanism::encode } catch (...) { - free(coutput); + gsasl_free(coutput); throw; } - free(coutput); + gsasl_free(coutput); } @@ -172,11 +172,11 @@ void builtinSASLMechanism::decode } catch (...) { - free(coutput); + gsasl_free(coutput); throw; } - free(coutput); + gsasl_free(coutput); } |