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

Split secrets.h to public and core + miscellaneous cleanup

Browse Source 
Also, changed some function names to this_style from thisStyle. More of
this in later commits.
This commit is contained in:
Esa Korhonen
2017-01-27 13:14:31 +02:00
parent 6cc205dafa
commit 1f9b18e3bc
15 changed files with 107 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
View File

@ -436,7 +436,7 @@ cdc_set_service_user(SERV_LISTENER *listener)
return 1;
}
dpwd = decryptPassword(service->credentials.authdata);
dpwd = decrypt_password(service->credentials.authdata);
if (!dpwd)
{

2
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
View File

@ -547,7 +547,7 @@ int gssapi_auth_load_users(SERV_LISTENER *listener)
int rval = MXS_AUTH_LOADUSERS_ERROR;
GSSAPI_INSTANCE *inst = (GSSAPI_INSTANCE*)listener->auth_instance;
if (serviceGetUser(listener->service, &user, &pw) && (pw = decryptPassword(pw)))
if (serviceGetUser(listener->service, &user, &pw) && (pw = decrypt_password(pw)))
{
for (SERVER_REF *servers = listener->service->dbref; servers; servers = servers->next)
{

2
server/modules/authenticator/HTTPAuth/http_auth.c
View File

@ -103,7 +103,7 @@ http_auth_authenticate(DCB *dcb)
HTTP_AUTH *ses = (HTTP_AUTH*)dcb->data;
char *user, *pw;
serviceGetUser(dcb->service, &user, &pw);
pw = decryptPassword(pw);
pw = decrypt_password(pw);
if (ses && strcmp(ses->user, user) == 0 && strcmp(ses->pw, pw) == 0)
{

6
server/modules/authenticator/MySQLAuth/dbusers.c
View File

@ -739,7 +739,7 @@ get_all_users(SERV_LISTENER *listener, USERS *users)
return -1;
}
dpwd = decryptPassword(service_passwd);
dpwd = decrypt_password(service_passwd);
final_data = (char*) MXS_MALLOC(sizeof(char));
MXS_ABORT_IF_NULL(final_data);
*final_data = '\0';
@ -1236,7 +1236,7 @@ get_users(SERV_LISTENER *listener, USERS *users)
* to try
*/
server = service->dbref;
dpwd = decryptPassword(service_passwd);
dpwd = decrypt_password(service_passwd);
/* Select a server with Master bit, if available */
while (server != NULL && !(server->server->status & SERVER_MASTER))
@ -2685,7 +2685,7 @@ bool check_service_permissions(SERVICE* service)
return false;
}
char *dpasswd = decryptPassword(password);
char *dpasswd = decrypt_password(password);
bool rval = false;
for (SERVER_REF *server = service->dbref; server; server = server->next)

2
server/modules/authenticator/MySQLAuth/mysql_auth.c
View File

@ -836,7 +836,7 @@ static bool add_service_user(SERV_LISTENER *port)
if (serviceGetUser(port->service, &user, &pw))
{
pw = decryptPassword(pw);
pw = decrypt_password(pw);
if (pw)
{