From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 15 Nov 2017 19:06:00 +0000 (+0000)
Subject: Testsuite: better debug output from "server" script-runner
X-Git-Tag: exim-4_90_RC3~16
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6678a497928ce105c4bce21c4d2eba4b3ecd4259;p=exim.git

Testsuite: better debug output from "server" script-runner
---

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 374f3a27f..3904c5098 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -5,7 +5,7 @@
 # As a result the expansion done and logged is misleading.
 #
 # Make RSA authentication the only acceptable
-exim -d-all+tls -DSERVER=server -DORDER=RSA -bd -oX PORT_D
+exim -DSERVER=server -DORDER=RSA -bd -oX PORT_D
 ****
 client-ssl 127.0.0.1 PORT_D
 ??? 220
diff --git a/test/src/server.c b/test/src/server.c
index 5af86d96f..d433ebe0e 100644
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -401,7 +401,7 @@ else
       sin6.sin6_addr = anyaddr6;
       if (bind(listen_socket[i], (struct sockaddr *)&sin6, sizeof(sin6)) < 0)
         {
-        printf("IPv6 socket bind() failed: %s\n", strerror(errno));
+        printf("IPv6 socket bind(port %d) failed: %s\n", port, strerror(errno));
         exit(1);
         }
       }
@@ -420,7 +420,7 @@ else
       if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)
         if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
           {
-          printf("IPv4 socket bind() failed: %s\n", strerror(errno));
+          printf("IPv4 socket bind(port %d) failed: %s\n", port, strerror(errno));
           exit(1);
           }
         else