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

MXS-1354: Allow creation of basic users

Browse Source 
The type of the user being created is defined at creation time. This
allows the creation of basic users.

Although the users can be created internally, they cannot yet be created
via maxadmin or the REST API.
This commit is contained in:
Markus Mäkelä
2017-08-15 14:15:59 +03:00
parent 829d8a1224
commit 253d6d211f
5 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/adminusers.cc
View File

@ -62,7 +62,7 @@ static const char *admin_add_user(USERS** pusers, const char* fname,
const char* uname, const char* password)
{
FILE *fp;
char path[PATH_MAX], *home;
char path[PATH_MAX];
if (access(get_datadir(), F_OK) != 0)
{
@ -83,20 +83,22 @@ static const char *admin_add_user(USERS** pusers, const char* fname,
}
if ((fp = fopen(path, "w")) == NULL)
{
MXS_ERROR("Unable to create password file %s.", path);
MXS_ERROR("Unable to create password file %s: %d, %s", path,
errno, mxs_strerror(errno));
return ADMIN_ERR_PWDFILEOPEN;
}
fclose(fp);
}
if (!users_add(*pusers, uname, password ? password : ""))
if (!users_add(*pusers, uname, password ? password : "", ACCOUNT_ADMIN))
{
return ADMIN_ERR_DUPLICATE;
}
if ((fp = fopen(path, "a")) == NULL)
{
MXS_ERROR("Unable to append to password file %s.", path);
MXS_ERROR("Unable to append to password file %s: %d, %s", path,
errno, mxs_strerror(errno));
return ADMIN_ERR_FILEAPPEND;
}
if (password)
@ -401,7 +403,7 @@ loadUsers(const char *fname)
password = "";
}
if (users_add(rval, uname, password))
if (users_add(rval, uname, password, ACCOUNT_ADMIN))
{
added_users++;
}