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

Correct tables in delete_tls_certificates_user #695

Merged
merged 3 commits into from
Aug 14, 2019
Merged

Correct tables in delete_tls_certificates_user #695

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
f2cec2d
Correct tables in delete_tls_certificates_user
mattmundell Aug 14, 2019
e3dbfc4
Update changelog
mattmundell Aug 14, 2019
ff1c6b6
Merge branch 'master' into delete-user-tls
bjoernricks Aug 14, 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]

### Added
- Added TLS certificates as a new resource type [#585](https://github.com/greenbone/gvmd/pull/585) [#663](https://github.com/greenbone/gvmd/pull/663) [#673](https://github.com/greenbone/gvmd/pull/673)
- Added TLS certificates as a new resource type [#585](https://github.com/greenbone/gvmd/pull/585) [#663](https://github.com/greenbone/gvmd/pull/663) [#673](https://github.com/greenbone/gvmd/pull/673) [#695](https://github.com/greenbone/gvmd/pull/695)
- Update NVTs via OSP [#392](https://github.com/greenbone/gvmd/pull/392) [#609](https://github.com/greenbone/gvmd/pull/609) [#626](https://github.com/greenbone/gvmd/pull/626)
- Handle addition of ID to NVT preferences. [#413](https://github.com/greenbone/gvmd/pull/413)
- Add setting 'OMP Slave Check Period' [#491](https://github.com/greenbone/gvmd/pull/491)
Expand Down
6 changes: 1 addition & 5 deletions src/manage_sql_tls_certificates.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,7 @@ delete_tls_certificates_user (user_t user)
{
/* Regular tls_certificate. */

sql ("DELETE FROM tls_certificate WHERE owner = %llu;", user);

/* Trash tls_certificate. */

sql ("DELETE FROM tls_certificate_trash WHERE owner = %llu;", user);
bjoernricks marked this conversation as resolved.
Show resolved Hide resolved
sql ("DELETE FROM tls_certificates WHERE owner = %llu;", user);
}

/**
Expand Down