diff options
| author | peter <peter@FreeBSD.org> | 1999-02-07 09:40:41 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-02-07 09:40:41 +0000 |
| commit | ab5a9cbab45b524bd67604dcdbe60870697848d2 (patch) | |
| tree | 3d5cbf462390cf6c6ed3bc71b85e84ffae40948f /contrib/sendmail/src/recipient.c | |
| parent | 7a0029ee87f579bf3090db5b0fba045030753bbb (diff) | |
| parent | 19c8fca2df7a6f39e5208229f428ec269fb3adbf (diff) | |
| download | FreeBSD-src-ab5a9cbab45b524bd67604dcdbe60870697848d2.zip FreeBSD-src-ab5a9cbab45b524bd67604dcdbe60870697848d2.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r43730,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/sendmail/src/recipient.c')
| -rw-r--r-- | contrib/sendmail/src/recipient.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/contrib/sendmail/src/recipient.c b/contrib/sendmail/src/recipient.c index 59412a8..f7e221f 100644 --- a/contrib/sendmail/src/recipient.c +++ b/contrib/sendmail/src/recipient.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)recipient.c 8.161 (Berkeley) 12/18/1998"; +static char sccsid[] = "@(#)recipient.c 8.163 (Berkeley) 1/23/1999"; #endif /* not lint */ # include "sendmail.h" @@ -1195,6 +1195,7 @@ resetuid: { /* don't do any more now */ ctladdr->q_flags |= QVERIFIED; + ctladdr->q_flags &= ~QDONTSEND; e->e_nrcpts++; xfclose(fp, "include", fname); return rval; @@ -1409,6 +1410,8 @@ self_reference(a, e) c = a; while (c != NULL) { + if (tTd(27, 10)) + printf(" %s", c->q_user); if (bitnset(M_HASPWENT, c->q_mailer->m_flags)) { if (tTd(27, 2)) @@ -1427,6 +1430,22 @@ self_reference(a, e) if (tTd(27, 2)) printf("failed\n"); } + else + { + /* if local delivery, compare usernames */ + if (bitnset(M_LOCALMAILER, c->q_mailer->m_flags) && + b->q_mailer == c->q_mailer) + { + if (tTd(27, 2)) + printf("\t... local match (%s)\n", c->q_user); + if (sameaddr(b, c)) + return b; + else + return c; + } + } + if (tTd(27, 10)) + printf("\n"); c = c->q_alias; } |
