1 files changed, 6 insertions, 2 deletions
diff --git a/syslogd.c b/syslogd.c
index 70d68df2..5a087839 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3644,8 +3644,6 @@ static void die(int sig)
 	/* de-init some modules */
 	modExitIminternal();
 
-	unregCfSysLineHdlrs(); /* TODO: this needs to go away when the module de-init works */
-
 	/* TODO: this would also be the right place to de-init the builtin output modules. We
 	 * do not currently do that, because the module interface does not allow for
 	 * it. This will come some time later (it's essential with loadable modules).
@@ -3658,6 +3656,12 @@ static void die(int sig)
 	 */
 	modUnloadAndDestructAll();
 
+	/* the following line cleans up CfSysLineHandlers that were not based on loadable
+	 * modules. As such, they are not yet cleared.
+	 */
+	unregCfSysLineHdlrs();
+
+
 	/* clean up auxiliary data */
 	if(pModDir != NULL)
 		free(pModDir);