| recipient.c (73188) | recipient.c (77349) |
|---|---|
| 1/* 2 * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set 9 * forth in the LICENSE file which can be found at the top level of 10 * the sendmail distribution. 11 * 12 */ 13 14#ifndef lint | 1/* 2 * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set 9 * forth in the LICENSE file which can be found at the top level of 10 * the sendmail distribution. 11 * 12 */ 13 14#ifndef lint |
| 15static char id[] = "@(#)$Id: recipient.c,v 8.231.14.10 2001/02/14 04:07:30 gshapiro Exp $"; | 15static char id[] = "@(#)$Id: recipient.c,v 8.231.14.11 2001/05/03 17:24:14 gshapiro Exp $"; |
| 16#endif /* ! lint */ 17 18#include <sendmail.h> 19 20 21static void includetimeout __P((void)); 22static ADDRESS *self_reference __P((ADDRESS *)); 23 --- 156 unchanged lines hidden (view full) --- 180 181 al = a->q_next; 182 a = recipient(a, sendq, aliaslevel, e); 183 naddrs++; 184 } 185 186 e->e_to = oldto; 187 if (bufp != buf) | 16#endif /* ! lint */ 17 18#include <sendmail.h> 19 20 21static void includetimeout __P((void)); 22static ADDRESS *self_reference __P((ADDRESS *)); 23 --- 156 unchanged lines hidden (view full) --- 180 181 al = a->q_next; 182 a = recipient(a, sendq, aliaslevel, e); 183 naddrs++; 184 } 185 186 e->e_to = oldto; 187 if (bufp != buf) |
| 188 free(bufp); | 188 sm_free(bufp); |
| 189#if _FFR_ADDR_TYPE 190 define(macid("{addr_type}", NULL), NULL, e); 191#endif /* _FFR_ADDR_TYPE */ 192 return naddrs; 193} 194 /* 195** REMOVEFROMLIST -- Remove addresses from a send list. 196** --- 91 unchanged lines hidden (view full) --- 288 naddrs++; 289 break; 290 } 291 } 292 } 293 294 e->e_to = oldto; 295 if (bufp != buf) | 189#if _FFR_ADDR_TYPE 190 define(macid("{addr_type}", NULL), NULL, e); 191#endif /* _FFR_ADDR_TYPE */ 192 return naddrs; 193} 194 /* 195** REMOVEFROMLIST -- Remove addresses from a send list. 196** --- 91 unchanged lines hidden (view full) --- 288 naddrs++; 289 break; 290 } 291 } 292 } 293 294 e->e_to = oldto; 295 if (bufp != buf) |
| 296 free(bufp); | 296 sm_free(bufp); |
| 297#if _FFR_ADDR_TYPE 298 define(macid("{addr_type}", NULL), NULL, e); 299#endif /* _FFR_ADDR_TYPE */ 300 return naddrs; 301} 302 /* 303** RECIPIENT -- Designate a message recipient 304** --- 470 unchanged lines hidden (view full) --- 775 usrerrenh(a->q_status, 776 "554 aliasing/forwarding loop broken"); 777 } 778 } 779 780 done: 781 a->q_flags |= QTHISPASS; 782 if (buf != buf0) | 297#if _FFR_ADDR_TYPE 298 define(macid("{addr_type}", NULL), NULL, e); 299#endif /* _FFR_ADDR_TYPE */ 300 return naddrs; 301} 302 /* 303** RECIPIENT -- Designate a message recipient 304** --- 470 unchanged lines hidden (view full) --- 775 usrerrenh(a->q_status, 776 "554 aliasing/forwarding loop broken"); 777 } 778 } 779 780 done: 781 a->q_flags |= QTHISPASS; 782 if (buf != buf0) |
| 783 free(buf); | 783 sm_free(buf); |
| 784 785 /* 786 ** If we are at the top level, check to see if this has 787 ** expanded to exactly one address. If so, it can inherit 788 ** the primaryness of the address. 789 ** 790 ** While we're at it, clear the QTHISPASS bits. 791 */ --- 776 unchanged lines hidden (view full) --- 1568 LineNumber = oldlinenumber; 1569 e->e_to = oldto; 1570 return rval; 1571} 1572 1573static void 1574includetimeout() 1575{ | 784 785 /* 786 ** If we are at the top level, check to see if this has 787 ** expanded to exactly one address. If so, it can inherit 788 ** the primaryness of the address. 789 ** 790 ** While we're at it, clear the QTHISPASS bits. 791 */ --- 776 unchanged lines hidden (view full) --- 1568 LineNumber = oldlinenumber; 1569 e->e_to = oldto; 1570 return rval; 1571} 1572 1573static void 1574includetimeout() 1575{ |
| 1576 /* 1577 ** NOTE: THIS CAN BE CALLED FROM A SIGNAL HANDLER. DO NOT ADD 1578 ** ANYTHING TO THIS ROUTINE UNLESS YOU KNOW WHAT YOU ARE 1579 ** DOING. 1580 */ 1581 1582 errno = ETIMEDOUT; |
|
| 1576 longjmp(CtxIncludeTimeout, 1); 1577} 1578 /* 1579** SENDTOARGV -- send to an argument vector. 1580** 1581** Parameters: 1582** argv -- argument vector to send to. 1583** e -- the current envelope. --- 151 unchanged lines hidden --- | 1583 longjmp(CtxIncludeTimeout, 1); 1584} 1585 /* 1586** SENDTOARGV -- send to an argument vector. 1587** 1588** Parameters: 1589** argv -- argument vector to send to. 1590** e -- the current envelope. --- 151 unchanged lines hidden --- |