From 31a9b5a7aea5ad50273c3153e54024c63dbb745f Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Thu, 23 Jan 2020 11:45:50 +0100 Subject: [PATCH 1/2] Use stop_osp_task for SCANNER_TYPE_OSP_SENSOR Previously the default stop_task_internal was used for this scanner type, so the scans were not stopped correctly. --- src/manage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/manage.c b/src/manage.c index 97dd269f7..4b3fb3744 100644 --- a/src/manage.c +++ b/src/manage.c @@ -5777,7 +5777,8 @@ stop_task (const char *task_id) return 3; if (scanner_type (task_scanner (task)) == SCANNER_TYPE_OPENVAS - || scanner_type (task_scanner (task)) == SCANNER_TYPE_OSP) + || scanner_type (task_scanner (task)) == SCANNER_TYPE_OSP + || scanner_type (task_scanner (task)) == SCANNER_TYPE_OSP_SENSOR) return stop_osp_task (task); return stop_task_internal (task); From 5251f5c98d1c028e2a0e070fd4fec1f52c2f5e84 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Thu, 23 Jan 2020 11:49:19 +0100 Subject: [PATCH 2/2] Add OSP stop_task fix to CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90495d6a0..1660b96f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Correct pref ID in migrate_219_to_220 [#941](https://github.com/greenbone/gvmd/pull/941) - Set run status only after getting OSP-OpenVAS scan [#948](https://github.com/greenbone/gvmd/pull/948) [#951](https://github.com/greenbone/gvmd/pull/951) - Fix get_system_reports for GMP scanners [#949](https://github.com/greenbone/gvmd/pull/949) +- Use stop_osp_task for SCANNER_TYPE_OSP_SENSOR [#955](https://github.com/greenbone/gvmd/pull/955) ### Removed - Remove 1.3.6.1.4.1.25623.1.0.90011 from Discovery config (9.0) [#847](https://github.com/greenbone/gvmd/pull/847)