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

Remove 1.3.6.1.4.1.25623.1.0.90011 from Discovery config (9.0) #847

Merged
merged 3 commits into from
Nov 1, 2019
Merged

Remove 1.3.6.1.4.1.25623.1.0.90011 from Discovery config (9.0) #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b712fc
Remove 1.3.6.1.4.1.25623.1.0.90011 from config
timopollmeier Oct 30, 2019
9ff3d91
Add NVT removal to CHANGELOG
timopollmeier Oct 30, 2019
5326a9d
Clean up NVT from existing Discovery config
timopollmeier Oct 30, 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 @@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- MODIFY_USER saves comment when COMMENT is empty [#842](https://github.com/greenbone/gvmd/pull/842)

### 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)

[9.0.1]: https://github.com/greenbone/gvmd/compare/v9.0.0...gvmd-9.0

Expand Down
8 changes: 7 additions & 1 deletion src/manage_config_discovery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,6 @@ make_config_discovery (char *const uuid, char *const selector_name)
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.80039", "Windows");
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.10394", "Windows");
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.10006", "Windows");
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.90011", "Windows");
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.900012", "Windows");
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.100062", "Windows");
NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.10674", "Windows");
Expand Down Expand Up @@ -986,5 +985,12 @@ check_config_discovery (const char *uuid)
"yes",
TRUE);

sql ("DELETE FROM nvt_selectors"
" WHERE family_or_nvt = '1.3.6.1.4.1.25623.1.0.90011'"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why github thinks the ' is a syntax error.

" AND type = %d"
" AND name = (SELECT nvt_selector FROM configs WHERE uuid = '%s')",
NVT_SELECTOR_TYPE_NVT,
uuid);

return 0;
}