X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fmatch.c;fp=src%2Fsrc%2Fmatch.c;h=893ff4863958e7d79213781dd535524e5e008ff4;hp=5bf4ef5d802a07e19209fb604ea08fc90e8e6e3d;hb=4a452c432a063c45bca4079acb5f654cb0ec5d6d;hpb=a753aaff0ec5ca168a10a8033bbb51a7324db6d8

diff --git a/src/src/match.c b/src/src/match.c
index 5bf4ef5d8..893ff4863 100644
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -740,7 +740,7 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
 
         case DEFER:
         if (error == NULL)
-          error = string_sprintf("DNS lookup of %s deferred", ss);
+          error = string_sprintf("DNS lookup of \"%s\" deferred", ss);
         if (ignore_defer)
           {
           HDEBUG(D_lists) debug_printf("%s: item ignored by +ignore_defer\n",
@@ -752,6 +752,7 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
           log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
           return OK;
           }
+        if (!search_error_message) search_error_message = error;
         goto DEFER_RETURN;
 
         /* The ERROR return occurs when checking hosts, when either a forward