fanf2 2008/09/05 17:59:48 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src/transports smtp.c
Log:
Produce a more useful error message if an SMTP transport's hosts
setting expands to an empty string.
Bug reported by Jens Hoffrichter <jens.hoffrichter@???>
Revision Changes Path
1.553 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.40 +9 -0 exim/exim-src/src/transports/smtp.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- ChangeLog 3 Sep 2008 18:53:29 -0000 1.552
+++ ChangeLog 5 Sep 2008 16:59:47 -0000 1.553
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.552 2008/09/03 18:53:29 fanf2 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.553 2008/09/05 16:59:47 fanf2 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -65,6 +65,9 @@
TF/08 TLS error reporting now respects the incoming_interface and
incoming_port log selectors.
+TF/09 Produce a more useful error message if an SMTP transport's hosts
+ setting expands to an empty string.
+
Exim version 4.69
-----------------
Index: smtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- smtp.c 5 Mar 2008 21:13:23 -0000 1.39
+++ smtp.c 5 Sep 2008 16:59:48 -0000 1.40
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.39 2008/03/05 21:13:23 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.40 2008/09/05 16:59:48 fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2264,6 +2264,15 @@
host_build_hostlist(&hostlist, s, ob->hosts_randomize);
+ /* Check that the expansion yielded something useful. */
+ if (hostlist == NULL)
+ {
+ addrlist->message =
+ string_sprintf("%s transport has empty hosts setting", tblock->name);
+ addrlist->transport_return = PANIC;
+ return FALSE; /* Only top address has status */
+ }
+
/* If there was no expansion of hosts, save the host list for
next time. */
