aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/auth/2013_09_10_14_auth_misc.sql4
-rw-r--r--sql/updates/world/2013_09_10_15_world_command.sql1
-rw-r--r--sql/updates/world/2013_09_10_16_world_command.sql2
-rw-r--r--src/server/game/Accounts/RBAC.h11
4 files changed, 12 insertions, 6 deletions
diff --git a/sql/updates/auth/2013_09_10_14_auth_misc.sql b/sql/updates/auth/2013_09_10_14_auth_misc.sql
new file mode 100644
index 00000000000..0f24f96ca99
--- /dev/null
+++ b/sql/updates/auth/2013_09_10_14_auth_misc.sql
@@ -0,0 +1,4 @@
+-- Remove obsolete permissions
+
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` IN (7, 8, 9, 10, 12);
+DELETE FROM `rbac_permissions` WHERE `id` IN (7, 8, 9, 10, 12);
diff --git a/sql/updates/world/2013_09_10_15_world_command.sql b/sql/updates/world/2013_09_10_15_world_command.sql
index f3601a3041b..ff70ba9b18d 100644
--- a/sql/updates/world/2013_09_10_15_world_command.sql
+++ b/sql/updates/world/2013_09_10_15_world_command.sql
@@ -3,7 +3,6 @@
SET @id = 761;
-- Update command table with new RBAC permissions
-UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'tele';
UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'ticket';
UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'ticket assign';
UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'ticket close';
diff --git a/sql/updates/world/2013_09_10_16_world_command.sql b/sql/updates/world/2013_09_10_16_world_command.sql
new file mode 100644
index 00000000000..3a3baf206b8
--- /dev/null
+++ b/sql/updates/world/2013_09_10_16_world_command.sql
@@ -0,0 +1,2 @@
+-- Update command table and remove obsolete permissions (0 = non existent permission)
+UPDATE `command` SET `permission` = 0 WHERE `permission` IN (7, 8, 9, 10, 12);
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 3d28ccca9da..c97bb391022 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -54,12 +54,12 @@ enum RBACPermissions
RBAC_PERM_JOIN_RANDOM_BG = 4,
RBAC_PERM_JOIN_ARENAS = 5,
RBAC_PERM_JOIN_DUNGEON_FINDER = 6,
- RBAC_PERM_PLAYER_COMMANDS = 7,
- RBAC_PERM_MODERATOR_COMMANDS = 8,
- RBAC_PERM_GAMEMASTER_COMMANDS = 9,
- RBAC_PERM_ADMINISTRATOR_COMMANDS = 10,
+ // 7 - reuse
+ // 8 - reuse
+ // 9 - reuse
+ // 10 - reuse
RBAC_PERM_LOG_GM_TRADE = 11,
- RBAC_PERM_CONSOLE_COMMANDS = 12, // Not pressent in DB
+ // 12 - reuse
RBAC_PERM_SKIP_CHECK_INSTANCE_REQUIRED_BOSSES = 13,
RBAC_PERM_SKIP_CHECK_CHARACTER_CREATION_TEAMMASK = 14,
RBAC_PERM_SKIP_CHECK_CHARACTER_CREATION_CLASSMASK = 15,
@@ -99,6 +99,7 @@ enum RBACPermissions
RBAC_PERM_EMAIL_CONFIRM_FOR_PASS_CHANGE = 49,
RBAC_PERM_MAY_CHECK_OWN_EMAIL = 50,
// Leave some space for core permissions
+
RBAC_PERM_COMMAND_RBAC = 200,
RBAC_PERM_COMMAND_RBAC_ACC = 201,
RBAC_PERM_COMMAND_RBAC_ACC_GROUP = 202,