summaryrefslogtreecommitdiff
path: root/src/mongo/db/server_options_helpers.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/server_options_helpers.cpp')
-rw-r--r--src/mongo/db/server_options_helpers.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp
index c3b525ba8a1..c521a8921ab 100644
--- a/src/mongo/db/server_options_helpers.cpp
+++ b/src/mongo/db/server_options_helpers.cpp
@@ -603,13 +603,11 @@ Status validateServerOptions(const moe::Environment& params) {
if (parameters.find("internalValidateFeaturesAsMaster") != parameters.end()) {
// Command line options that are disallowed when internalValidateFeaturesAsMaster is
// specified.
- for (const auto& disallowedOption : {"replication.replSet", "master", "slave"}) {
- if (params.count(disallowedOption)) {
- return Status(ErrorCodes::BadValue,
- str::stream()
- << "Cannot specify both internalValidateFeaturesAsMaster and "
- << disallowedOption);
- }
+ if (params.count("replication.replSet")) {
+ return Status(ErrorCodes::BadValue,
+ str::stream() << //
+ "Cannot specify both internalValidateFeaturesAsMaster and "
+ "replication.replSet");
}
}
}