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

MXS-1354: Rename user account type enum

Browse Source 
Renamed the enum and its values.
This commit is contained in:
Markus Mäkelä
2017-08-16 12:48:53 +03:00
parent 6ee7ed6a38
commit 9f81f0775f
9 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/adminusers.h.in
View File

@ -74,11 +74,11 @@ typedef struct admin_session
void admin_users_init();
const char* admin_enable_linux_account(const char *uname, enum account_type type);
const char* admin_enable_linux_account(const char *uname, enum user_account_type type);
const char* admin_disable_linux_account(const char *uname);
bool admin_linux_account_enabled(const char *uname);
const char* admin_add_inet_user(const char *uname, const char *password, enum account_type type);
const char* admin_add_inet_user(const char *uname, const char *password, enum user_account_type type);
const char* admin_remove_inet_user(const char* uname);
bool admin_inet_user_exists(const char *uname);
bool admin_verify_inet_user(const char *uname, const char *password);

14
include/maxscale/users.h
View File

@ -27,11 +27,11 @@
MXS_BEGIN_DECLS
/** User account types */
enum account_type
enum user_account_type
{
ACCOUNT_UNKNOWN,
ACCOUNT_BASIC, /**< Allows read-only access */
ACCOUNT_ADMIN /**< Allows complete access */
USER_ACCOUNT_UNKNOWN,
USER_ACCOUNT_BASIC, /**< Allows read-only access */
USER_ACCOUNT_ADMIN /**< Allows complete access */
};
/**
@ -65,7 +65,7 @@ void users_free(USERS* users);
*
* @return True if user was added
*/
bool users_add(USERS *users, const char *user, const char *password, enum account_type type);
bool users_add(USERS *users, const char *user, const char *password, enum user_account_type type);
/**
* Delete a user from the user table.
@ -186,7 +186,7 @@ json_t* users_diagnostic_json(USERS* users);
*
* @return String representation of @c type
*/
const char* account_type_to_str(enum account_type type);
const char* account_type_to_str(enum user_account_type type);
/**
* Convert JSON value to account_type value
@ -195,6 +195,6 @@ const char* account_type_to_str(enum account_type type);
*
* @return Enum value of @c json
*/
enum account_type json_to_account_type(json_t* json);
enum user_account_type json_to_account_type(json_t* json);
MXS_END_DECLS