diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2005-02-14 02:39:14 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2005-02-14 02:39:14 +0000 |
commit | e1f5440b9ed6c521a401bdddc4722b7ff5ef43a9 (patch) | |
tree | e109b48bd3a58abfa6dedd2be0e7f509d15c5b1d /contrib/sendmail/src/savemail.c | |
parent | 59c6e3524b67debe90b8e7c57d4c84e7ea08a463 (diff) | |
download | FreeBSD-src-e1f5440b9ed6c521a401bdddc4722b7ff5ef43a9.zip FreeBSD-src-e1f5440b9ed6c521a401bdddc4722b7ff5ef43a9.tar.gz |
Resolve conflicts from sendmail 8.13.3 import
MFC after: 4 days
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
-rw-r--r-- | contrib/sendmail/src/savemail.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index 231382a..857d81f 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: savemail.c,v 8.303 2004/01/14 02:56:51 ca Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 8.304 2004/10/06 21:36:06 ca Exp $") static void errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); @@ -1182,6 +1182,9 @@ errbody(mci, e, separator) /* X-Actual-Recipient: -- the real problem address */ if (actual[0] != '\0' && q->q_finalrcpt != NULL && +#if _FFR_PRIV_NOACTUALRECIPIENT + !bitset(PRIV_NOACTUALRECIPIENT, PrivacyFlags) && +#endif /* _FFR_PRIV_NOACTUALRECIPIENT */ strcmp(actual, q->q_finalrcpt) != 0) { (void) sm_snprintf(buf, sizeof buf, |