15c15
< static char id[] = "@(#)$Id: deliver.c,v 8.600.2.1.2.81 2001/05/23 02:15:42 ca Exp $";
---
> static char id[] = "@(#)$Id: deliver.c,v 8.600.2.1.2.86 2001/07/20 21:52:55 gshapiro Exp $";
1929a1930,1932
> /* clear the events to turn off SIGALRMs */
> clear_events();
>
1939c1942,1943
< (void) setsignal(SIGINT, SIG_IGN);
---
> (void) setsignal(SIGALRM, sm_signal_noop);
> (void) setsignal(SIGCHLD, SIG_DFL);
1940a1945
> (void) setsignal(SIGINT, SIG_IGN);
1941a1947,1949
> # ifdef SIGUSR1
> (void) setsignal(SIGUSR1, sm_signal_noop);
> # endif /* SIGUSR1 */
2073a2082
> {
2074a2084,2094
>
> /*
> ** Undo the effects of the uid change in main
> ** for signal handling. The real uid may
> ** be used by mailer in adding a "From "
> ** line.
> */
>
> if (RealUid != 0 && RealUid != getuid())
> new_ruid = RealUid;
> }
2093a2114,2129
> # if HASSETREUID
> /*
> ** Undo the effects of the uid change in main
> ** for signal handling. The real uid may
> ** be used by mailer in adding a "From "
> ** line.
> */
>
> if (new_ruid != NO_UID &&
> setreuid(RealUid, geteuid()) < 0)
> {
> syserr("openmailer: setreuid(%d, %d) failed",
> (int) new_ruid, (int) geteuid());
> exit(EX_OSERR);
> }
> # endif /* HASSETREUID */
3048c3084
< ** pid -- pid of mailer.
---
> ** mci -- the mailer connection info.
4927a4964
> int save_errno;
4930a4968
> save_errno = errno;
4932c4970
< mci->mci_errno = errno;
---
> mci->mci_errno = save_errno;