diff --git a/odyssey-dev.conf b/odyssey-dev.conf index 8f201ddc..1f65c55a 100644 --- a/odyssey-dev.conf +++ b/odyssey-dev.conf @@ -90,6 +90,7 @@ database "postgres" { authentication "none" storage "postgres_server" + storage_password "1" pool "session" pool_size 1 @@ -116,7 +117,7 @@ database "postgres" { client_max 107 } user default { - authentication "scram-sha-256" + authentication "md5" storage "postgres_server" diff --git a/sources/auth.c b/sources/auth.c index 0b606fa1..351eef59 100644 --- a/sources/auth.c +++ b/sources/auth.c @@ -830,9 +830,10 @@ static inline int od_auth_backend_sasl_continue(od_server_t *server, char *password; if (client != NULL && client->password.password != NULL) { - od_error(&instance->logger, "auth", NULL, server, - "cannot authenticate with SCRAM secret from auth_query", - route->rule->db_name, route->rule->user_name); + od_error( + &instance->logger, "auth", NULL, server, + "cannot authenticate with SCRAM secret from auth_query", + route->rule->db_name, route->rule->user_name); return -1; } else if (route->rule->storage_password) { diff --git a/sources/backend.c b/sources/backend.c index 5e6f7f65..0b81e513 100644 --- a/sources/backend.c +++ b/sources/backend.c @@ -101,7 +101,8 @@ int od_backend_ready(od_server_t *server, char *data, uint32_t size) } static inline int od_backend_startup(od_server_t *server, - kiwi_params_t *route_params, od_client_t *client) + kiwi_params_t *route_params, + od_client_t *client) { od_instance_t *instance = server->global->instance; od_route_t *route = server->route; diff --git a/sources/backend.h b/sources/backend.h index bff34108..a48fd0f0 100644 --- a/sources/backend.h +++ b/sources/backend.h @@ -7,7 +7,7 @@ * Scalable PostgreSQL connection pooler. */ -int od_backend_connect(od_server_t *, char *, kiwi_params_t *, od_client_t*); +int od_backend_connect(od_server_t *, char *, kiwi_params_t *, od_client_t *); int od_backend_connect_cancel(od_server_t *, od_rule_storage_t *, kiwi_key_t *); void od_backend_close_connection(od_server_t *); void od_backend_close(od_server_t *);