Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/RBAC: Fixed permissions conflict with 3.3.5 branch

Browse Source
This commit is contained in:
joschiwald
2017-12-30 23:15:15 +01:00
parent 299fad57fc
commit dc29473120
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/base/auth_database.sql
View File

@@ -1300,7 +1300,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
(198,828),
(198,834),
(198,852),
(198,867),
(198,868),
(199,207),
(199,209),
(199,210),
@@ -2024,7 +2024,7 @@ INSERT INTO `rbac_permissions` VALUES
(852,'Command: go offset'),
(853,'Command: .reload conversation_template'),
(854,'Command: .debug conversation'),
(867,'Command: modify power');
(868,'Command: modify power');
/*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2224,7 +2224,8 @@ INSERT INTO `updates` VALUES
('2017_08_13_00_auth_2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','RELEASED','2017-08-13 12:00:00',0),
('2017_09_22_00_auth.sql','9313CCE80A18212E6F0C78D83316DE8582AE8084','RELEASED','2017-09-22 18:05:17',0),
('2017_11_11_01_auth.sql','0D6EDB6B2FC8B9FBDF11ECD79B4B8E943328B6A9','RELEASED','2017-11-11 18:49:45',0),
('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','RELEASED','2017-12-30 00:23:32',0);
('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','RELEASED','2017-12-30 00:23:32',0),
('2017_12_30_01_auth.sql','41E2EA9D7A3B9C7DF0E694CD56C3E3F710A54DCD','RELEASED','2017-12-30 23:00:00',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;

10
sql/updates/auth/master/2017_12_30_01_auth.sql Normal file
View File

@@ -0,0 +1,10 @@
--
DELETE FROM `rbac_linked_permissions` WHERE `id`=198 AND `linkedId`=867;
DELETE FROM `rbac_permissions` WHERE `id`=867;
--
DELETE FROM `rbac_permissions` WHERE `id`=868;
INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
(867, 'Command: modify power');
DELETE FROM `rbac_linked_permissions` WHERE `id`=198 AND `linkedId`=868;
INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES (198, 867);

6
src/server/game/Accounts/RBAC.h
View File

@@ -771,7 +771,11 @@ enum RBACPermissions
RBAC_PERM_COMMAND_GROUP_MAINASSIST = 864, // reserved
RBAC_PERM_COMMAND_NPC_SHOWLOOT = 865, // reserved
RBAC_PERM_COMMAND_LIST_SPAWNPOINTS = 866, // reserved
RBAC_PERM_COMMAND_MODIFY_POWER = 867,
RBAC_PERM_COMMAND_RELOAD_QUEST_GREETING_LOCALE = 867, // reserved
RBAC_PERM_COMMAND_MODIFY_POWER = 868,
//
// IF YOU ADD NEW PERMISSIONS, ADD THEM IN 3.3.5 BRANCH AS WELL!
//
// custom permissions 1000+
RBAC_PERM_MAX
};