From e47d0ce1c7a7b3af514b7db6b92f930fffff320d Mon Sep 17 00:00:00 2001 From: Andrew Bettison Date: Fri, 4 Nov 2016 11:49:24 +1030 Subject: [PATCH] Fix the RESTful keyring add/set http_status_message For successful requests (200), was being returned as "application/json", but should be "OK". --- keyring_restful.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyring_restful.c b/keyring_restful.c index 8abc0976..726ef31d 100644 --- a/keyring_restful.c +++ b/keyring_restful.c @@ -81,7 +81,7 @@ static int http_request_keyring_response(struct httpd_request *r, uint16_t resul return result; } -static int http_request_keyring_response_identity(struct httpd_request *r, uint16_t result, const char *message, const keyring_identity *id) +static int http_request_keyring_response_identity(struct httpd_request *r, uint16_t result, const keyring_identity *id) { const char *did = NULL; const char *name = NULL; @@ -121,7 +121,7 @@ static int http_request_keyring_response_identity(struct httpd_request *r, uint1 } r->http.response.result_extra[0].label = "identity"; r->http.response.result_extra[0].value = json_id; - return http_request_keyring_response(r, result, message); + return http_request_keyring_response(r, result, NULL); } static HTTP_CONTENT_GENERATOR restful_keyring_identitylist_json_content; @@ -228,7 +228,7 @@ static int restful_keyring_add(httpd_request *r, const char *remainder) } if (keyring_commit(keyring) == -1) return http_request_keyring_response(r, 500, "Could not store new identity"); - return http_request_keyring_response_identity(r, 200, CONTENT_TYPE_JSON, id); + return http_request_keyring_response_identity(r, 200, id); } static int restful_keyring_set(httpd_request *r, const char *remainder) @@ -247,5 +247,5 @@ static int restful_keyring_set(httpd_request *r, const char *remainder) return http_request_keyring_response(r, 500, "Could not set identity DID/Name"); if (keyring_commit(keyring) == -1) return http_request_keyring_response(r, 500, "Could not store new identity"); - return http_request_keyring_response_identity(r, 200, CONTENT_TYPE_JSON, id); + return http_request_keyring_response_identity(r, 200, id); }