From f11664a316a69b27601d0e5833d065ba1246530b Mon Sep 17 00:00:00 2001 From: Matt Mundell Date: Wed, 31 Jul 2024 14:22:34 +0200 Subject: [PATCH 1/2] Remove redundant note_id field Field is already available as get.id from get_data_parse_attributes. --- src/gmp.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gmp.c b/src/gmp.c index 31105788a..b8d035a8a 100644 --- a/src/gmp.c +++ b/src/gmp.c @@ -1793,7 +1793,6 @@ get_info_data_reset (get_info_data_t *data) typedef struct { get_data_t get; ///< Get args. - char *note_id; ///< ID of single note to get. char *nvt_oid; ///< OID of NVT to which to limit listing. char *task_id; ///< ID of task to which to limit listing. int result; ///< Boolean. Whether to include associated results. @@ -1807,7 +1806,6 @@ typedef struct static void get_notes_data_reset (get_notes_data_t *data) { - free (data->note_id); free (data->nvt_oid); free (data->task_id); @@ -5332,7 +5330,7 @@ gmp_xml_handle_start_element (/* unused */ GMarkupParseContext* context, attribute_names, attribute_values); set_client_state (CLIENT_GET_LICENSE); - } + } else if (strcasecmp ("GET_NOTES", element_name) == 0) { const gchar* attribute; @@ -5341,9 +5339,6 @@ gmp_xml_handle_start_element (/* unused */ GMarkupParseContext* context, attribute_names, attribute_values); - append_attribute (attribute_names, attribute_values, "note_id", - &get_notes_data->note_id); - append_attribute (attribute_names, attribute_values, "nvt_oid", &get_notes_data->nvt_oid); @@ -13648,12 +13643,12 @@ handle_get_notes (gmp_parser_t *gmp_parser, GError **error) nvt_t nvt = 0; task_t task = 0; - if (get_notes_data->note_id && get_notes_data->nvt_oid) + if (get_notes_data->get.id && get_notes_data->nvt_oid) SEND_TO_CLIENT_OR_FAIL (XML_ERROR_SYNTAX ("get_notes", "Only one of NVT and the note_id attribute" " may be given")); - else if (get_notes_data->note_id && get_notes_data->task_id) + else if (get_notes_data->get.id && get_notes_data->task_id) SEND_TO_CLIENT_OR_FAIL (XML_ERROR_SYNTAX ("get_notes", "Only one of the note_id and task_id" From 8d01d17f856a9336f382b97d7f4b20ded6607d12 Mon Sep 17 00:00:00 2001 From: Matt Mundell Date: Wed, 31 Jul 2024 14:27:29 +0200 Subject: [PATCH 2/2] Remove redundant override_id field Field is already available as get.id from get_data_parse_attributes. --- src/gmp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gmp.c b/src/gmp.c index b8d035a8a..9d3ae94c7 100644 --- a/src/gmp.c +++ b/src/gmp.c @@ -1874,7 +1874,6 @@ get_nvt_families_data_reset (get_nvt_families_data_t *data) typedef struct { get_data_t get; ///< Get args. - char *override_id; ///< ID of override to get. char *nvt_oid; ///< OID of NVT to which to limit listing. char *task_id; ///< ID of task to which to limit listing. int result; ///< Boolean. Whether to include associated results. @@ -1888,7 +1887,6 @@ typedef struct static void get_overrides_data_reset (get_overrides_data_t *data) { - free (data->override_id); free (data->nvt_oid); free (data->task_id); @@ -5429,9 +5427,6 @@ gmp_xml_handle_start_element (/* unused */ GMarkupParseContext* context, attribute_names, attribute_values); - append_attribute (attribute_names, attribute_values, "override_id", - &get_overrides_data->override_id); - append_attribute (attribute_names, attribute_values, "nvt_oid", &get_overrides_data->nvt_oid); @@ -14048,12 +14043,12 @@ handle_get_overrides (gmp_parser_t *gmp_parser, GError **error) nvt_t nvt = 0; task_t task = 0; - if (get_overrides_data->override_id && get_overrides_data->nvt_oid) + if (get_overrides_data->get.id && get_overrides_data->nvt_oid) SEND_TO_CLIENT_OR_FAIL (XML_ERROR_SYNTAX ("get_overrides", "Only one of NVT and the override_id attribute" " may be given")); - else if (get_overrides_data->override_id + else if (get_overrides_data->get.id && get_overrides_data->task_id) SEND_TO_CLIENT_OR_FAIL (XML_ERROR_SYNTAX ("get_overrides",