From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 9 Dec 2021 22:59:04 +0000 (-0600)
Subject: datasets: initialize after dropping privileges
X-Git-Tag: suricata-6.0.5~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a349bb0359836348524468391faa2dbfbf0c018;p=thirdparty%2Fsuricata.git

datasets: initialize after dropping privileges

Move initialization of datasets to a point after privileges
have been dropped.

Ticket 4239

(cherry picked from commit 92eb14c5adc985433dd44bdcac18fa6e67440043)
---

diff --git a/src/suricata.c b/src/suricata.c
index 80aae67c2d..88ecc1ae43 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2012,8 +2012,6 @@ static int InitSignalHandler(SCInstance *suri)
  * Will be run once per pcap in unix-socket mode */
 void PreRunInit(const int runmode)
 {
-    /* Initialize Datasets to be able to use them with unix socket */
-    DatasetsInit();
     if (runmode == RUNMODE_UNIX_SOCKET)
         return;
 
@@ -2040,6 +2038,7 @@ void PreRunPostPrivsDropInit(const int runmode)
 {
     StatsSetupPostConfigPreOutput();
     RunModeInitializeOutputs();
+    DatasetsInit();
 
     if (runmode == RUNMODE_UNIX_SOCKET) {
         /* As the above did some necessary startup initialization, it