Enforce pid_file_path start at "/"

(cherry picked from commit 60f2a8e797d9ebaea1e3eac4ad28ff64e11bab40)
(cherry picked from commit 6b3d553c733475a1033c8b7a241e6506d7ed73b1)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index df6efeea31b3d49c2aabd39d55d94b7febcea365..d66dc64d1f54d5f0d1c165869c0335c6666cd91e 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -252,6 +252,8 @@ JH/53 Bug 2743: fix immediate-delivery via named queue.  Previously this would
       fail with a taint-check on the spoolfile name, and leave the message
       queued.
 
+HS/01 Enforce absolute PID file path name.
+
 
 Exim version 4.94
 -----------------

diff --git a/src/src/daemon.c b/src/src/daemon.c
index c9e6f334fd22ab73bf46d41f4381d5431809e98d..0b39fd5559bd3402cd1e780d43554db9a5951769 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -939,6 +939,9 @@ if (override_pid_file_path)
 
 if (!*pid_file_path)
   pid_file_path = string_sprintf("%s/exim-daemon.pid", spool_directory);
+
+if (pid_file_path[0] != '/')
+  log_write(0, LOG_PANIC_DIE, "pid file path %s must be absolute\n", pid_file_path);
 }