Fixes for release candidate (#434)

* apply fmt * Fix od_reset retcode handling * fix error msg formatting
yandex · May 17, 2022 · 136dcca · 136dcca
1 parent 7929925
commit 136dcca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/sources/auth.c b/sources/auth.c
@@ -646,7 +646,7 @@ static inline int od_auth_frontend_block(od_client_t *client)
 	       client->startup.user.value);
 	od_frontend_error(
 		client, KIWI_INVALID_AUTHORIZATION_SPECIFICATION,
-		"user blocked%s%s",
+		"user blocked: %s %s",
 		client->rule->db_is_default ? " (unknown database)" : "",
 		client->rule->user_is_default ? " (unknown user)" : "");
 	return 0;

diff --git a/sources/console.c b/sources/console.c
@@ -740,7 +740,8 @@ static inline int od_console_show_databases_add_cb(od_route_t *route,
 		goto error;
 
 	/* force_user */
-	rc = kiwi_be_write_data_row_add(stream, offset, rule->user_name, rule->user_name_len);
+	rc = kiwi_be_write_data_row_add(stream, offset, rule->user_name,
+					rule->user_name_len);
 	if (rc == NOT_OK_RESPONSE)
 		goto error;
 

diff --git a/sources/frontend.c b/sources/frontend.c
@@ -1561,7 +1561,7 @@ od_frontend_remote_process_server(od_server_t *server, od_client_t *client)
 
 		/* cleanup server */
 		rc = od_reset(server);
-		if (rc == -1) {
+		if (rc != 1) {
 			return OD_ESERVER_WRITE;
 		}