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

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 3b1a9e53..6dc4fa70 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -41,11 +41,10 @@
 #  include <termios.h>
 #endif /* Q_OS_WIN32 */
 
-// umask
-#ifndef Q_OS_WIN32
+#ifdef HAVE_UMASK
 #  include <sys/types.h>
 #  include <sys/stat.h>
-#endif /* Q_OS_WIN32 */
+#endif /* HAVE_UMASK */
 
 // ==============================
 //  Custom Events
@@ -80,9 +79,9 @@ void Core::destroy() {
 Core::Core()
   : _storage(0)
 {
-#ifndef Q_OS_WIN32
+#ifdef HAVE_UMASK
   umask(S_IRWXG | S_IRWXO);
-#endif /* Q_OS_WIN32 */
+#endif
   _startTime = QDateTime::currentDateTime().toUTC();  // for uptime :)
 
   Quassel::loadTranslation(QLocale::system());
@@ -202,7 +201,8 @@ void Core::init() {
   connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
   if(!startListening()) exit(1); // TODO make this less brutal
 
-  _oidentdConfigGenerator = new OidentdConfigGenerator(this);
+  if(Quassel::isOptionSet("oidentd"))
+    _oidentdConfigGenerator = new OidentdConfigGenerator(this);
 }
 
 Core::~Core() {