From 4f3f67d23f82dc95c176cc6b19898435c899a368 Mon Sep 17 00:00:00 2001 From: ozzay Date: Mon, 18 Aug 2014 13:10:26 +0200 Subject: [PATCH] Allow repeated calling of Config::activate --- lib/config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/config.cpp b/lib/config.cpp index 6500f524..debc51c8 100644 --- a/lib/config.cpp +++ b/lib/config.cpp @@ -419,6 +419,7 @@ int Util::Config::serveForkedSocket(int (*callback)(Socket::Connection & S)) { void Util::Config::activate() { if (vals.isMember("username")) { setUser(getString("username")); + vals.removeMember("username"); } if (vals.isMember("daemonize") && getBool("daemonize")) { if (vals.isMember("logfile") && getString("logfile") != "") { @@ -426,6 +427,7 @@ void Util::Config::activate() { } else { Daemonize(false); } + vals.removeMember("daemonize"); } struct sigaction new_action; struct sigaction cur_action;