diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-03-21 23:27:06 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-03-22 20:13:39 +0000 |
| commit | 32393657bff79d9925ec865aebb066c9409c4e27 (patch) | |
| tree | 0131bc0866098389d6a2739e6f3a1ed000eadbde /src | |
| parent | eb24befc3e9ad0a36ef8f0bc3527a9bc6c923a7b (diff) | |
pass through exec
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/child.c | 5 | ||||
| -rw-r--r-- | src/src/deliver.c | 8 | ||||
| -rw-r--r-- | src/src/exim.c | 8 | ||||
| -rw-r--r-- | src/src/rda.c | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/src/src/child.c b/src/src/child.c index 3aa696221..ba7e899d2 100644 --- a/src/src/child.c +++ b/src/src/child.c @@ -109,6 +109,11 @@ if (!minimal) if (debug_selector != 0) argv[n++] = string_sprintf("-d=0x%x", debug_selector); } + DEBUG(D_any) + { + argv[n++] = US"-MCd"; + argv[n++] = US process_purpose; + } if (!f.testsuite_delays) argv[n++] = US"-odd"; if (f.dont_deliver) argv[n++] = US"-N"; if (f.queue_smtp) argv[n++] = US"-odqs"; diff --git a/src/src/deliver.c b/src/src/deliver.c index 88fe2f9bf..497b3c806 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -2268,7 +2268,7 @@ a clean slate and doesn't interfere with the parent process. */ search_tidyup(); -if ((pid = exim_fork(US"delivery (local)")) == 0) +if ((pid = exim_fork(US"delivery-local")) == 0) { BOOL replicate = TRUE; @@ -2615,7 +2615,7 @@ if (addr->special_action == SPECIAL_WARN && addr->transport->warn_message) "message for %s transport): %s", addr->transport->warn_message, addr->transport->name, expand_string_message); - else if ((pid = child_open_exim(&fd, US"warning message")) > 0) + else if ((pid = child_open_exim(&fd, US"tpt-warning-message")) > 0) { FILE *f = fdopen(fd, "wb"); if (errors_reply_to && !contains_header(US"Reply-To", warn_message)) @@ -7537,7 +7537,7 @@ while (addr_failed) /* Make a subprocess to send a message */ - if ((pid = child_open_exim(&fd, US"bounce message")) < 0) + if ((pid = child_open_exim(&fd, US"bounce-message")) < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Process %d (parent %d) failed to " "create child process to send failure message: %s", getpid(), getppid(), strerror(errno)); @@ -8191,7 +8191,7 @@ else if (addr_defer != (address_item *)(+1)) { header_line *h; int fd; - pid_t pid = child_open_exim(&fd, US"delay-warning message"); + pid_t pid = child_open_exim(&fd, US"delay-warning-message"); if (pid > 0) { diff --git a/src/src/exim.c b/src/src/exim.c index ae958af1c..2ac0720ca 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -2760,6 +2760,12 @@ for (i = 1; i < argc; i++) case 'D': smtp_peer_options |= OPTION_DSN; break; + /* -MCd: for debug, set a process-purpose string */ + + case 'd': if (++i < argc) process_purpose = argv[i]; + else badarg = TRUE; + break; + /* -MCG: set the queue name, to a non-default value */ case 'G': if (++i < argc) queue_name = string_copy(argv[i]); @@ -5695,7 +5701,7 @@ while (more) pid_t pid; search_tidyup(); - if ((pid = exim_fork(US"local-accept delivery")) == 0) + if ((pid = exim_fork(US"local-accept-delivery")) == 0) { int rc; close_unwanted(); /* Close unwanted file descriptors and TLS */ diff --git a/src/src/rda.c b/src/src/rda.c index 85791c2f7..498a06168 100644 --- a/src/src/rda.c +++ b/src/src/rda.c @@ -615,7 +615,7 @@ with the parent process. */ oldsignal = signal(SIGCHLD, SIG_DFL); search_tidyup(); -if ((pid = exim_fork(US"router interpret")) == 0) +if ((pid = exim_fork(US"router-interpret")) == 0) { header_line *waslast = header_last; /* Save last header */ |