Gitweb:
http://git.exim.org/exim.git/commitdiff/9671784a54a6729881f7716a0b963a0422e8b3dd
Commit: 9671784a54a6729881f7716a0b963a0422e8b3dd
Parent: 250b68713b5810a824bb14337b98737b6b81bf53
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Apr 7 22:15:43 2015 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Apr 12 19:20:39 2015 +0100
bounce message
---
TODO | 2 +
src/src/deliver.c | 86 ++++++++++++--------
test/confs/4201 | 28 +++++-
test/log/4201 | 24 ++++--
...40\245\207\340\244\271\340\245\210\340\244\202" | 59 +++++++++++++
test/scripts/4200-International/4201 | 12 ++-
test/stderr/0275 | 2 +-
test/stderr/0278 | 2 +-
test/stderr/0361 | 4 +-
test/stderr/0386 | 4 +-
test/stderr/0402 | 14 ++--
test/stderr/0403 | 4 +-
test/stderr/0404 | 6 +-
test/stderr/0408 | 2 +-
test/stderr/0487 | 2 +-
test/stderr/2600 | 2 +-
test/stderr/5004 | 4 +-
test/stderr/5005 | 4 +-
test/stderr/5006 | 2 +-
19 files changed, 186 insertions(+), 77 deletions(-)
diff --git a/TODO b/TODO
index a282dc5..4445d0f 100644
--- a/TODO
+++ b/TODO
@@ -32,6 +32,8 @@ retries
- apply to a-label or utf8 form?
dsn handling rfc6533
+- ORCPT param: utf8 vs. unitext encoded
+-- to/from unitext expansions ( foo\x{HEXPOINT} - 2-6 hex digits )
logging
++ - international msg
diff --git a/src/src/deliver.c b/src/src/deliver.c
index cc43c92..17edb65 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6664,29 +6664,36 @@ else if (!dont_deliver) retry_update(&addr_defer, &addr_failed, &addr_succeed);
addr_dsntmp = addr_succeed;
addr_senddsn = NULL;
-while(addr_dsntmp != NULL)
+while(addr_dsntmp)
{
- DEBUG(D_deliver)
- debug_printf("DSN: processing router : %s\n", addr_dsntmp->router->name);
-
- DEBUG(D_deliver)
- debug_printf("DSN: processing successful delivery address: %s\n", addr_dsntmp->address);
-
/* af_ignore_error not honored here. it's not an error */
-
- DEBUG(D_deliver) debug_printf("DSN: Sender_address: %s\n", sender_address);
- DEBUG(D_deliver) debug_printf("DSN: orcpt: %s flags: %d\n", addr_dsntmp->dsn_orcpt, addr_dsntmp->dsn_flags);
- DEBUG(D_deliver) debug_printf("DSN: envid: %s ret: %d\n", dsn_envid, dsn_ret);
- DEBUG(D_deliver) debug_printf("DSN: Final recipient: %s\n", addr_dsntmp->address);
- DEBUG(D_deliver) debug_printf("DSN: Remote SMTP server supports DSN: %d\n", addr_dsntmp->dsn_aware);
+ DEBUG(D_deliver)
+ {
+ debug_printf("DSN: processing router : %s\n"
+ "DSN: processing successful delivery address: %s\n"
+ "DSN: Sender_address: %s\n"
+ "DSN: orcpt: %s flags: %d\n"
+ "DSN: envid: %s ret: %d\n"
+ "DSN: Final recipient: %s\n"
+ "DSN: Remote SMTP server supports DSN: %d\n",
+ addr_dsntmp->router->name,
+ addr_dsntmp->address,
+ sender_address,
+ addr_dsntmp->dsn_orcpt, addr_dsntmp->dsn_flags,
+ dsn_envid, dsn_ret,
+ addr_dsntmp->address,
+ addr_dsntmp->dsn_aware
+ );
+ }
/* send report if next hop not DSN aware or a router flagged "last DSN hop"
and a report was requested */
- if (((addr_dsntmp->dsn_aware != dsn_support_yes) ||
- ((addr_dsntmp->dsn_flags & rf_dsnlasthop) != 0))
- &&
- (((addr_dsntmp->dsn_flags & rf_dsnflags) != 0) &&
- ((addr_dsntmp->dsn_flags & rf_notify_success) != 0)))
+ if ( ( addr_dsntmp->dsn_aware != dsn_support_yes
+ || addr_dsntmp->dsn_flags & rf_dsnlasthop
+ )
+ && addr_dsntmp->dsn_flags & rf_dsnflags
+ && addr_dsntmp->dsn_flags & rf_notify_success
+ )
{
/* copy and relink address_item and send report with all of them at once later */
address_item *addr_next;
@@ -6696,14 +6703,12 @@ while(addr_dsntmp != NULL)
addr_senddsn->next = addr_next;
}
else
- {
- DEBUG(D_deliver) debug_printf("DSN: *** NOT SENDING DSN SUCCESS Message ***\n");
- }
+ DEBUG(D_deliver) debug_printf("DSN: not sending DSN success message\n");
addr_dsntmp = addr_dsntmp->next;
}
-if (addr_senddsn != NULL)
+if (addr_senddsn)
{
pid_t pid;
int fd;
@@ -6860,8 +6865,8 @@ while (addr_failed != NULL)
if (sender_address[0] == 0 && addr_failed->p.errors_address == NULL)
{
- if (!testflag(addr_failed, af_retry_timedout) &&
- !testflag(addr_failed, af_ignore_error))
+ if ( !testflag(addr_failed, af_retry_timedout)
+ && !testflag(addr_failed, af_ignore_error))
{
log_write(0, LOG_MAIN|LOG_PANIC, "internal error: bounce message "
"failure is neither frozen nor ignored (it's been ignored)");
@@ -6874,8 +6879,8 @@ while (addr_failed != NULL)
mark the recipient done. */
if ( testflag(addr_failed, af_ignore_error)
- || ( ((addr_failed->dsn_flags & rf_dsnflags) != 0)
- && ((addr_failed->dsn_flags & rf_notify_failure) != rf_notify_failure))
+ || ( addr_failed->dsn_flags & rf_dsnflags
+ && (addr_failed->dsn_flags & rf_notify_failure) != rf_notify_failure)
)
{
addr = addr_failed;
@@ -7140,10 +7145,18 @@ wording. */
}
/* output machine readable part */
- fprintf(f, "--%s\n"
- "Content-type: message/delivery-status\n\n"
- "Reporting-MTA: dns; %s\n",
- bound, smtp_active_hostname);
+#ifdef EXPERIMENTAL_INTERNATIONAL
+ if (message_smtputf8)
+ fprintf(f, "--%s\n"
+ "Content-type: message/global-delivery-status\n\n"
+ "Reporting-MTA: dns; %s\n",
+ bound, smtp_active_hostname);
+ else
+#endif
+ fprintf(f, "--%s\n"
+ "Content-type: message/delivery-status\n\n"
+ "Reporting-MTA: dns; %s\n",
+ bound, smtp_active_hostname);
if (dsn_envid)
{
@@ -7218,9 +7231,16 @@ wording. */
}
}
- fputs(topt & topt_no_body ? "Content-type: text/rfc822-headers\n\n"
- : "Content-type: message/rfc822\n\n",
- f);
+#ifdef EXPERIMENTAL_INTERNATIONAL
+ if (message_smtputf8)
+ fputs(topt & topt_no_body ? "Content-type: message/global-headers\n\n"
+ : "Content-type: message/global\n\n",
+ f);
+ else
+#endif
+ fputs(topt & topt_no_body ? "Content-type: text/rfc822-headers\n\n"
+ : "Content-type: message/rfc822\n\n",
+ f);
fflush(f);
transport_filter_argv = NULL; /* Just in case */
diff --git a/test/confs/4201 b/test/confs/4201
index 36e38bc..aea4684 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -15,8 +15,10 @@ gecos_name = CALLER_NAME
domainlist local_domains = test.ex
acl_smtp_rcpt = check_recipient
+acl_not_smtp = non_smtp
+
trusted_users = CALLER
-log_selector = +received_recipients
+log_selector = +received_recipients +sender_on_delivery
.ifdef SERVER
queue_only
@@ -39,6 +41,13 @@ check_recipient:
accept domains = +local_domains
deny message = relay not permitted
+.ifndef SERVER
+non_smtp:
+ accept senders = :
+ control = queue_only
+ accept
+.endif
+
# ----- Routers -----
begin routers
@@ -50,12 +59,24 @@ fail_remote_domains:
domains = ! +local_domains
data = :fail: unrouteable mail domain "$domain"
+bounces:
+ driver = redirect
+ condition = ${if eq {} {$sender_address}}
+ data = DIR/test-mail/$local_part
+ file_transport = local_delivery
+
localuser:
driver = redirect
data = :blackhole:
.else
+bounces:
+ driver = redirect
+ domains = *.local
+ data = DIR/test-mail/$local_part
+ file_transport = local_delivery
+
rmt:
driver = manualroute
domains = +local_domains
@@ -63,10 +84,6 @@ rmt:
transport = rmt_smtp
self = send
-hole:
- driver = redirect
- data = :blackhole:
-
.endif
# ----- Transports -----
@@ -75,6 +92,7 @@ begin transports
local_delivery:
driver = appendfile
+ user = CALLER
delivery_date_add
envelope_to_add
file = DIR/test-mail/$local_part
diff --git a/test/log/4201 b/test/log/4201
index 7bd340b..fcaaba1 100644
--- a/test/log/4201
+++ b/test/log/4201
@@ -3,17 +3,23 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@???
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@???
1999-03-02 09:44:33 10HmbA-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtp S=sss id=E10HmaZ-0005vi-00@??? for usery@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@??? R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@??? F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com U=CALLER P=utf8local-esmtp S=sss for userz@???
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** userz@??? R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1]: utf8 support required for forwarding
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com
-1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com> R=hole
-1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 Start queue run: pid=pppp -qq
+1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@???> R=localuser
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@???> R=localuser
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <usery@???> R=localuser
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qqff
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local U=CALLER P=utf8local-esmtp S=sss for userz@???
+1999-03-02 09:44:33 10HmbB-0005vi-00 ** userz@??? F=<यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1]: utf8 support required for forwarding
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+1999-03-02 09:44:33 10HmbC-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 Start queue run: pid=pppp -qfl
+1999-03-02 09:44:33 10HmbC-0005vi-00 => TESTSUITE/test-mail/यहलोगहिन्दीक्योंनहींबोलसकतेहैं <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> F=<> R=bounces T=local_delivery
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qfl
diff --git "a/test/mail/4201.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4201.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
new file mode 100644
index 0000000..cb22035
--- /dev/null
+++ "b/test/mail/4201.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
@@ -0,0 +1,59 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Return-path: <>
+Envelope-to: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
+Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
+ id 10HmbC-0005vi-00
+ for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local; Tue, 2 Mar 1999 09:44:33 +0000
+X-Failed-Recipients: userz@???
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@???>
+To: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
+Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbC-0005vi-00@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-body-linecount: 38
+X-message-linecount: 50
+X-received-count: 1
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
+This message was created automatically by mail delivery software.
+
+A message that you sent could not be delivered to one or more of its
+recipients. This is a permanent error. The following address(es) failed:
+
+ userz@???
+ host 127.0.0.1 [127.0.0.1]
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/global-delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;userz@???
+Status: 5.0.0
+Remote-MTA: dns; 127.0.0.1
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/global
+
+Return-path: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local>
+Received: from CALLER (helo=client.ffail)
+ by the.local.host.name with utf8local-esmtp (Exim x.yz)
+ (envelope-from <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local>)
+ id 10HmbB-0005vi-00
+ for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+Subject: test
+Message-Id: <E10HmbB-0005vi-00@???>
+From: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+body
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index 17b97c7..d2fb96c 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -73,13 +73,18 @@ QUIT
#
#
killdaemon
+sleep 1
+exim -DSERVER=server -qqff
+****
+#
+#
exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
****
#
# forwarding fails when target does not support SMTPUTF8
exim -bs -odi
EHLO client.ffail
-MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com> SMTPUTF8
+MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> SMTPUTF8
RCPT TO: <userz@???>
DATA
Subject: test
@@ -92,7 +97,6 @@ QUIT
#
#
killdaemon
-exim -DSERVER=server -qq
+#
+exim -qfl
****
-no_msglog_check
-
diff --git a/test/stderr/0275 b/test/stderr/0275
index a634ad5..bb642b0 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -341,7 +341,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0278 b/test/stderr/0278
index 062aaaf..fd5795b 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -243,7 +243,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: CALLER@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0361 b/test/stderr/0361
index 5b93c6e..43bcdbf 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -240,7 +240,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: kilos@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r3
DSN: processing successful delivery address: kilos@???
DSN: Sender_address: CALLER@???
@@ -248,7 +248,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: kilos@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
diff --git a/test/stderr/0386 b/test/stderr/0386
index 086297c..3232ada 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -329,7 +329,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: 2@b
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
@@ -505,7 +505,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: 2@b
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
diff --git a/test/stderr/0402 b/test/stderr/0402
index ec373f5..c0a03d3 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -568,7 +568,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userz@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r2
DSN: processing successful delivery address: usery@???
DSN: Sender_address: CALLER@???
@@ -576,7 +576,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: usery@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r1
DSN: processing successful delivery address: CALLER@???
DSN: Sender_address: CALLER@???
@@ -584,7 +584,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: CALLER@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r4
DSN: processing successful delivery address: TESTSUITE/test-mail/junk
DSN: Sender_address: CALLER@???
@@ -592,7 +592,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: TESTSUITE/test-mail/junk
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r5
DSN: processing successful delivery address: TESTSUITE/test-mail/junk
DSN: Sender_address: CALLER@???
@@ -600,7 +600,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: TESTSUITE/test-mail/junk
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r4
DSN: processing successful delivery address: rd+CALLER@???
DSN: Sender_address: CALLER@???
@@ -608,7 +608,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: rd+CALLER@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r5
DSN: processing successful delivery address: rd+usery@???
DSN: Sender_address: CALLER@???
@@ -616,7 +616,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: rd+usery@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0403 b/test/stderr/0403
index 27b209d..96e990b 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -191,7 +191,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: TESTSUITE/test-mail/junk
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r1
DSN: processing successful delivery address: userx@???
DSN: Sender_address: CALLER@???
@@ -199,7 +199,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0404 b/test/stderr/0404
index 9d04fe5..1f791c4 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -18020,7 +18020,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: sender@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
@@ -18057,7 +18057,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r2
DSN: processing successful delivery address: userx@???
DSN: Sender_address: CALLER@???
@@ -18065,7 +18065,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0408 b/test/stderr/0408
index f578e30..67fe44c 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -181,7 +181,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/0487 b/test/stderr/0487
index e3217ab..c8d720b 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -184,7 +184,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/2600 b/test/stderr/2600
index 8c0bdb0..cc1864a 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -457,7 +457,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/5004 b/test/stderr/5004
index f8d86b7..5014887 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -181,7 +181,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: TESTSUITE/test-mail
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
DSN: processing router : r1
DSN: processing successful delivery address: userx@???
DSN: Sender_address: CALLER@???
@@ -189,7 +189,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
diff --git a/test/stderr/5005 b/test/stderr/5005
index 8a9536a..ae0dbba 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -173,7 +173,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: nofile@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
@@ -357,7 +357,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaY-0005vi-00
diff --git a/test/stderr/5006 b/test/stderr/5006
index 72b650f..9df6ced 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -171,7 +171,7 @@ DSN: orcpt: NULL flags: 0
DSN: envid: NULL ret: 0
DSN: Final recipient: userx@???
DSN: Remote SMTP server supports DSN: 0
-DSN: *** NOT SENDING DSN SUCCESS Message ***
+DSN: not sending DSN success message
LOG: MAIN
Completed
end delivery of 10HmaX-0005vi-00
