mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 14:25:15 +00:00
Code Issues Releases Wiki Activity

Don't wait for child to finish in log_error(), let the signal handler

Browse Source 
get it if we are still running, else let init reap it for us.  The extra
time it takes to wait lets the user know that mail is being sent.

Install SIGCHLD handler in main() and for POSIX signals, block everything
*except* SIGCHLD.
This commit is contained in:
Todd C. Miller
1999-08-19 17:45:36 +00:00
parent 0598093e2c
commit b9746389ce
2 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
logging.c
View File

@@ -407,12 +407,6 @@ log_error(va_alist)
free(logline);
if (message != logline);
free(message);
/* Wait for mail to finish sending and exit. */
if (!(flags & NO_EXIT)) {
reapchild(0);
exit(1);
}
}
#ifdef _PATH_SENDMAIL
@@ -424,32 +418,14 @@ send_mail(line)
char *p;
int pfd[2], pid;
time_t now;
#ifdef POSIX_SIGNALS
struct sigaction sa;
(void) memset((VOID *)&sa, 0, sizeof(sa));
#endif /* POSIX_SIGNALS */
/* Catch children as they die... */
#ifdef POSIX_SIGNALS
sa.sa_handler = reapchild;
(void) sigaction(SIGCHLD, &sa, NULL);
#else
(void) signal(SIGCHLD, reapchild);
#endif /* POSIX_SIGNALS */
if ((pid = fork()) > 0) { /* Child. */
/* We do an explicit wait() later on... */
#ifdef POSIX_SIGNALS
sa.sa_handler = SIG_DFL;
(void) sigaction(SIGCHLD, &sa, NULL);
#else
(void) signal(SIGCHLD, SIG_DFL);
#endif /* POSIX_SIGNALS */
(void) signal(SIGCHLD, SIG_IGN);
if (pipe(pfd) == -1) {
(void) fprintf(stderr, "%s: cannot open pipe failed: %s\n",
(void) fprintf(stderr, "%s: cannot open pipe: %s\n",
Argv[0], strerror(errno));
exit(1);
}
@@ -468,8 +444,9 @@ send_mail(line)
(void) close(pfd[1]);
(void) dup2(pfd[0], STDIN_FILENO);
(void) close(pfd[0]);
/* Run sendmail as invoking user, not root. */
set_perms(PERM_FULL_USER, 0);
/* Run sendmail as root so user cannot kill it. */
set_perms(PERM_ROOT, 0);
execl(_PATH_SENDMAIL, "sendmail", "-t", NULL);
_exit(127);
break;
@@ -479,7 +456,8 @@ send_mail(line)
(void) close(pfd[0]);
/* Pipes are all setup, send message via sendmail. */
(void) fprintf(mail, "To: %s\nSubject: ", ALERTMAIL);
(void) fprintf(mail, "To: %s\nFrom: %s\nSubject: ", ALERTMAIL,
user_name);
for (p = MAILSUBJECT; *p; p++) {
/* Expand escapes in the subject */
if (*p == '%' && *(p+1) != '%') {