diff options
| author | pst <pst@FreeBSD.org> | 1995-03-10 04:50:28 +0000 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1995-03-10 04:50:28 +0000 |
| commit | e2bc8b6f14ae0cd12a39de749da7c50344fb0a59 (patch) | |
| tree | 560f86621239f14c715a65789340362b746d248c /usr.sbin/sendmail/src/queue.c | |
| parent | 01cbc7dd5ca2aab48e98dce077e56fd1bd41b902 (diff) | |
| download | FreeBSD-src-e2bc8b6f14ae0cd12a39de749da7c50344fb0a59.zip FreeBSD-src-e2bc8b6f14ae0cd12a39de749da7c50344fb0a59.tar.gz | |
Merge sendmail 8.6.11 patches into CSRG branch
Diffstat (limited to 'usr.sbin/sendmail/src/queue.c')
| -rw-r--r-- | usr.sbin/sendmail/src/queue.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/sendmail/src/queue.c b/usr.sbin/sendmail/src/queue.c index 897396a..1dc56a6 100644 --- a/usr.sbin/sendmail/src/queue.c +++ b/usr.sbin/sendmail/src/queue.c @@ -36,9 +36,9 @@ #ifndef lint #ifdef QUEUE -static char sccsid[] = "@(#)queue.c 8.41.1.1 (Berkeley) 2/10/95 (with queueing)"; +static char sccsid[] = "@(#)queue.c 8.41.1.3 (Berkeley) 3/5/95 (with queueing)"; #else -static char sccsid[] = "@(#)queue.c 8.41.1.1 (Berkeley) 2/10/95 (without queueing)"; +static char sccsid[] = "@(#)queue.c 8.41.1.3 (Berkeley) 3/5/95 (without queueing)"; #endif #endif /* not lint */ @@ -210,7 +210,7 @@ queueup(e, queueall, announce) /* message from envelope, if it exists */ if (e->e_message != NULL) - fprintf(tfp, "M%s\n", denlstring(e->e_message)); + fprintf(tfp, "M%s\n", denlstring(e->e_message, TRUE, FALSE)); /* send various flag bits through */ p = buf; @@ -224,14 +224,14 @@ queueup(e, queueall, announce) /* $r and $s and $_ macro values */ if ((p = macvalue('r', e)) != NULL) - fprintf(tfp, "$r%s\n", denlstring(p)); + fprintf(tfp, "$r%s\n", denlstring(p, TRUE, FALSE)); if ((p = macvalue('s', e)) != NULL) - fprintf(tfp, "$s%s\n", denlstring(p)); + fprintf(tfp, "$s%s\n", denlstring(p, TRUE, FALSE)); if ((p = macvalue('_', e)) != NULL) - fprintf(tfp, "$_%s\n", denlstring(p)); + fprintf(tfp, "$_%s\n", denlstring(p, TRUE, FALSE)); /* output name of sender */ - fprintf(tfp, "S%s\n", denlstring(e->e_from.q_paddr)); + fprintf(tfp, "S%s\n", denlstring(e->e_from.q_paddr, TRUE, FALSE)); /* output list of error recipients */ printctladdr(NULL, NULL); @@ -240,7 +240,7 @@ queueup(e, queueall, announce) if (!bitset(QDONTSEND|QBADADDR, q->q_flags)) { printctladdr(q, tfp); - fprintf(tfp, "E%s\n", denlstring(q->q_paddr)); + fprintf(tfp, "E%s\n", denlstring(q->q_paddr, TRUE, FALSE)); } } @@ -251,7 +251,7 @@ queueup(e, queueall, announce) (queueall && !bitset(QDONTSEND|QBADADDR|QSENT, q->q_flags))) { printctladdr(q, tfp); - fprintf(tfp, "R%s\n", denlstring(q->q_paddr)); + fprintf(tfp, "R%s\n", denlstring(q->q_paddr, TRUE, FALSE)); if (announce) { e->e_to = q->q_paddr; @@ -427,7 +427,7 @@ printctladdr(a, tfp) else uname = pw->pw_name; - fprintf(tfp, "C%s:%s\n", uname, denlstring(a->q_paddr)); + fprintf(tfp, "C%s:%s\n", uname, denlstring(a->q_paddr, TRUE, FALSE)); } /* |
