isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix boolean thinko in SIGCHLD reaper and call reapchild after sending

Browse Source 
mail instead of doing a conditional sudo_waitpid.
This commit is contained in:
Todd C. Miller
2003-03-20 02:04:32 +00:00
parent 2897c23e9e
commit a7d746af2d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logging.c
View File

@@ -547,10 +547,8 @@ send_mail(line)
get_timestr(), user_name, line); get_timestr(), user_name, line);
fclose(mail); fclose(mail);
/* If mailer is done, wait for it now. If not reapchild will get it. */ /* If mailer is done, wait for it now. If not, we'll get it later. */
#ifdef sudo_waitpid reapchild(SIGCHLD);
(void) sudo_waitpid(pid, &status, WNOHANG);
#endif
(void) sigprocmask(SIG_SETMASK, &oset, NULL); (void) sigprocmask(SIG_SETMASK, &oset, NULL);
} }
@@ -592,7 +590,7 @@ reapchild(sig)
int status, serrno = errno; int status, serrno = errno;
#ifdef sudo_waitpid #ifdef sudo_waitpid
while (sudo_waitpid(-1, &status, WNOHANG) != -1 && errno == EINTR) while (sudo_waitpid(-1, &status, WNOHANG) != -1 || errno == EINTR)
; ;
#else #else
(void) wait(&status); (void) wait(&status);