Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-06-03 18:11:02 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-06-03 18:11:02 (GMT) |
| commit | c3fa606c7ac060c4929e7082e0e24531b093112f (patch) | |
| tree | 394cf72c0b43fa706319592dfdb1438335b6116a /Swiften/Serializer/AuthRequestSerializer.cpp | |
| parent | 8406d818fcb2a511b1e4264a10fd9069ec020d72 (diff) | |
| download | swift-c3fa606c7ac060c4929e7082e0e24531b093112f.zip swift-c3fa606c7ac060c4929e7082e0e24531b093112f.tar.bz2 | |
Distinguish an empty SASL message from no SASL message.
Diffstat (limited to 'Swiften/Serializer/AuthRequestSerializer.cpp')
| -rw-r--r-- | Swiften/Serializer/AuthRequestSerializer.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Swiften/Serializer/AuthRequestSerializer.cpp b/Swiften/Serializer/AuthRequestSerializer.cpp index 32d733a..45b6503 100644 --- a/Swiften/Serializer/AuthRequestSerializer.cpp +++ b/Swiften/Serializer/AuthRequestSerializer.cpp @@ -16,7 +16,16 @@ AuthRequestSerializer::AuthRequestSerializer() { String AuthRequestSerializer::serialize(boost::shared_ptr<Element> element) const { boost::shared_ptr<AuthRequest> authRequest(boost::dynamic_pointer_cast<AuthRequest>(element)); - String value = (authRequest->getMessage().isEmpty() ? "=" : Base64::encode(authRequest->getMessage())); + String value; + boost::optional<ByteArray> message = authRequest->getMessage(); + if (message) { + if ((*message).isEmpty()) { + value = "="; + } + else { + value = Base64::encode(*message); + } + } return "<auth xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\" mechanism=\"" + authRequest->getMechanism() + "\">" + value + "</auth>"; } |