diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:08:52 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2001-05-28 17:08:52 +0000 |
commit | 5338b6ff5f88e435da457fd0ec979a333012a0ef (patch) | |
tree | a5a76aa374529c5644a8991fe62c81f6b9b89964 /contrib/sendmail/src/recipient.c | |
parent | 8d82727087db5182be90a20f20175cc720c5d1e5 (diff) | |
download | FreeBSD-src-5338b6ff5f88e435da457fd0ec979a333012a0ef.zip FreeBSD-src-5338b6ff5f88e435da457fd0ec979a333012a0ef.tar.gz |
Import sendmail 8.11.4
Diffstat (limited to 'contrib/sendmail/src/recipient.c')
-rw-r--r-- | contrib/sendmail/src/recipient.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/contrib/sendmail/src/recipient.c b/contrib/sendmail/src/recipient.c index 258e7e2..bfed632 100644 --- a/contrib/sendmail/src/recipient.c +++ b/contrib/sendmail/src/recipient.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: recipient.c,v 8.231.14.10 2001/02/14 04:07:30 gshapiro Exp $"; +static char id[] = "@(#)$Id: recipient.c,v 8.231.14.11 2001/05/03 17:24:14 gshapiro Exp $"; #endif /* ! lint */ #include <sendmail.h> @@ -185,7 +185,7 @@ sendtolist(list, ctladdr, sendq, aliaslevel, e) e->e_to = oldto; if (bufp != buf) - free(bufp); + sm_free(bufp); #if _FFR_ADDR_TYPE define(macid("{addr_type}", NULL), NULL, e); #endif /* _FFR_ADDR_TYPE */ @@ -293,7 +293,7 @@ removefromlist(list, sendq, e) e->e_to = oldto; if (bufp != buf) - free(bufp); + sm_free(bufp); #if _FFR_ADDR_TYPE define(macid("{addr_type}", NULL), NULL, e); #endif /* _FFR_ADDR_TYPE */ @@ -780,7 +780,7 @@ recipient(a, sendq, aliaslevel, e) done: a->q_flags |= QTHISPASS; if (buf != buf0) - free(buf); + sm_free(buf); /* ** If we are at the top level, check to see if this has @@ -1573,6 +1573,13 @@ resetuid: static void includetimeout() { + /* + ** NOTE: THIS CAN BE CALLED FROM A SIGNAL HANDLER. DO NOT ADD + ** ANYTHING TO THIS ROUTINE UNLESS YOU KNOW WHAT YOU ARE + ** DOING. + */ + + errno = ETIMEDOUT; longjmp(CtxIncludeTimeout, 1); } /* |