diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-08-21 01:32:34 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-08-21 01:32:34 +0000 |
| commit | 897671a2e8f2da038a7723a5c25ef0991558321e (patch) | |
| tree | 2cce2d7a82886066cffe7fdd13ee81a74ecc95ed /contrib/sendmail | |
| parent | acff40ffd877ea0c55c0440555dac3ceee491cc4 (diff) | |
| download | FreeBSD-src-897671a2e8f2da038a7723a5c25ef0991558321e.zip FreeBSD-src-897671a2e8f2da038a7723a5c25ef0991558321e.tar.gz | |
Resolve conflicts from sendmail 8.11.6 import
Diffstat (limited to 'contrib/sendmail')
| -rw-r--r-- | contrib/sendmail/src/err.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/contrib/sendmail/src/err.c b/contrib/sendmail/src/err.c index 46086ca..6e02d44 100644 --- a/contrib/sendmail/src/err.c +++ b/contrib/sendmail/src/err.c @@ -12,7 +12,7 @@ */ #ifndef lint -static char id[] = "@(#)$Id: err.c,v 8.120.4.3 2001/05/30 00:22:26 gshapiro Exp $"; +static char id[] = "@(#)$Id: err.c,v 8.120.4.5 2001/08/17 22:09:40 ca Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -778,10 +778,27 @@ fmtmsg(eb, to, num, enhsc, eno, fmt, ap) spaceleft -= l; } - /* output the "to" person */ + /* + ** output the "to" address only if it is defined and one of the + ** following codes is used: + ** 050 internal notices, e.g., alias expansion + ** 250 Ok + ** 252 Cannot VRFY user, but will accept message and attempt delivery + ** 450 Requested mail action not taken: mailbox unavailable + ** 550 Requested action not taken: mailbox unavailable + ** 553 Requested action not taken: mailbox name not allowed + ** + ** Notice: this still isn't "the right thing", this code shouldn't + ** (indirectly) depend on CurEnv->e_to. + */ + if (to != NULL && to[0] != '\0' && - strncmp(num, "551", 3) != 0 && - strncmp(num, "251", 3) != 0) + (strncmp(num, "050", 3) == 0 || + strncmp(num, "250", 3) == 0 || + strncmp(num, "252", 3) == 0 || + strncmp(num, "450", 3) == 0 || + strncmp(num, "550", 3) == 0 || + strncmp(num, "553", 3) == 0)) { (void) snprintf(eb, spaceleft, "%s... ", shortenstring(to, MAXSHORTSTR)); |
