diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2003-02-08 20:35:51 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2003-02-08 20:35:51 +0000 |
| commit | 55f617e6f03e9e96b121cdde8289102d3a460b4e (patch) | |
| tree | e9e902fe45cc13b5eeb0f81f2aa041f4296bdd54 /contrib/sendmail/src/mci.c | |
| parent | 7bd0c4fe894c9bc5e90bb93736d3d0f84dc7a7dc (diff) | |
| download | FreeBSD-src-55f617e6f03e9e96b121cdde8289102d3a460b4e.zip FreeBSD-src-55f617e6f03e9e96b121cdde8289102d3a460b4e.tar.gz | |
Resolve conflicts from sendmail 8.12.7 import
Diffstat (limited to 'contrib/sendmail/src/mci.c')
| -rw-r--r-- | contrib/sendmail/src/mci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/sendmail/src/mci.c b/contrib/sendmail/src/mci.c index 7d1a4de..690d3ef 100644 --- a/contrib/sendmail/src/mci.c +++ b/contrib/sendmail/src/mci.c @@ -15,7 +15,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: mci.c,v 8.205 2002/05/24 18:53:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: mci.c,v 8.205.2.2 2002/11/26 19:15:19 gshapiro Exp $") #if NETINET || NETINET6 # include <arpa/inet.h> @@ -1246,8 +1246,10 @@ 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, |
