repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 21f33e591185fcd8ea5fa02924ffca6f7bf6a686:
path_to: 
revision_to: 

commit 21f33e591185fcd8ea5fa02924ffca6f7bf6a686
Author: Alexander Barton 
Date:   Wed May 6 23:55:23 2020 +0200

    SSL test server: Use port 6790, like "test server #2"

    Don't use the "standard" IRC SSL port 6697, as this easily collides with
    real (ng)IRCd instances running on the same machine.

    And by reusing port 6790, which is already used by the "test server #2",
    we don't need any other port than the test suite already uses.

diff --git a/src/testsuite/connect-ssl-cert1-test.e b/src/testsuite/connect-ssl-cert1-test.e

--- a/src/testsuite/connect-ssl-cert1-test.e
+++ b/src/testsuite/connect-ssl-cert1-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Server connect test

-spawn openssl s_client -quiet -connect 127.0.0.1:6697
+spawn openssl s_client -quiet -connect 127.0.0.1:6790
 expect {
         timeout { exit 1 }
         "*CN = my.first.domain.tld"
diff --git a/src/testsuite/connect-ssl-cert2-test.e b/src/testsuite/connect-ssl-cert2-test.e

--- a/src/testsuite/connect-ssl-cert2-test.e
+++ b/src/testsuite/connect-ssl-cert2-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Server connect test

-spawn openssl s_client -quiet -connect 127.0.0.1:6697
+spawn openssl s_client -quiet -connect 127.0.0.1:6790
 expect {
         timeout { exit 1 }
         "*CN = my.second.domain.tld"
diff --git a/src/testsuite/ngircd-test3.conf b/src/testsuite/ngircd-test3.conf

--- a/src/testsuite/ngircd-test3.conf
+++ b/src/testsuite/ngircd-test3.conf
@@ -13,7 +13,7 @@
         CertFile = ssl/cert.pem
         KeyFile = ssl/key.pem
         DHFile = ssl/dhparams.pem
-        Ports = 6697
+        Ports = 6790


 [Limits]

-----END OF PAGE-----