From 35943e55337f51c93d8d014a2f6afd0551395ca8 Mon Sep 17 00:00:00 2001 From: Eric Allman Date: Sat, 27 Feb 1993 19:58:04 -0800 Subject: [PATCH] fix problem that caused looping in .forward files on queue runs only SCCS-vsn: usr.sbin/sendmail/src/queue.c 6.20 SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 6.24 SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.19 --- usr/src/usr.sbin/sendmail/src/queue.c | 7 +++---- usr/src/usr.sbin/sendmail/src/recipient.c | 4 ++-- usr/src/usr.sbin/sendmail/src/sendmail.h | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usr/src/usr.sbin/sendmail/src/queue.c b/usr/src/usr.sbin/sendmail/src/queue.c index bdb58f5b1d..207748773d 100644 --- a/usr/src/usr.sbin/sendmail/src/queue.c +++ b/usr/src/usr.sbin/sendmail/src/queue.c @@ -10,9 +10,9 @@ #ifndef lint #ifdef QUEUE -static char sccsid[] = "@(#)queue.c 6.19 (Berkeley) %G% (with queueing)"; +static char sccsid[] = "@(#)queue.c 6.20 (Berkeley) %G% (with queueing)"; #else -static char sccsid[] = "@(#)queue.c 6.19 (Berkeley) %G% (without queueing)"; +static char sccsid[] = "@(#)queue.c 6.20 (Berkeley) %G% (without queueing)"; #endif #endif /* not lint */ @@ -430,7 +430,6 @@ runqueue(forkflag) } setproctitle("running queue: %s", QueueDir); - ForceMail = TRUE; # ifdef LOG if (LogLevel > 69) @@ -1337,7 +1336,7 @@ setctluser(user) a->q_user = newstr(DefUser); } - a->q_flags |= QGOODUID; /* flag as a "ctladdr" */ + a->q_flags |= QGOODUID|QPRIMARY; /* flag as a "ctladdr" */ a->q_mailer = LocalMailer; return a; } diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c index 061ee52613..837387d948 100644 --- a/usr/src/usr.sbin/sendmail/src/recipient.c +++ b/usr/src/usr.sbin/sendmail/src/recipient.c @@ -7,7 +7,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)recipient.c 6.18 (Berkeley) %G%"; +static char sccsid[] = "@(#)recipient.c 6.19 (Berkeley) %G%"; #endif /* not lint */ # include @@ -272,7 +272,7 @@ recipient(a, sendq, e) for (pq = sendq; (q = *pq) != NULL; pq = &q->q_next) { - if (!ForceMail && sameaddr(q, a)) + if (sameaddr(q, a)) { if (tTd(26, 1)) { diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h index 8ae8849691..7f6200110c 100644 --- a/usr/src/usr.sbin/sendmail/src/sendmail.h +++ b/usr/src/usr.sbin/sendmail/src/sendmail.h @@ -5,7 +5,7 @@ * * %sccs.include.redist.c% * - * @(#)sendmail.h 6.23 (Berkeley) %G% + * @(#)sendmail.h 6.24 (Berkeley) %G% */ /* @@ -15,7 +15,7 @@ # ifdef _DEFINE # define EXTERN # ifndef lint -static char SmailSccsId[] = "@(#)sendmail.h 6.23 %G%"; +static char SmailSccsId[] = "@(#)sendmail.h 6.24 %G%"; # endif lint # else /* _DEFINE */ # define EXTERN extern @@ -598,7 +598,6 @@ struct prival EXTERN bool FromFlag; /* if set, "From" person is explicit */ EXTERN bool NoAlias; /* if set, don't do any aliasing */ -EXTERN bool ForceMail; /* if set, mail even if already got a copy */ EXTERN bool MeToo; /* send to the sender also */ EXTERN bool IgnrDot; /* don't let dot end messages */ EXTERN bool SaveFrom; /* save leading "From" lines */ -- 2.20.1