aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2016-05-06 23:45:12 -0400
committerPeter Eisentraut <peter_e@gmx.net>2016-05-06 23:45:12 -0400
commitab32a4057229dc59ee83614b1fcc7fe242213a78 (patch)
treec43974425e7bfc4fa03d94f4074faaaf33914132 /src/test
parent196870f2fca7a4eec6f5b795dc75799f41e3ec7b (diff)
downloadpostgresql-ab32a4057229dc59ee83614b1fcc7fe242213a78.tar.gz
postgresql-ab32a4057229dc59ee83614b1fcc7fe242213a78.zip
Fix SSL tests
These were accidentally broken by the great backpatching of 331828b754378733cb5c2e49227603e7354e4e39.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ssl/ServerSetup.pm2
-rw-r--r--src/test/ssl/t/001_ssltests.pl2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/ssl/ServerSetup.pm b/src/test/ssl/ServerSetup.pm
index a8228b04c0f..65575e24f14 100644
--- a/src/test/ssl/ServerSetup.pm
+++ b/src/test/ssl/ServerSetup.pm
@@ -46,6 +46,7 @@ sub copy_files
sub configure_test_server_for_ssl
{
my $tempdir = $_[0];
+ my $serverhost = $_[1];
# Create test users and databases
psql 'postgres', "CREATE USER ssltestuser";
@@ -58,6 +59,7 @@ sub configure_test_server_for_ssl
print CONF "fsync=off\n";
print CONF "log_connections=on\n";
print CONF "log_hostname=on\n";
+ print CONF "listen_addresses='$serverhost'\n";
print CONF "log_statement=all\n";
# enable SSL and set up server key
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index 5d24d8de520..29ff8c590fe 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -84,7 +84,7 @@ chmod 0600, "ssl/client.key";
diag "setting up data directory in \"$tempdir\"...";
start_test_server($tempdir);
-configure_test_server_for_ssl($tempdir);
+configure_test_server_for_ssl($tempdir, $SERVERHOSTADDR);
switch_server_cert($tempdir, 'server-cn-only');
### Part 1. Run client-side tests.