Default notifier socket name to spooldir-dependent path even for abstract names

7 files changed, 23 insertions, 2 deletions

diff --git a/test/confs/0621 b/test/confs/0621
index 32d906203..ef3427df9 100644
--- a/test/confs/0621
+++ b/test/confs/0621
@@ -8,6 +8,7 @@
 domainlist local_domains = test.ex
 qualify_domain = test.ex
 queue_only
+notifier_socket = DIR/spool/this_my_notify_socket
 
 log_selector = +millisec
 
diff --git a/test/runtest b/test/runtest
index 994ff9ff8..aeb0d8f53 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1218,8 +1218,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 
     # daemon notifier socket
-    s/^(creating notifier socket) .*$/$1/;
-    s/^(\s*\d+|ppppp) (creating notifier socket) .+$/ppppp $2/;
+    s/^(\s*\d+|ppppp) (creating notifier socket)$/ppppp $2/;
+    s/^ \@(.*exim_daemon_notify)$/ $1/;
+    s/^(\s*\d+|ppppp)  \@(.*exim_daemon_notify)$/ppppp  $2/;
     next if /unlinking notifier socket/;
 
     # DISABLE_OCSP
diff --git a/test/stderr/0433 b/test/stderr/0433
index f9ac402e1..9972ae7d1 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -8,6 +8,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
@@ -28,6 +29,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv4) port 1226
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -49,6 +51,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on 127.0.0.1 port 1228
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv4) port 1226
@@ -71,6 +74,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv4) port 1226
 listening on 127.0.0.1 port 1228
@@ -95,6 +99,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1227
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on 127.0.0.1 port 1228
 listening on all interfaces (IPv4) port 1227
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -118,6 +123,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 local_interfaces overridden by -oX:
   <; 0.0.0.0.1225; 0.0.0.0.1226
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv4) port 1226
 pid written to TESTSUITE/spool/exim-daemon.pid
diff --git a/test/stderr/0438 b/test/stderr/0438
index 4fbd57705..1b39cfddc 100644
--- a/test/stderr/0438
+++ b/test/stderr/0438
@@ -10,6 +10,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
@@ -32,6 +33,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 pid written to TESTSUITE/spool/exim-daemon.anotherpid
 changed uid/gid: running as a daemon
@@ -54,6 +56,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1225
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv4) port 1225
 pid written to TESTSUITE/spool/mypidfile
 changed uid/gid: running as a daemon
diff --git a/test/stderr/0609 b/test/stderr/0609
index b8df9c301..fcae2635e 100644
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -7,6 +7,7 @@ dropping to exim gid; retaining priv uid
 ppppp daemon_smtp_port overridden by -oX:
 ppppp   <: 1225
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN
diff --git a/test/stderr/1007 b/test/stderr/1007
index 8eefcb56c..ebfae6aa1 100644
--- a/test/stderr/1007
+++ b/test/stderr/1007
@@ -8,6 +8,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port 1225
 listening on all interfaces (IPv4) port 1225
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -29,6 +30,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port 1225
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv6) port 1226
@@ -52,6 +54,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port 1225
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv6) port 1226
@@ -76,6 +79,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port 1225
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv6) port 1226
@@ -100,6 +104,7 @@ admin user
 dropping to exim gid; retaining priv uid
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225
 listening on ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1226
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -123,6 +128,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 daemon_smtp_port overridden by -oX:
   <: 1227
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port 1227
 listening on all interfaces (IPv4) port 1227
 listening on 127.0.0.1 port 1228
@@ -149,6 +155,7 @@ daemon_smtp_port overridden by -oX:
 local_interfaces overridden by -oX:
   <; 127.0.0.1
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on 127.0.0.1 port 1227
 listening on 127.0.0.1 port 1225
 pid written to TESTSUITE/spool/exim-daemon.pid
@@ -172,6 +179,7 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 local_interfaces overridden by -oX:
   <; ::0.1225; 0.0.0.0.1225; 0.0.0.0.1226
 creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
 listening on all interfaces (IPv6) port 1225
 listening on all interfaces (IPv4) port 1225
 listening on all interfaces (IPv4) port 1226
diff --git a/test/stderr/2201 b/test/stderr/2201
index 181a27f77..34426ed13 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -194,6 +194,7 @@ dropping to exim gid; retaining priv uid
 ppppp daemon_smtp_port overridden by -oX:
 ppppp   <: 1225
 ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify
 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN