X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fprotocol.h;h=b686a513171e81094dcc5a1e950f42e4b71f9b30;hp=c7cbcb3a8f4e67d4b91314c50dbb3b36a1f0d5d4;hb=61aac1868f15babb7086d8bc6bbcff530346f438;hpb=3856cfd6126cdea97c91a22be7ded92ccc0a3577 diff --git a/src/common/protocol.h b/src/common/protocol.h index c7cbcb3a..b686a513 100644 --- a/src/common/protocol.h +++ b/src/common/protocol.h @@ -81,17 +81,21 @@ struct ClientDenied : public HandshakeMessage struct ClientRegistered : public HandshakeMessage { - inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported) + inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, const QVariantList &authBackendInfo, bool sslSupported) : coreFeatures(coreFeatures) , coreConfigured(coreConfigured) , backendInfo(backendInfo) + , authBackendInfo(authBackendInfo) , sslSupported(sslSupported) {} quint32 coreFeatures; bool coreConfigured; + + // The authBackendInfo should be optional! QVariantList backendInfo; // TODO: abstract this better - + QVariantList authBackendInfo; + // this is only used by the LegacyProtocol in compat mode bool sslSupported; }; @@ -99,13 +103,15 @@ struct ClientRegistered : public HandshakeMessage struct SetupData : public HandshakeMessage { - inline SetupData(const QString &adminUser, const QString &adminPassword, const QString &backend, const QVariantMap &setupData) - : adminUser(adminUser), adminPassword(adminPassword), backend(backend), setupData(setupData) {} + inline SetupData(const QString &adminUser, const QString &adminPassword, const QString &backend, const QString &authenticator, const QVariantMap &setupData, const QVariantMap &authSetupData) + : adminUser(adminUser), adminPassword(adminPassword), backend(backend), authenticator(authenticator), setupData(setupData), authSetupData(authSetupData) {} QString adminUser; QString adminPassword; QString backend; + QString authenticator; QVariantMap setupData; + QVariantMap authSetupData; };