diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-04-10 03:06:22 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-04-10 03:06:22 +0000 |
| commit | 578318b6bee516e4795c90286b6ec5f1073e7a5c (patch) | |
| tree | 73c310541f9ecfc39bc83a7e063bcc1d8c8488fc /contrib/sendmail/src/mci.c | |
| parent | 58b10b6d328856d8c7b58fc71624a9c8e9021a61 (diff) | |
| download | FreeBSD-src-578318b6bee516e4795c90286b6ec5f1073e7a5c.zip FreeBSD-src-578318b6bee516e4795c90286b6ec5f1073e7a5c.tar.gz | |
Fix conflicts from sendmail 8.12.3 import
Diffstat (limited to 'contrib/sendmail/src/mci.c')
| -rw-r--r-- | contrib/sendmail/src/mci.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index f6c2523..d248ed6 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -15,7 +15,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.202 2001/11/05 22:12:17 ca Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.204 2002/02/22 18:24:57 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -159,7 +159,7 @@ mci_scan(savemci) bestmci = &MciCache[i]; continue; } - if ((mci->mci_lastuse + MciCacheTimeout < now || + if ((mci->mci_lastuse + MciCacheTimeout <= now || (mci->mci_mailer != NULL && mci->mci_mailer->m_maxdeliveries > 0 && mci->mci_deliveries + 1 >= mci->mci_mailer->m_maxdeliveries))&& @@ -390,7 +390,7 @@ mci_get(host, m) time_t now = curtime(); /* if this info is stale, ignore it */ - if (now > mci->mci_lastuse + MciInfoTimeout) + if (mci->mci_lastuse + MciInfoTimeout <= now) { mci->mci_lastuse = now; mci->mci_errno = 0; @@ -512,7 +512,6 @@ static struct mcifbits MciFlags[] = { MCIF_SIZE, "SIZE" }, { MCIF_8BITMIME, "8BITMIME" }, { MCIF_7BIT, "7BIT" }, - { MCIF_MULTSTAT, "MULTSTAT" }, { MCIF_INHEADER, "INHEADER" }, { MCIF_CVT8TO7, "CVT8TO7" }, { MCIF_DSN, "DSN" }, @@ -1313,7 +1312,7 @@ mci_purge_persistent(pathname, hostname) pathname, sm_errstring(errno)); return ret; } - if (curtime() - statbuf.st_mtime < MciInfoTimeout) + if (curtime() - statbuf.st_mtime <= MciInfoTimeout) return 1; if (hostname != NULL) { |
