Do not use the A lookup following an AAAA for setting the FQDN. Bug 1588

[user/henk/code/exim.git] / src / src / exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index cae2964775ee8593f5774e9772d4b4c880f08d96..470d44dcec00fba78b177c5268f69c1b0b967671 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -820,6 +820,9 @@ fprintf(f, "Support for:");
 #ifdef WITH_OLD_DEMIME
   fprintf(f, " Old_Demime");
 #endif
+#ifndef DISABLE_DNSSEC
+  fprintf(f, " DNSSEC");
+#endif
 #ifndef DISABLE_PRDR
   fprintf(f, " PRDR");
 #endif
@@ -5088,6 +5091,9 @@ if (mua_wrapper)
   deliver_drop_privilege = TRUE;
   queue_smtp = FALSE;
   queue_smtp_domains = NULL;
+#ifdef EXPERIMENTAL_INTERNATIONAL
+  message_utf8_downconvert = -1;       /* convert-if-needed */
+#endif
   }