Merge pull request #695 from mattmundell/delete-user-tls

Correct tables in delete_tls_certificates_user
greenbone · Aug 14, 2019 · 9dd6bde · 9dd6bde
2 parents 04d20bd + ff1c6b6
commit 9dd6bde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/src/manage_sql_tls_certificates.c b/src/manage_sql_tls_certificates.c
@@ -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);
+  sql ("DELETE FROM tls_certificates WHERE owner = %llu;", user);
 }
 
 /**