projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to link against openldap on Windows, too
[quassel.git]
/
src
/
common
/
protocols
/
datastream
/
datastreampeer.cpp
diff --git
a/src/common/protocols/datastream/datastreampeer.cpp
b/src/common/protocols/datastream/datastreampeer.cpp
index
b7b9b36
..
acf7a42
100644
(file)
--- a/
src/common/protocols/datastream/datastreampeer.cpp
+++ b/
src/common/protocols/datastream/datastreampeer.cpp
@@
-124,12
+124,12
@@
void DataStreamPeer::handleHandshakeMessage(const QVariantList &mapData)
}
else if (msgType == "ClientInitAck") {
}
else if (msgType == "ClientInitAck") {
- handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false,
QString())); // SupportsSsl and coreInfo
obsolete
+ handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false,
m["AuthBackends"].toList())); // SupportsSsl
obsolete
}
else if (msgType == "CoreSetupData") {
QVariantMap map = m["SetupData"].toMap();
}
else if (msgType == "CoreSetupData") {
QVariantMap map = m["SetupData"].toMap();
- handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap()));
+ handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap()
, map["AuthBackend"].toString(), map["AuthProperties"].toMap()
));
}
else if (msgType == "CoreSetupReject") {
}
else if (msgType == "CoreSetupReject") {
@@
-187,6
+187,7
@@
void DataStreamPeer::dispatch(const ClientRegistered &msg) {
m["MsgType"] = "ClientInitAck";
m["CoreFeatures"] = msg.coreFeatures;
m["StorageBackends"] = msg.backendInfo;
m["MsgType"] = "ClientInitAck";
m["CoreFeatures"] = msg.coreFeatures;
m["StorageBackends"] = msg.backendInfo;
+ m["AuthBackends"] = msg.authBackendInfo;
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
writeMessage(m);
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
writeMessage(m);
@@
-201,6
+202,11
@@
void DataStreamPeer::dispatch(const SetupData &msg)
map["Backend"] = msg.backend;
map["ConnectionProperties"] = msg.setupData;
map["Backend"] = msg.backend;
map["ConnectionProperties"] = msg.setupData;
+ // Auth backend properties.
+ // XXX: make these optional using core features.
+ map["AuthBackend"] = msg.authenticator;
+ map["AuthProperties"] = msg.authSetupData;
+
QVariantMap m;
m["MsgType"] = "CoreSetupData";
m["SetupData"] = map;
QVariantMap m;
m["MsgType"] = "CoreSetupData";
m["SetupData"] = map;