X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Foidentdconfiggenerator.cpp;h=c1bd71aba1e29bf0bcbd7426326a9e7b9409ae4a;hp=6a77665eb8e49f87f0dbfcf8a298bb3708fef9cc;hb=5fc6f7e2d63b45770574260afd6ce535e9548d23;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp
index 6a77665e..c1bd71ab 100644
--- a/src/core/oidentdconfiggenerator.cpp
+++ b/src/core/oidentdconfiggenerator.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,6 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <QString>
+
+#include "corenetwork.h"
 #include "oidentdconfiggenerator.h"
 
 OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
@@ -66,12 +69,19 @@ bool OidentdConfigGenerator::init()
 }
 
 
+QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity) const {
+    // Make sure the identity's ident complies with strict mode if enabled
+    const CoreNetwork *network = qobject_cast<CoreNetwork *>(sender());
+    return network->coreSession()->strictCompliantIdent(identity);
+}
+
+
 bool OidentdConfigGenerator::addSocket(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort)
 {
     Q_UNUSED(localAddress) Q_UNUSED(peerAddress) Q_UNUSED(peerPort)
-    QString ident = identity->ident();
+    const QString ident = sysIdentForIdentity(identity);
 
-    _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toAscii());
+    _quasselConfig.append(_quasselStanzaTemplate.arg(localPort).arg(ident).arg(_configTag).toLatin1());
 
     bool ret = writeConfig();