1 files changed, 4 insertions, 1 deletions
diff --git a/syslogd.c b/syslogd.c
index 2c05b0cc..6164d25a 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -7913,6 +7913,9 @@ static void init()
 		/* Reflect the deletion of the Files linked list. */
 		Files = NULL;
 	}
+
+	dprintf("Clearing templates.\n");
+	tplDeleteNew();
 	
 	f = NULL;
 	nextp = NULL;
@@ -10233,7 +10236,7 @@ int main(int argc, char **argv)
 	pTmp = template_StdUsrMsgFmt;
 	tplAddLine(" StdUsrMsgFmt", &pTmp);
 	pTmp = template_StdDBFmt;
-	tplAddLine(" StdDBFmt", &pTmp);
+	tplLastStaticInit(tplAddLine(" StdDBFmt", &pTmp));
 
 	/* prepare emergency logging system */