X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d5c0d8c9374623620844d539d4810da63e9abca1..568092148bf6ade68174fa1ccf34b8c37d9064e9:/src/src/child.c diff --git a/src/src/child.c b/src/src/child.c index de12c44b5..13d177c19 100644 --- a/src/src/child.c +++ b/src/src/child.c @@ -73,8 +73,9 @@ child_exec_exim(int exec_type, BOOL kill_v, int *pcount, BOOL minimal, int first_special = -1; int n = 0; int extra = pcount ? *pcount : 0; -uschar **argv = - store_get((extra + acount + MAX_CLMACROS + 18) * sizeof(char *)); +uschar **argv; + +argv = store_get((extra + acount + MAX_CLMACROS + 19) * sizeof(char *), FALSE); /* In all case, the list starts out with the path, any macros, and a changed config file. */ @@ -85,7 +86,7 @@ if (clmacro_count > 0) memcpy(argv + n, clmacros, clmacro_count * sizeof(uschar *)); n += clmacro_count; } -if (config_changed) +if (f.config_changed) { argv[n++] = US"-C"; argv[n++] = config_main_filename; @@ -108,9 +109,10 @@ if (!minimal) if (debug_selector != 0) argv[n++] = string_sprintf("-d=0x%x", debug_selector); } - if (dont_deliver) argv[n++] = US"-N"; - if (queue_smtp) argv[n++] = US"-odqs"; - if (synchronous_delivery) argv[n++] = US"-odi"; + if (!f.testsuite_delays) argv[n++] = US"-odd"; + if (f.dont_deliver) argv[n++] = US"-N"; + if (f.queue_smtp) argv[n++] = US"-odqs"; + if (f.synchronous_delivery) argv[n++] = US"-odi"; if (connection_max_messages >= 0) argv[n++] = string_sprintf("-oB%d", connection_max_messages); if (*queue_name) @@ -183,13 +185,15 @@ to exist, even if all calls from within Exim are changed, because it is documented for use from local_scan(). Argument: fdptr pointer to int for the stdin fd + purpose of the child process, for debug Returns: pid of the created process or -1 if anything has gone wrong */ pid_t -child_open_exim(int *fdptr) +child_open_exim_function(int * fdptr, const uschar * purpose) { -return child_open_exim2(fdptr, US"<>", bounce_sender_authentication); +return child_open_exim2_function(fdptr, US"<>", bounce_sender_authentication, + purpose); } @@ -200,12 +204,14 @@ Arguments: fdptr pointer to int for the stdin fd sender for a sender address (data for -f) sender_authentication authenticated sender address or NULL + purpose of the child process, for debug Returns: pid of the created process or -1 if anything has gone wrong */ pid_t -child_open_exim2(int *fdptr, uschar *sender, uschar *sender_authentication) +child_open_exim2_function(int * fdptr, uschar * sender, + uschar * sender_authentication, const uschar * purpose) { int pfd[2]; int save_errno; @@ -218,7 +224,7 @@ on the wait. */ if (pipe(pfd) != 0) return (pid_t)(-1); oldsignal = signal(SIGCHLD, SIG_DFL); -pid = fork(); +pid = exim_fork(purpose); /* Child process: make the reading end of the pipe into the standard input and close the writing end. If debugging, pass debug_fd as stderr. Then re-exec @@ -232,9 +238,9 @@ if (pid == 0) force_fd(pfd[pipe_read], 0); (void)close(pfd[pipe_write]); if (debug_fd > 0) force_fd(debug_fd, 2); - if (running_in_test_harness && !queue_only) + if (f.running_in_test_harness && !queue_only) { - if (sender_authentication != NULL) + if (sender_authentication) child_exec_exim(CEE_EXEC_EXIT, FALSE, NULL, FALSE, 9, US "-odi", US"-t", US"-oem", US"-oi", US"-f", sender, US"-oMas", sender_authentication, message_id_option); @@ -246,7 +252,7 @@ if (pid == 0) } else /* Not test harness */ { - if (sender_authentication != NULL) + if (sender_authentication) child_exec_exim(CEE_EXEC_EXIT, FALSE, NULL, FALSE, 8, US"-t", US"-oem", US"-oi", US"-f", sender, US"-oMas", sender_authentication, message_id_option); @@ -335,7 +341,7 @@ that the child process can be waited for. We sometimes get here with it set otherwise. Save the old state for resetting on the wait. */ oldsignal = signal(SIGCHLD, SIG_DFL); -pid = fork(); +pid = exim_fork(US"child-open"); /* Handle the child process. First, set the required environment. We must do this before messing with the pipes, in order to be able to write debugging @@ -346,14 +352,14 @@ if (pid == 0) signal(SIGUSR1, SIG_IGN); signal(SIGPIPE, SIG_DFL); - if (newgid != NULL && setgid(*newgid) < 0) + if (newgid && setgid(*newgid) < 0) { DEBUG(D_any) debug_printf("failed to set gid=%ld in subprocess: %s\n", (long int)(*newgid), strerror(errno)); goto CHILD_FAILED; } - if (newuid != NULL && setuid(*newuid) < 0) + if (newuid && setuid(*newuid) < 0) { DEBUG(D_any) debug_printf("failed to set uid=%ld in subprocess: %s\n", (long int)(*newuid), strerror(errno)); @@ -362,7 +368,7 @@ if (pid == 0) (void)umask(newumask); - if (wd != NULL && Uchdir(wd) < 0) + if (wd && Uchdir(wd) < 0) { DEBUG(D_any) debug_printf("failed to chdir to %s: %s\n", wd, strerror(errno)); @@ -392,8 +398,8 @@ if (pid == 0) /* Now do the exec */ - if (envp == NULL) execv(CS argv[0], (char *const *)argv); - else execve(CS argv[0], (char *const *)argv, (char *const *)envp); + if (envp) execve(CS argv[0], (char *const *)argv, (char *const *)envp); + else execv(CS argv[0], (char *const *)argv); /* Failed to execv. Signal this failure using EX_EXECFAILED. We are losing the actual errno we got back, because there is no way to return @@ -490,7 +496,7 @@ int yield; if (timeout > 0) { sigalrm_seen = FALSE; - alarm(timeout); + ALARM(timeout); } for(;;) @@ -500,18 +506,23 @@ for(;;) if (rc == pid) { int lowbyte = status & 255; - if (lowbyte == 0) yield = (status >> 8) & 255; - else yield = -lowbyte; + yield = lowbyte == 0 ? (status >> 8) & 255 : -lowbyte; break; } if (rc < 0) { - yield = (errno == EINTR && sigalrm_seen)? -256 : -257; + /* This "shouldn't happen" test does happen on MacOS: for some reason + I do not understand we seems to get an alarm signal despite not having + an active alarm set. There seems to be only one, so just go round again. */ + + if (errno == EINTR && sigalrm_seen && timeout <= 0) continue; + + yield = (errno == EINTR && sigalrm_seen) ? -256 : -257; break; } } -if (timeout > 0) alarm(0); +if (timeout > 0) ALARM_CLR(0); signal(SIGCHLD, oldsignal); /* restore */ return yield;