From ce69ba6d58e84bf10d8ddc12481cd1402db3dba7 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Tue, 25 May 2021 10:37:47 +0200 Subject: [PATCH 1/2] Migrate GMP Scanners to OSP Sensors In migrate_233_to_234, GMP Scanners are now migrated to OSP Sensors instead of OpenVAS Scanners. The latter type should only be used for the default local scanner. (cherry picked from commit 29cbe80837f790fc1dffb0dba917811f81f05f40) --- src/manage_migrators.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/manage_migrators.c b/src/manage_migrators.c index 5ddf4a419..d665a5eb4 100644 --- a/src/manage_migrators.c +++ b/src/manage_migrators.c @@ -2342,9 +2342,9 @@ migrate_233_to_234 () " DROP column slave_host," " DROP column slave_port;"); - /* Convert existing GMP Scanners to OSP Scanners. */ - sql ("UPDATE scanners SET type = 2 WHERE type = 4;"); - sql ("UPDATE scanners_trash SET type = 2 WHERE type = 4;"); + /* Convert existing GMP Scanners to OSP Sensors. */ + sql ("UPDATE scanners SET type = 5 WHERE type = 4;"); + sql ("UPDATE scanners_trash SET type = 5 WHERE type = 4;"); /* Set the database version to 234. */ From b811632d483517d3027a7d274f495dc4e50fc4cb Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Tue, 25 May 2021 10:42:13 +0200 Subject: [PATCH 2/2] Add CHANGELOG entry for sensor migration fix (cherry picked from commit 9ac93aea3f3648ac38a5d51f1e0200035681c42a) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55d29356b..76f6388f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix migration to DB version 242 from gvmd 20.08 [#1498](https://github.com/greenbone/gvmd/pull/1498) - Update subject alternative name in certificate generation [#1503](https://github.com/greenbone/gvmd/pull/1503) - Fix whole-only config family selection [#1517](https://github.com/greenbone/gvmd/pull/1517) +- Migrate GMP Scanners to OSP Sensors [#1533](https://github.com/greenbone/gvmd/pull/1533) [21.4.0]: https://github.com/greenbone/gvmd/compare/v21.4.0...gvmd-21.04