From 22d2a4696c86a42662a86752a63fdb4ed9686ff7 Mon Sep 17 00:00:00 2001
From: mathisbessamdb <mathis.bessa@mongodb.com>
Date: Tue, 20 Dec 2022 22:46:37 +0000
Subject: SERVER-71855 ListDatabases returns all databases if no tenantId
 supplied

---
 src/mongo/db/commands/list_databases.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp
index e3aa35d36c2..ecb4694e57d 100644
--- a/src/mongo/db/commands/list_databases.cpp
+++ b/src/mongo/db/commands/list_databases.cpp
@@ -122,17 +122,8 @@ public:
                 Lock::GlobalLock lk(opCtx, MODE_IS);
                 CurOpFailpointHelpers::waitWhileFailPointEnabled(
                     &hangBeforeListDatabases, opCtx, "hangBeforeListDatabases", []() {});
-                auto tid = cmd.getDbName().tenantId();
-
-                if (gMultitenancySupport &&
-                    serverGlobalParams.featureCompatibility.isVersionInitialized() &&
-                    gFeatureFlagRequireTenantID.isEnabled(
-                        serverGlobalParams.featureCompatibility) &&
-                    !tid) {
-                    dbNames = {};
-                } else {
-                    dbNames = storageEngine->listDatabases(tid);
-                }
+
+                dbNames = storageEngine->listDatabases(cmd.getDbName().tenantId());
             }
             std::vector<ListDatabasesReplyItem> items;
             int64_t totalSize = list_databases::setReplyItems(opCtx,
-- 
cgit v1.2.1