tidying: char signedness

[exim.git] / src / src / exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index ede4e0b8d56b9c192d985f8f2b9fa560d7b22d91..ddb35982d2f6f2932c5de99ca31c8c0dd0a37bc1 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -814,9 +814,6 @@ fprintf(f, "Support for:");
 #ifdef WITH_CONTENT_SCAN
   fprintf(f, " Content_Scanning");
 #endif
-#ifdef WITH_OLD_DEMIME
-  fprintf(f, " Old_Demime");
-#endif
 #ifndef DISABLE_DKIM
   fprintf(f, " DKIM");
 #endif
@@ -2228,6 +2225,7 @@ for (i = 1; i < argc; i++)
       printf("%s\n", CS version_copyright);
       version_printed = TRUE;
       show_whats_supported(stdout);
+      log_testing_mode = TRUE;
       }
 
     /* -bw: inetd wait mode, accept a listening socket as stdin */
@@ -4600,6 +4598,7 @@ if (list_config)
 #ifndef DISABLE_DKIM
 dkim_exim_init();
 #endif
+deliver_init();
 
 
 /* Handle a request to deliver one or more messages that are already on the
@@ -4941,6 +4940,7 @@ Otherwise, if -bem was used, read a message from stdin. */
 
 if (expansion_test)
   {
+  dns_init(FALSE, FALSE, FALSE);
   if (msg_action_arg > 0 && msg_action == MSG_LOAD)
     {
     uschar spoolname[256];  /* Not big_buffer; used in spool_read_header() */