X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.cpp;h=c1bd71aba1e29bf0bcbd7426326a9e7b9409ae4a;hb=e212eabe53878a8fa6ecb15909a325ed7dd63283;hp=bd4350dac215ba6da4fef84c92ca0be894c311d9;hpb=6422c61b11d97f905b6a27f2d280e9ec0d8bb3e2;p=quassel.git diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp index bd4350da..c1bd71ab 100644 --- a/src/core/oidentdconfiggenerator.cpp +++ b/src/core/oidentdconfiggenerator.cpp @@ -23,10 +23,9 @@ #include "corenetwork.h" #include "oidentdconfiggenerator.h" -OidentdConfigGenerator::OidentdConfigGenerator(bool strict, QObject *parent) : +OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) : QObject(parent), - _initialized(false), - _strict(strict) + _initialized(false) { if (!_initialized) init(); @@ -71,11 +70,9 @@ bool OidentdConfigGenerator::init() QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity) const { - if (!_strict) { - return identity->ident(); - } + // Make sure the identity's ident complies with strict mode if enabled const CoreNetwork *network = qobject_cast(sender()); - return network->coreSession()->strictSysident(); + return network->coreSession()->strictCompliantIdent(identity); }