From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 2 Jan 2018 14:29:29 +0000 (+0000)
Subject: tidying
X-Git-Tag: exim-4_91_RC1~115
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/2b8b8e4ed5cbebd3884c301d438d72ea24fbfd70

tidying
---

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f5eda68cd..c56dd63b3 100644
--- 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.
-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%&
diff --git a/src/src/malware.c b/src/src/malware.c
index 27bcc9225..c18cd95be 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -70,8 +70,9 @@ static struct scan
 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_");
diff --git a/test/Makefile.in b/test/Makefile.in
index 9d145ece3..2b6c2da7d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -27,7 +27,7 @@ all:            binaries sysbinaries
 binaries:	$(BINARIES)
 
 sysbinaries:	FRC
-		bin/locate.sh initdb postgres
+		bin/locate.sh initdb postgres pg_ctl
 
 # Compile and link the programs:
 #
diff --git a/test/bin/locate.sh b/test/bin/locate.sh
index dad0bd49f..19c3a5fda 100755
--- a/test/bin/locate.sh
+++ b/test/bin/locate.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -e bin.sys ] || mkdir bin.sys
+[ -d bin.sys ] || mkdir bin.sys
 cd bin.sys
 
 while read d
@@ -13,6 +13,7 @@ do
       ln -s $d/$1 .
       shift
     done
+    exit 0
   fi
 done <<-HERE
 	/bin
diff --git a/test/confs/4600 b/test/confs/4600
index ba2135943..d93b683d9 100644
--- a/test/confs/4600
+++ b/test/confs/4600
@@ -1,7 +1,5 @@
 # Exim test configuration 4600
 
-SERVER=
-
 .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
 
-queue_only
-queue_run_in_order
-
-
 begin acl
 
 check_rcpt: