/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2019 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "ldapauthenticator.h"
-#include "logmessage.h"
#include "network.h"
#include "quassel.h"
// Users created via LDAP have empty passwords, but authenticator column = LDAP.
// On the other hand, if auth succeeds and the user already exists, do a final
// cross-check to confirm we're using the right auth provider.
- UserId quasselId = Core::validateUser(lUsername, QString());
+ UserId quasselId = Core::getUserId(lUsername);
if (!quasselId.isValid()) {
return Core::addUser(lUsername, QString(), backendId());
}
bool status = ldapConnect();
if (!status) {
- quInfo() << qPrintable(backendId()) << "authenticator cannot connect.";
+ qInfo() << qPrintable(backendId()) << "authenticator cannot connect.";
return NotAvailable;
}
- quInfo() << qPrintable(backendId()) << "authenticator is ready.";
+ qInfo() << qPrintable(backendId()) << "authenticator is ready.";
return IsReady;
}
serverURIArray = serverURI.toLocal8Bit();
res = ldap_initialize(&_connection, serverURIArray);
- quInfo() << "LDAP: Connecting to" << serverURI;
+ qInfo() << "LDAP: Connecting to" << serverURI;
if (res != LDAP_SUCCESS) {
qWarning() << "Could not connect to LDAP server:" << ldap_err2string(res);