Testsuite: add file-inclusion facility to "client" scripts

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 2237476d7018795b5405872b3f7495dd370d61c0..a6a1ea82c3ae507eb1301a335749a642f60edc61 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2294,7 +2294,7 @@ for (i = 1; i < argc; i++)
       #ifdef ALT_CONFIG_PREFIX
       int sep = 0;
       int len = Ustrlen(ALT_CONFIG_PREFIX);
-      uschar *list = argrest;
+      const uschar *list = argrest;
       uschar *filename;
       while((filename = string_nextinlist(&list, &sep, big_buffer,
              big_buffer_size)) != NULL)
@@ -5791,7 +5791,9 @@ moreloop:
   deliver_domain_orig = NULL;
   deliver_host = deliver_host_address = NULL;
   dnslist_domain = dnslist_matched = NULL;
+#ifdef WITH_CONTENT_SCAN
   malware_name = NULL;
+#endif
   callout_address = NULL;
   sending_ip_address = NULL;
   acl_var_m = NULL;