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

Apply usage_type of tasks in get_aggregates (9.0) #912

Merged
merged 3 commits into from
Dec 23, 2019
Merged

Apply usage_type of tasks in get_aggregates (9.0) #912

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dbefbd
Apply usage_type of tasks in get_aggregates
timopollmeier Dec 18, 2019
2bb2d47
Add tasks usage_type fix to CHANGELOG
timopollmeier Dec 18, 2019
b7cbe85
Test if extra_params is NULL in type_extra_where
timopollmeier Dec 19, 2019
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 @@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Use right format specifier for merge_ovaldef version [#874](https://github.com/greenbone/gvmd/pull/874)
- Fix creation of "Super" permissions [#892](https://github.com/greenbone/gvmd/pull/892)
- Setup general task preferences to launch an osp openvas task. [#898](https://github.com/greenbone/gvmd/pull/898)
- Apply usage_type of tasks in get_aggregates (9.0) [#912](https://github.com/greenbone/gvmd/pull/912)

### 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
6 changes: 2 additions & 4 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64721,10 +64721,8 @@ type_extra_where (const char *type, int trash, const char *filter,
}
else if (strcasecmp (type, "TASK") == 0)
{
if (trash)
extra_where = g_strdup (" AND hidden = 2");
else
extra_where = g_strdup (" AND hidden = 0");
gchar *usage_type = g_hash_table_lookup (extra_params, "usage_type");
extra_where = tasks_extra_where (trash, usage_type);
}
else if (strcasecmp (type, "TLS_CERTIFICATE") == 0)
{
Expand Down