X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=6dc4fa7084057cc74d67f2bfd5cfcf81500a43dd;hp=0447a341e60bc1357507f4d408771ca39f27a23d;hb=26ab99ecabdbff2c7b66dc28039fe904bbce0520;hpb=c8a95fca86f2ce287f15fd036c0509561736970a

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 0447a341..6dc4fa70 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -41,6 +41,11 @@
 #  include <termios.h>
 #endif /* Q_OS_WIN32 */
 
+#ifdef HAVE_UMASK
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#endif /* HAVE_UMASK */
+
 // ==============================
 //  Custom Events
 // ==============================
@@ -74,6 +79,9 @@ void Core::destroy() {
 Core::Core()
   : _storage(0)
 {
+#ifdef HAVE_UMASK
+  umask(S_IRWXG | S_IRWXO);
+#endif
   _startTime = QDateTime::currentDateTime().toUTC();  // for uptime :)
 
   Quassel::loadTranslation(QLocale::system());
@@ -192,6 +200,9 @@ void Core::init() {
   connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
   connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
   if(!startListening()) exit(1); // TODO make this less brutal
+
+  if(Quassel::isOptionSet("oidentd"))
+    _oidentdConfigGenerator = new OidentdConfigGenerator(this);
 }
 
 Core::~Core() {
@@ -231,6 +242,7 @@ void Core::restoreState() {
     return;
   }
   */
+
   QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList();
   if(activeSessions.count() > 0) {
     quInfo() << "Restoring previous core state...";
@@ -253,7 +265,7 @@ QString Core::setupCoreForInternalUsage() {
   }
   setupData["AdminUser"] = "AdminUser";
   setupData["AdminPasswd"] = QString::number(pass);
-  setupData["Backend"] = _storageBackends[_storageBackends.keys().first()]->displayName();
+  setupData["Backend"] = QString("SQLite"); // mono client currently needs sqlite
   return setupCore(setupData);
 }
 
@@ -263,8 +275,7 @@ QString Core::setupCore(QVariantMap setupData) {
   if(user.isEmpty() || password.isEmpty()) {
     return tr("Admin user or password not set.");
   }
-  _configured = initStorage(setupData, true);
-  if(!_configured) {
+  if(_configured || !(_configured = initStorage(setupData, true))) {
     return tr("Could not setup storage!");
   }
   CoreSettings s;
@@ -387,40 +398,39 @@ bool Core::startListening() {
         );
       } else {
         switch(addr.protocol()) {
-          case QAbstractSocket::IPv4Protocol:
-            if(_server.listen(addr, port)) {
+          case QAbstractSocket::IPv6Protocol:
+            if(_v6server.listen(addr, port)) {
               quInfo() << qPrintable(
-                tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3")
+                tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3")
                   .arg(addr.toString())
-                  .arg(_server.serverPort())
+                  .arg(_v6server.serverPort())
                   .arg(Quassel::buildInfo().protocolVersion)
               );
               success = true;
             } else
               quWarning() << qPrintable(
-                tr("Could not open IPv4 interface %1:%2: %3")
+                tr("Could not open IPv6 interface %1:%2: %3")
                   .arg(addr.toString())
                   .arg(port)
-                  .arg(_server.errorString()));
+                  .arg(_v6server.errorString()));
             break;
-          case QAbstractSocket::IPv6Protocol:
-            if(_v6server.listen(addr, port)) {
+          case QAbstractSocket::IPv4Protocol:
+            if(_server.listen(addr, port)) {
               quInfo() << qPrintable(
-                tr("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3")
+                tr("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3")
                   .arg(addr.toString())
-                  .arg(_v6server.serverPort())
+                  .arg(_server.serverPort())
                   .arg(Quassel::buildInfo().protocolVersion)
               );
               success = true;
             } else {
-              // if v4 succeeded on Any, the port will be already in use - don't display the error then
-              // FIXME: handle this more sanely, make sure we can listen to both v4 and v6 by default!
-              if(!success || _v6server.serverError() != QAbstractSocket::AddressInUseError)
+              // if v6 succeeded on Any, the port will be already in use - don't display the error then
+              if(!success || _server.serverError() != QAbstractSocket::AddressInUseError)
                 quWarning() << qPrintable(
-                  tr("Could not open IPv6 interface %1:%2: %3")
+                  tr("Could not open IPv4 interface %1:%2: %3")
                   .arg(addr.toString())
                   .arg(port)
-                  .arg(_v6server.errorString()));
+                  .arg(_server.errorString()));
             }
             break;
           default:
@@ -529,6 +539,8 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
                                                      .arg(Quassel::buildInfo().buildDate)
       .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate));
 
+    reply["CoreFeatures"] = (int)Quassel::features();
+
 #ifdef HAVE_SSL
     SslServer *sslServer = qobject_cast<SslServer *>(&_server);
     QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
@@ -864,7 +876,7 @@ void Core::createUser() {
     return;
   }
 
-  if(_storage->addUser(username, password).isValid()) {
+  if(_configured && _storage->addUser(username, password).isValid()) {
     out << "Added user " << username << " successfully!" << endl;
   } else {
     qWarning() << "Unable to add user:" << qPrintable(username);
@@ -902,8 +914,8 @@ void Core::changeUserPass(const QString &username) {
     return;
   }
 
-  if(_storage->updateUser(userId, password)) {
-    out << "Password changed successfuly!" << endl;
+  if(_configured && _storage->updateUser(userId, password)) {
+    out << "Password changed successfully!" << endl;
   } else {
     qWarning() << "Failed to change password!";
   }