daemons: dropping privileges AFTER pid file creation

bareos · Sep 22, 2021 · c43af60 · c43af60
1 parent 57abb93
commit c43af60
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/core/src/dird/dird.cc b/core/src/dird/dird.cc
@@ -316,11 +316,6 @@ int main(int argc, char* argv[])
   }
   if (argc) { usage(); }
 
-  // See if we want to drop privs.
-  if (geteuid() == 0) {
-    drop(uid, gid, false); /* reduce privileges if requested */
-  }
-
   if (export_config_schema) {
     PoolMem buffer;
 
@@ -359,6 +354,11 @@ int main(int argc, char* argv[])
     }
   }
 
+  // See if we want to drop privs.
+  if (geteuid() == 0) {
+    drop(uid, gid, false); /* reduce privileges if requested */
+  }
+
   if (InitCrypto() != 0) {
     Jmsg((JobControlRecord*)nullptr, M_ERROR_TERM, 0,
          _("Cryptography library initialization failed.\n"));

diff --git a/core/src/filed/filed.cc b/core/src/filed/filed.cc
@@ -201,9 +201,6 @@ int main(int argc, char* argv[])
     Emsg0(M_ERROR_TERM, 0, _("-k option has no meaning without -u option.\n"));
   }
 
-  // See if we want to drop privs.
-  if (geteuid() == 0) { drop(uid, gid, keep_readall_caps); }
-
   if (!no_signals) {
     InitSignals(TerminateFiled);
   } else {
@@ -246,6 +243,9 @@ int main(int argc, char* argv[])
     InitStackDump(); /* set new pid */
   }
 
+  // See if we want to drop privs.
+  if (geteuid() == 0) { drop(uid, gid, keep_readall_caps); }
+
   if (InitCrypto() != 0) {
     Emsg0(M_ERROR, 0, _("Cryptography library initialization failed.\n"));
     TerminateFiled(1);

diff --git a/core/src/stored/stored.cc b/core/src/stored/stored.cc
@@ -232,9 +232,6 @@ int main(int argc, char* argv[])
   }
   if (argc) { usage(); }
 
-  // See if we want to drop privs.
-  if (geteuid() == 0) { drop(uid, gid, false); }
-
   if (export_config_schema) {
     PoolMem buffer;
 
@@ -276,6 +273,9 @@ int main(int argc, char* argv[])
     InitStackDump(); /* pick up new pid */
   }
 
+  // See if we want to drop privs.
+  if (geteuid() == 0) { drop(uid, gid, false); }
+
   if (InitCrypto() != 0) {
     Jmsg((JobControlRecord*)nullptr, M_ERROR_TERM, 0,
          _("Cryptography library initialization failed.\n"));