X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=c01115f4bd12993ce6b368ffa1ea72bd45c05f40;hb=9f5f7f67cd4ccca7e6f922313aa0aa78246f7855;hp=c7251cfdebcb37ced4628e075b15b115bf017d04;hpb=258d157a228d2b2b46b01d3b33ab932b9979436a;p=quassel.git diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp index c7251cfd..c01115f4 100644 --- a/src/core/coreauthhandler.cpp +++ b/src/core/coreauthhandler.cpp @@ -174,8 +174,7 @@ void CoreAuthHandler::handle(const RegisterClient &msg) QVariantList backends; QVariantList authenticators; bool configured = Core::isConfigured(); - if (!configured) - { + if (!configured) { backends = Core::backendInfo(); authenticators = Core::authenticatorInfo(); } @@ -184,6 +183,10 @@ void CoreAuthHandler::handle(const RegisterClient &msg) // XXX: FIXME: use client features here: we cannot pass authenticators if the client is too old! _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, authenticators)); + _peer->setBuildDate(msg.buildDate); + _peer->setClientVersion(msg.clientVersion); + _peer->setFeatures(Quassel::Features(msg.clientFeatures)); + if (_legacy && useSsl) startSsl(); @@ -200,8 +203,7 @@ void CoreAuthHandler::handle(const SetupData &msg) // Maybe this should be hardcoded elsewhere, i.e. as a define. QString authenticator = msg.authenticator; quInfo() << "[" << authenticator << "]"; - if (authenticator.trimmed().isEmpty() || authenticator == 0) - { + if (authenticator.trimmed().isEmpty()) { authenticator = QString("Database"); } @@ -221,8 +223,7 @@ void CoreAuthHandler::handle(const Login &msg) // First attempt local auth using the real username and password. // If that fails, move onto the auth provider. UserId uid = Core::validateUser(msg.user, msg.password); - if (uid == 0) - { + if (uid == 0) { uid = Core::authenticateUser(msg.user, msg.password); }