Philip, do you think this fix should be applied to qualify_single as well?

--- routers/dnslookup.c 15 Sep 2005 16:02:07 -0000      1.6
+++ routers/dnslookup.c 16 Sep 2005 16:27:09 -0000
@@ -253,9 +253,13 @@

   /* Unfortunately, we cannot set the mx_only option in advance, because the
   DNS lookup may extend an unqualified name. Therefore, we must do the test
-  subsequently. */
+  subsequently. The logic for the qualify_single flag is the same as that
+  for widen_domains above. */
+
+  if (ob->qualify_single &&
+      (verify != v_sender || !ob->rewrite_headers || addr->parent != NULL))
+    flags |= HOST_FIND_QUALIFY_SINGLE;

-  if (ob->qualify_single) flags |= HOST_FIND_QUALIFY_SINGLE;
   if (ob->search_parents) flags |= HOST_FIND_SEARCH_PARENTS;

   rc = host_find_bydns(&h, rblock->ignore_target_hosts, flags, srv_service,

Tony.
-- 
<[EMAIL PROTECTED]>   <[EMAIL PROTECTED]>   http://dotat.at/   ${sg{\N${sg{\
N\}{([^N]*)(.)(.)(.*)}{\$1\$3\$2\$1\$3\n\$2\$3\$4\$3\n\$3\$2\$4}}\
\N}{([^N]*)(.)(.)(.*)}{\$1\$3\$2\$1\$3\n\$2\$3\$4\$3\n\$3\$2\$4}}

-- 
## List details at http://www.exim.org/mailman/listinfo/exim-dev Exim details 
at http://www.exim.org/ ##

Reply via email to