X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=2b4b6a3edf5bfd94df516da8253e0a45bc46b22e;hb=fdfd62334f728bd05470c5191194d55027fec86e;hp=2a2e5ebede777471b5f7f589c94c829c3f8732e6;hpb=03eb5a574ec55546c62336428c7a9caa63b45a7a;p=quassel.git

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 2a2e5ebe..2b4b6a3e 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -169,8 +169,6 @@ Core::Core()
 }
 
 void Core::init() {
-  _oidentdConfigGenerator = new OidentdConfigGenerator();
-
   CoreSettings cs;
   _configured = initStorage(cs.storageSettings().toMap());
 
@@ -203,6 +201,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() {