Merge branch 'master' into lean-report

greenbone · Sep 19, 2019 · 32e9cf4 · 32e9cf4
2 parents cf37048 + 5a98489
commit 32e9cf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 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) [#695](https://github.com/greenbone/gvmd/pull/695) [#703](https://github.com/greenbone/gvmd/pull/703) [#728](https://github.com/greenbone/gvmd/pull/728) [#732](https://github.com/greenbone/gvmd/pull/732) [#750](https://github.com/greenbone/gvmd/pull/750)
+- 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) [#703](https://github.com/greenbone/gvmd/pull/703) [#728](https://github.com/greenbone/gvmd/pull/728) [#732](https://github.com/greenbone/gvmd/pull/732) [#750](https://github.com/greenbone/gvmd/pull/750) [#752](https://github.com/greenbone/gvmd/pull/752)
 - 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
@@ -928,12 +928,7 @@ inherit_tls_certificates (user_t user, user_t inheritor)
 {
   /* Regular tls_certificate. */
 
-  sql ("UPDATE tls_certificate SET owner = %llu WHERE owner = %llu;",
-       inheritor, user);
-
-  /* Trash TLS certificates. */
-
-  sql ("UPDATE tls_certificate_trash SET owner = %llu WHERE owner = %llu;",
+  sql ("UPDATE tls_certificates SET owner = %llu WHERE owner = %llu;",
        inheritor, user);
 }