Skip to content

Commit

Permalink
Merge pull request #955 from timopollmeier/osp-sensor-stop_task-9.0
Browse files Browse the repository at this point in the history
Use stop_osp_task for SCANNER_TYPE_OSP_SENSOR (9.0)
  • Loading branch information
mattmundell authored Jan 23, 2020
2 parents c24bc70 + 5251f5c commit db4c4ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit db4c4ed

Please sign in to comment.