From 3bcc4da61f3041703baebc56c8661dc4b878de74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Thu, 19 Sep 2019 11:24:59 +0200 Subject: [PATCH 1/3] Fix sql statement for updating owner of tls_certs --- src/manage_sql_tls_certificates.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manage_sql_tls_certificates.c b/src/manage_sql_tls_certificates.c index 3f207eee4..05e9c0ee2 100644 --- a/src/manage_sql_tls_certificates.c +++ b/src/manage_sql_tls_certificates.c @@ -928,7 +928,7 @@ inherit_tls_certificates (user_t user, user_t inheritor) { /* Regular tls_certificate. */ - sql ("UPDATE tls_certificate SET owner = %llu WHERE owner = %llu;", + sql ("UPDATE tls_certificates SET owner = %llu WHERE owner = %llu;", inheritor, user); /* Trash TLS certificates. */ From f77efbd36c85dd73ac5852c22dc7d5ceb0c358e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Thu, 19 Sep 2019 11:26:34 +0200 Subject: [PATCH 2/3] Drop sql statement for updating owner in tls_cert_trash table The tls_certificateS_trash table doesn't exist anymore. --- src/manage_sql_tls_certificates.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/manage_sql_tls_certificates.c b/src/manage_sql_tls_certificates.c index 05e9c0ee2..293d9db90 100644 --- a/src/manage_sql_tls_certificates.c +++ b/src/manage_sql_tls_certificates.c @@ -930,11 +930,6 @@ inherit_tls_certificates (user_t user, user_t inheritor) sql ("UPDATE tls_certificates SET owner = %llu WHERE owner = %llu;", inheritor, user); - - /* Trash TLS certificates. */ - - sql ("UPDATE tls_certificate_trash SET owner = %llu WHERE owner = %llu;", - inheritor, user); } /** From fee31a705ffa30a29e76754d12c4125cd3a2d93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Thu, 19 Sep 2019 12:06:05 +0200 Subject: [PATCH 3/3] Add changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 980239dff..934f85d68 100644 --- 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)