hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1354: Rename enums to better represent their use

Browse Source 
Renamed permission types to PERM_BASIC and PERM_ADMIN to better represent
how the permission types are used.
This commit is contained in:
Markus Mäkelä
2017-08-15 10:21:05 +03:00
parent 4a179d973b
commit 829d8a1224
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/users.cc
View File

@ -26,13 +26,13 @@ namespace
enum permission_type enum permission_type
{ {
PERM_READ, PERM_BASIC,
PERM_WRITE PERM_ADMIN
}; };
struct UserInfo struct UserInfo
{ {
UserInfo(std::string pw = "", permission_type perm = PERM_WRITE): // TODO: Change default to PERM_READ UserInfo(std::string pw = "", permission_type perm = PERM_ADMIN): // TODO: Change default to PERM_BASIC
password(pw), password(pw),
permissions(perm) permissions(perm)
{ {
@ -217,19 +217,19 @@ bool users_auth(USERS* users, const char* user, const char* password)
bool users_is_admin(USERS* users, const char* user) bool users_is_admin(USERS* users, const char* user)
{ {
Users* u = reinterpret_cast<Users*>(users); Users* u = reinterpret_cast<Users*>(users);
return u->check_permissions(user, PERM_WRITE); return u->check_permissions(user, PERM_ADMIN);
} }
bool users_promote(USERS* users, const char* user) bool users_promote(USERS* users, const char* user)
{ {
Users* u = reinterpret_cast<Users*>(users); Users* u = reinterpret_cast<Users*>(users);
return u->set_permissions(user, PERM_WRITE); return u->set_permissions(user, PERM_ADMIN);
} }
bool users_demote(USERS* users, const char* user) bool users_demote(USERS* users, const char* user)
{ {
Users* u = reinterpret_cast<Users*>(users); Users* u = reinterpret_cast<Users*>(users);
return u->set_permissions(user, PERM_READ); return u->set_permissions(user, PERM_BASIC);
} }
void users_diagnostic(DCB* dcb, USERS* users) void users_diagnostic(DCB* dcb, USERS* users)