diff options
| author | Gregory Noma <gregory.noma@gmail.com> | 2018-06-07 16:30:07 -0400 |
|---|---|---|
| committer | Gregory Noma <gregory.noma@gmail.com> | 2018-07-05 10:07:46 -0400 |
| commit | 96628864b50e4d0377dd920eef647e46c5bc5db8 (patch) | |
| tree | 36eb7c7133a1464e28d57bad7cc0e0fce4971ec5 /src/mongo/util/cmdline_utils | |
| parent | 711c076ef57c0ce3517ab9385c2fd3a005c941b3 (diff) | |
| download | mongo-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 'src/mongo/util/cmdline_utils')
| -rw-r--r-- | src/mongo/util/cmdline_utils/censor_cmdline.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mongo/util/cmdline_utils/censor_cmdline.cpp b/src/mongo/util/cmdline_utils/censor_cmdline.cpp index e903242ac75..9f0113b85b3 100644 --- a/src/mongo/util/cmdline_utils/censor_cmdline.cpp +++ b/src/mongo/util/cmdline_utils/censor_cmdline.cpp @@ -41,7 +41,9 @@ static bool _isPasswordSwitch(char const* switchName); static bool _isPasswordArgument(const char* argumentName) { static const char* const passwordArguments[] = { + "net.tls.PEMKeyPassword", "net.ssl.PEMKeyPassword", + "net.tls.clusterPassword", "net.ssl.clusterPassword", "processManagement.windowsService.servicePassword", "security.kmip.clientCertificatePassword", @@ -57,7 +59,9 @@ static bool _isPasswordArgument(const char* argumentName) { static bool _isPasswordSwitch(const char* switchName) { static const char* const passwordSwitches[] = { + "tlsPEMKeyPassword", "sslPEMKeyPassword", + "tlsClusterPassword", "sslClusterPassword", "servicePassword", "kmipClientCertificatePassword", |