Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use stop_osp_task for SCANNER_TYPE_OSP_SENSOR (9.0) #955

Merged
merged 2 commits into from
Jan 23, 2020
Merged

Use stop_osp_task for SCANNER_TYPE_OSP_SENSOR (9.0) #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a9b5a
Use stop_osp_task for SCANNER_TYPE_OSP_SENSOR
timopollmeier Jan 23, 2020
5251f5c
Add OSP stop_task fix to CHANGELOG
timopollmeier Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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