SERVER-29990 filterCommandRequestForPassthrough before sending to config server

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/db/commands.cpp b/src/mongo/db/commands.cpp
index c4e1ea6d2c1..5f5982d76f4 100644
--- a/src/mongo/db/commands.cpp
+++ b/src/mongo/db/commands.cpp
@@ -80,10 +80,10 @@ BSONObj Command::appendPassthroughFields(const BSONObj& cmdObjWithPassthroughFie
                                          const BSONObj& request) {
     BSONObjBuilder b;
     b.appendElements(request);
-    for (const auto& elem : cmdObjWithPassthroughFields) {
+    for (const auto& elem :
+         Command::filterCommandRequestForPassthrough(cmdObjWithPassthroughFields)) {
         const auto name = elem.fieldNameStringData();
-        // $db is one of the generic arguments, but is implicitly contained in request
-        if (Command::isGenericArgument(name) && !request.hasField(name) && name != "$db") {
+        if (Command::isGenericArgument(name) && !request.hasField(name)) {
             b.append(elem);
         }
     }