| deliver.c (141858) | deliver.c (147078) |
|---|---|
| 1/* 2 * Copyright (c) 1998-2005 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#include <sendmail.h> 15#include <sys/time.h> 16 | 1/* 2 * Copyright (c) 1998-2005 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#include <sendmail.h> 15#include <sys/time.h> 16 |
| 17SM_RCSID("@(#)$Id: deliver.c,v 8.983 2005/01/07 17:43:22 ca Exp $") | 17SM_RCSID("@(#)$Id: deliver.c,v 8.986 2005/03/05 02:28:50 ca Exp $") |
| 18 19#if HASSETUSERCONTEXT 20# include <login_cap.h> 21#endif /* HASSETUSERCONTEXT */ 22 23#if NETINET || NETINET6 24# include <arpa/inet.h> 25#endif /* NETINET || NETINET6 */ --- 4236 unchanged lines hidden (view full) --- 4262 /* dsn */ 4263 if (dsn != NULL && *dsn != '\0') 4264 { 4265 (void) sm_strlcpyn(bp, SPACELEFT(buf, bp), 2, ", dsn=", 4266 shortenstring(dsn, ENHSCLEN)); 4267 bp += strlen(bp); 4268 } 4269 | 18 19#if HASSETUSERCONTEXT 20# include <login_cap.h> 21#endif /* HASSETUSERCONTEXT */ 22 23#if NETINET || NETINET6 24# include <arpa/inet.h> 25#endif /* NETINET || NETINET6 */ --- 4236 unchanged lines hidden (view full) --- 4262 /* dsn */ 4263 if (dsn != NULL && *dsn != '\0') 4264 { 4265 (void) sm_strlcpyn(bp, SPACELEFT(buf, bp), 2, ", dsn=", 4266 shortenstring(dsn, ENHSCLEN)); 4267 bp += strlen(bp); 4268 } 4269 |
| 4270#if _FFR_LOG_NTRIES 4271 /* ntries */ 4272 if (e->e_ntries >= 0) 4273 { 4274 (void) sm_snprintf(bp, SPACELEFT(buf, bp), 4275 ", ntries=%d", e->e_ntries + 1); 4276 bp += strlen(bp); 4277 } 4278#endif /* _FFR_LOG_NTRIES */ 4279 |
|
| 4270# define STATLEN (((SYSLOG_BUFSIZE) - 100) / 4) 4271# if (STATLEN) < 63 4272# undef STATLEN 4273# define STATLEN 63 4274# endif /* (STATLEN) < 63 */ 4275# if (STATLEN) > 203 4276# undef STATLEN 4277# define STATLEN 203 --- 1390 unchanged lines hidden (view full) --- 5668 ** If local delivery (and not remote), just return a constant. 5669 */ 5670 5671 if (bitnset(M_LOCALMAILER, m->m_flags) && 5672 strcmp(m->m_mailer, "[IPC]") != 0 && 5673 !(m->m_argv[0] != NULL && strcmp(m->m_argv[0], "TCP") == 0)) 5674 return "localhost"; 5675 | 4280# define STATLEN (((SYSLOG_BUFSIZE) - 100) / 4) 4281# if (STATLEN) < 63 4282# undef STATLEN 4283# define STATLEN 63 4284# endif /* (STATLEN) < 63 */ 4285# if (STATLEN) > 203 4286# undef STATLEN 4287# define STATLEN 203 --- 1390 unchanged lines hidden (view full) --- 5678 ** If local delivery (and not remote), just return a constant. 5679 */ 5680 5681 if (bitnset(M_LOCALMAILER, m->m_flags) && 5682 strcmp(m->m_mailer, "[IPC]") != 0 && 5683 !(m->m_argv[0] != NULL && strcmp(m->m_argv[0], "TCP") == 0)) 5684 return "localhost"; 5685 |
| 5686 /* an empty host does not have MX records */ 5687 if (*host == '\0') 5688 return "_empty_"; 5689 |
|
| 5676 /* 5677 ** Check to see if this uses IPC -- if not, it can't have MX records. 5678 */ 5679 5680 if (strcmp(m->m_mailer, "[IPC]") != 0 || 5681 CurEnv->e_sendmode == SM_DEFER) 5682 { 5683 /* just an ordinary mailer or deferred mode */ --- 584 unchanged lines hidden --- | 5690 /* 5691 ** Check to see if this uses IPC -- if not, it can't have MX records. 5692 */ 5693 5694 if (strcmp(m->m_mailer, "[IPC]") != 0 || 5695 CurEnv->e_sendmode == SM_DEFER) 5696 { 5697 /* just an ordinary mailer or deferred mode */ --- 584 unchanged lines hidden --- |