TLS: Default tls_advertise_hosts to "*". Bug 1709

Make the option available in non-TLS builds, and clear in testsuite
confs as needed to keep TLS and non-TLS testcase outputs the same.

An error is logged at startup if tls_advertise_hosts is nonempty
but tls_certificate is not set.

9 files changed, 35 insertions, 19 deletions

diff --git a/test/paniclog/0013 b/test/paniclog/0013
index c9eb6412c..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 14 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 a2e75ff50..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 16 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 003f31154..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 14 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 b519863d3..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 26 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 f901fd4cf..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 24 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 24 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 24 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 24 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 7ead00c8e..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 19 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 19 of TESTSUITE/test-config:
-  extra characters follow integer value for check_spool_space
 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 21 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 20 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 22 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 22 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 22 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 22 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 22 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 22 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 2dd90dd48..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 42 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/paniclog/2020 b/test/paniclog/2020
new file mode 100644
index 000000000..e16a6800b
--- /dev/null
+++ b/test/paniclog/2020
@@ -0,0 +1,8 @@
+1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail.
+ Suggested action: either install a certificate or change tls_advertise_hosts option
+1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail.
+ Suggested action: either install a certificate or change tls_advertise_hosts option
+
+******** SERVER ********
+1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail.
+ Suggested action: either install a certificate or change tls_advertise_hosts option
diff --git a/test/paniclog/2120 b/test/paniclog/2120
new file mode 100644
index 000000000..e16a6800b
--- /dev/null
+++ b/test/paniclog/2120
@@ -0,0 +1,8 @@
+1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail.
+ Suggested action: either install a certificate or change tls_advertise_hosts option
+1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail.
+ Suggested action: either install a certificate or change tls_advertise_hosts option
+
+******** SERVER ********
+1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail.
+ Suggested action: either install a certificate or change tls_advertise_hosts option