From e67e6cf61219ab0a13d1cb3fe01c0f6fda9c771a Mon Sep 17 00:00:00 2001 From: Eric Allman Date: Sat, 30 Oct 1993 04:19:27 -0800 Subject: [PATCH] fix to error handling -- set error flags even if HoldErrs set (this reverts to previous behaviour, except sets Errors on 6xx codes) SCCS-vsn: usr.sbin/sendmail/src/err.c 8.14 --- usr/src/usr.sbin/sendmail/src/err.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/usr/src/usr.sbin/sendmail/src/err.c b/usr/src/usr.sbin/sendmail/src/err.c index 5a8669a4b6..d98d905da2 100644 --- a/usr/src/usr.sbin/sendmail/src/err.c +++ b/usr/src/usr.sbin/sendmail/src/err.c @@ -7,7 +7,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)err.c 8.13 (Berkeley) %G%"; +static char sccsid[] = "@(#)err.c 8.14 (Berkeley) %G%"; #endif /* not lint */ # include "sendmail.h" @@ -315,18 +315,17 @@ puterrmsg(msg) putoutmsg(msg, HoldErrs); /* signal the error */ - if (!HoldErrs) - { - Errors++; - if (msgcode == '5' && bitset(EF_GLOBALERRS, CurEnv->e_flags)) - CurEnv->e_flags |= EF_FATALERRS; - } - + Errors++; if (msgcode == '6') { /* notify the postmaster */ CurEnv->e_flags |= EF_PM_NOTIFY; } + else if (msgcode == '5' && bitset(EF_GLOBALERRS, CurEnv->e_flags)) + { + /* mark long-term fatal errors */ + CurEnv->e_flags |= EF_FATALERRS; + } } /* ** FMTMSG -- format a message into buffer. -- 2.20.1