summaryrefslogtreecommitdiff
path: root/jstests/ssl/ssl_options.js
diff options
context:
space:
mode:
authorGregory Noma <gregory.noma@gmail.com>2018-06-07 16:30:07 -0400
committerGregory Noma <gregory.noma@gmail.com>2018-07-05 10:07:46 -0400
commit96628864b50e4d0377dd920eef647e46c5bc5db8 (patch)
tree36eb7c7133a1464e28d57bad7cc0e0fce4971ec5 /jstests/ssl/ssl_options.js
parent711c076ef57c0ce3517ab9385c2fd3a005c941b3 (diff)
downloadmongo-96628864b50e4d0377dd920eef647e46c5bc5db8.tar.gz
SERVER-29917 Alias server options starting with 'ssl' to parameters starting with 'tls'
Add support for deprecated single names. All 'ssl' options are now deprecated, superceded by their 'tls' counterparts. Add tests for these options in server_options_test. Re-add functionality of disableNonSSLConnectionLogging.
Diffstat (limited to 'jstests/ssl/ssl_options.js')
-rw-r--r--jstests/ssl/ssl_options.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/jstests/ssl/ssl_options.js b/jstests/ssl/ssl_options.js
index 9a85142804a..909fde4c82c 100644
--- a/jstests/ssl/ssl_options.js
+++ b/jstests/ssl/ssl_options.js
@@ -36,10 +36,10 @@ requireSSLProvider('openssl', function() {
}
}
- assert.eq(getCmdLineOptsResult.parsed.net.ssl.PEMKeyPassword,
+ assert.eq(getCmdLineOptsResult.parsed.net.tls.PEMKeyPassword,
"<password>",
"Password not properly censored: " + tojson(getCmdLineOptsResult));
- assert.eq(getCmdLineOptsResult.parsed.net.ssl.clusterPassword,
+ assert.eq(getCmdLineOptsResult.parsed.net.tls.clusterPassword,
"<password>",
"Password not properly censored: " + tojson(getCmdLineOptsResult));