diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2003-03-03 17:18:01 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2003-03-03 17:18:01 +0000 |
commit | 82f90419f3ebae01ec953cb6eb7ad164767ab43a (patch) | |
tree | 03e1513af61d9ec133b04cc8601cfea98af01126 /contrib/sendmail/src/mci.c | |
parent | 6cbdf4ebe160d2ee3e21cdfcf8d6c8790a39610e (diff) | |
download | FreeBSD-src-82f90419f3ebae01ec953cb6eb7ad164767ab43a.zip FreeBSD-src-82f90419f3ebae01ec953cb6eb7ad164767ab43a.tar.gz |
Fix conflicts from sendmail 8.12.8 import
Diffstat (limited to 'contrib/sendmail/src/mci.c')
-rw-r--r-- | contrib/sendmail/src/mci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 5172333..033387b 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.205.2.2 2002/11/26 19:15:19 gshapiro Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.205.2.3 2003/01/07 03:56:19 ca Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -1244,10 +1244,8 @@ mci_print_persistent(pathname, hostname) locked ? '*' : ' ', hostname, pintvl(curtime() - mcib.mci_lastuse, true)); if (mcib.mci_rstatus != NULL) - { (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "%.*s\n", width, mcib.mci_rstatus); - } else if (mcib.mci_exitstat == EX_TEMPFAIL && mcib.mci_errno != 0) (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT, "Deferred: %.*s\n", width - 10, |