Minor corrections for CVE-2016-1531 backportexim-4_84_1

(cherry picked from commit d0fcaaa6f0b5dcdeea97005f83114c5595748d9d)
And minor additional corrections

(cherry picked from commit 822d6ae9dda57bddc9e5e7021d3fef448c171fed)

16 files changed, 40 insertions, 38 deletions

diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 01cd21f1c..39a0fe189 100755
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -198,6 +198,7 @@ ln -s ../src/dns.c             dns.c
 ln -s ../src/drtables.c        drtables.c
 ln -s ../src/dummies.c         dummies.c
 ln -s ../src/enq.c             enq.c
+ln -s ../src/environment.c     environment.c
 ln -s ../src/exim.c            exim.c
 ln -s ../src/exim_dbmbuild.c   exim_dbmbuild.c
 ln -s ../src/exim_dbutil.c     exim_dbutil.c
diff --git a/src/src/mytypes.h b/src/src/mytypes.h
index 964abf820..b9aef704e 100644
--- a/src/src/mytypes.h
+++ b/src/src/mytypes.h
@@ -66,6 +66,7 @@ almost always literal strings. */
 #define US   (unsigned char *)
 #define CUS  (const unsigned char *)
 #define USS  (unsigned char **)
+#define CUSS (const unsigned char **)
 
 /* The C library string functions expect "char *" arguments. Use macros to
 avoid having to write a cast each time. We do this for string and file
diff --git a/test/paniclog/0013 b/test/paniclog/0013
index 74c607a1b..78e7e579a 100644
--- a/test/paniclog/0013
+++ b/test/paniclog/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts
diff --git a/test/paniclog/0148 b/test/paniclog/0148
index d9985aabd..bf2bfc0b3 100644
--- a/test/paniclog/0148
+++ b/test/paniclog/0148
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 17 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains
diff --git a/test/paniclog/0236 b/test/paniclog/0236
index 6b472bcd8..66533fed4 100644
--- a/test/paniclog/0236
+++ b/test/paniclog/0236
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)
diff --git a/test/paniclog/0290 b/test/paniclog/0290
index 40585c690..24b6854cc 100644
--- a/test/paniclog/0290
+++ b/test/paniclog/0290
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 28 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 27 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"
diff --git a/test/paniclog/0348 b/test/paniclog/0348
index d18082f4c..d2c59c2ad 100644
--- a/test/paniclog/0348
+++ b/test/paniclog/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
diff --git a/test/paniclog/0415 b/test/paniclog/0415
index 4e5fcc9c6..bedff5d78 100644
--- a/test/paniclog/0415
+++ b/test/paniclog/0415
@@ -1,20 +1,20 @@
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config:
   extra characters follow integer value for check_spool_space
-1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
   integer expected for finduser_retries
-1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 23 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
diff --git a/test/paniclog/0442 b/test/paniclog/0442
index f8afd85ea..6db126e5a 100644
--- a/test/paniclog/0442
+++ b/test/paniclog/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent
diff --git a/test/stderr/0013 b/test/stderr/0013
index 74c607a1b..78e7e579a 100644
--- a/test/stderr/0013
+++ b/test/stderr/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config:
   extra characters follow string value for relay_hosts
diff --git a/test/stderr/0148 b/test/stderr/0148
index f7153995d..1b5b73a21 100644
--- a/test/stderr/0148
+++ b/test/stderr/0148
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 18 of TESTSUITE/test-config:
+  Exim configuration error in line 17 of TESTSUITE/test-config:
   missing quote at end of string value for hold_domains
diff --git a/test/stderr/0236 b/test/stderr/0236
index 75ed334bf..193370cc8 100644
--- a/test/stderr/0236
+++ b/test/stderr/0236
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 16 of TESTSUITE/test-config:
+  Exim configuration error in line 15 of TESTSUITE/test-config:
   macro name too long (maximum is 63 characters)
diff --git a/test/stderr/0290 b/test/stderr/0290
index 729780b71..cd1712e9f 100644
--- a/test/stderr/0290
+++ b/test/stderr/0290
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 28 of TESTSUITE/test-config:
+  Exim configuration error in line 27 of TESTSUITE/test-config:
   .include specifies a non-absolute path "non/absolute"
diff --git a/test/stderr/0348 b/test/stderr/0348
index d18082f4c..d2c59c2ad 100644
--- a/test/stderr/0348
+++ b/test/stderr/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
-1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config:
   bad parameters for retry rule
diff --git a/test/stderr/0415 b/test/stderr/0415
index 95b5e7f5e..062b67be5 100644
--- a/test/stderr/0415
+++ b/test/stderr/0415
@@ -1,30 +1,30 @@
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 20 of TESTSUITE/test-config:
   absolute value of integer "4000000M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 21 of TESTSUITE/test-config:
+  Exim configuration error in line 20 of TESTSUITE/test-config:
   extra characters follow integer value for check_spool_space
 LOG: PANIC DIE
-  Exim configuration error in line 22 of TESTSUITE/test-config:
+  Exim configuration error in line 21 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 22 of TESTSUITE/test-config:
+  Exim configuration error in line 21 of TESTSUITE/test-config:
   integer "4000000.123" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 23 of TESTSUITE/test-config:
   absolute value of integer "999999999999999999" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 23 of TESTSUITE/test-config:
   absolute value of integer "999999999K" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 23 of TESTSUITE/test-config:
   absolute value of integer "999999M" is too large (overflow)
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 23 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 23 of TESTSUITE/test-config:
   integer expected for finduser_retries
 LOG: PANIC DIE
-  Exim configuration error in line 24 of TESTSUITE/test-config:
+  Exim configuration error in line 23 of TESTSUITE/test-config:
   extra characters follow integer value for finduser_retries
diff --git a/test/stderr/0442 b/test/stderr/0442
index f8afd85ea..6db126e5a 100644
--- a/test/stderr/0442
+++ b/test/stderr/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config:
+1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config:
   failed to open included configuration file /non/existent