tidying

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f5eda68cdd461570fa068689978322f5683385ab..c56dd63b3e798924aea08eae109e7e2ee26b95ad 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -31541,7 +31541,10 @@ av_scanner = sophie:/var/run/sophie
 If the value of &%av_scanner%& starts with a dollar character, it is expanded
 before use.
 The usual list-parsing of the content (see &<<SECTlistconstruct>>&) applies.
 If the value of &%av_scanner%& starts with a dollar character, it is expanded
 before use.
 The usual list-parsing of the content (see &<<SECTlistconstruct>>&) applies.

-The following scanner types are supported in this release:
+The following scanner types are supported in this release,
+.new
+though individual ones can be included or not at build time:
+.wen

 
 .vlist
 .vitem &%avast%&
 
 .vlist
 .vitem &%avast%&

diff --git a/src/src/malware.c b/src/src/malware.c
index 27bcc92255c6a94afb87b4017fed585dcceec7ad..c18cd95be93e173a93cfdb60d9d920c24a86c06d 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -70,8 +70,9 @@ static struct scan
 void
 features_malware(void)
 {
 void
 features_malware(void)
 {

-struct scan * sc;
-uschar * s, * t;
+const struct scan * sc;
+const uschar * s;
+uschar * t;

 uschar buf[64];
 
 spf(buf, sizeof(buf), US"_HAVE_MALWARE_");
 uschar buf[64];
 
 spf(buf, sizeof(buf), US"_HAVE_MALWARE_");

diff --git a/test/Makefile.in b/test/Makefile.in
index 9d145ece31a24740ec4143ead28d66ebc6e52052..2b6c2da7db7bbc462a1267ba2cf33e3b59410448 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -27,7 +27,7 @@ all:            binaries sysbinaries
 binaries:      $(BINARIES)
 
 sysbinaries:   FRC
 binaries:      $(BINARIES)
 
 sysbinaries:   FRC

-               bin/locate.sh initdb postgres
+               bin/locate.sh initdb postgres pg_ctl

 
 # Compile and link the programs:
 #
 
 # Compile and link the programs:
 #

diff --git a/test/bin/locate.sh b/test/bin/locate.sh
index dad0bd49fccf1885e174a50cf5a1690941e6ae88..19c3a5fda99e451999c1ec3748adef8b13c7877a 100755 (executable)
--- a/test/bin/locate.sh
+++ b/test/bin/locate.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-[ -e bin.sys ] || mkdir bin.sys
+[ -d bin.sys ] || mkdir bin.sys

 cd bin.sys
 
 while read d
 cd bin.sys
 
 while read d


@@ -13,6 +13,7 @@ do
       ln -s $d/$1 .
       shift
     done
       ln -s $d/$1 .
       shift
     done

+    exit 0

   fi
 done <<-HERE
        /bin
   fi
 done <<-HERE
        /bin

diff --git a/test/confs/4600 b/test/confs/4600
index ba2135943456978dcf0e5b5f619e6ce16e03dccf..d93b683d9515060480d3b786467dd38a6c31a303 100644 (file)
--- a/test/confs/4600
+++ b/test/confs/4600
@@ -1,7 +1,5 @@
 # Exim test configuration 4600
 
 # Exim test configuration 4600
 

-SERVER=
-

 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex


@@ -10,10 +8,6 @@ primary_hostname = myhost.test.ex
 
 acl_smtp_rcpt = check_rcpt
 
 
 acl_smtp_rcpt = check_rcpt
 

-queue_only
-queue_run_in_order
-
-

 begin acl
 
 check_rcpt:
 begin acl
 
 check_rcpt: