From a1864d212df70ca49e42ae900decf73f3de9d7f5 Mon Sep 17 00:00:00 2001
From: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Date: Wed, 30 Aug 2023 17:04:53 +0000
Subject: [PATCH] Backport #54066 to 23.7: Fix named_collection_admin alias

---
 src/Access/UsersConfigAccessStorage.cpp             | 2 +-
 tests/integration/test_storage_s3/configs/users.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index bb7d9dfd4f73..8f7f3cf0e075 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -287,7 +287,7 @@ namespace
         }
 
         bool access_management = config.getBool(user_config + ".access_management", false);
-        bool named_collection_control = config.getBool(user_config + ".named_collection_control", false);
+        bool named_collection_control = config.getBool(user_config + ".named_collection_control", false) || config.getBool(user_config + ".named_collection_admin", false);
         bool show_named_collections_secrets = config.getBool(user_config + ".show_named_collections_secrets", false);
 
         if (grant_queries)
diff --git a/tests/integration/test_storage_s3/configs/users.xml b/tests/integration/test_storage_s3/configs/users.xml
index 4b6ba057ecb1..dcc4c4b3092a 100644
--- a/tests/integration/test_storage_s3/configs/users.xml
+++ b/tests/integration/test_storage_s3/configs/users.xml
@@ -3,7 +3,7 @@
         <default>
             <password></password>
             <profile>default</profile>
-            <named_collection_control>1</named_collection_control>
+            <named_collection_admin>1</named_collection_admin>
         </default>
     </users>
 </clickhouse>