diff --git a/CMakeLists.txt b/CMakeLists.txt
index 380d8b4e9..1aca5286b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018 Greenbone Networks GmbH
+# Copyright (C) 2009-2019 Greenbone Networks GmbH
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
@@ -117,7 +117,7 @@ include (CPack)
 
 ## Variables
 
-set (GVMD_DATABASE_VERSION 206)
+set (GVMD_DATABASE_VERSION 208)
 
 set (GVMD_SCAP_DATABASE_VERSION 15)
 
diff --git a/INSTALL.md b/INSTALL.md
index 7fda707b0..60dc302d2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,7 +18,7 @@ Prerequisites:
 * cmake >= 3.0
 * glib-2.0 >= 2.42
 * gnutls >= 3.2.15
-* libgvm_base, libgvm_util, libgvm_osp, libgvm_gmp >= 1.0.0
+* libgvm_base, libgvm_util, libgvm_osp, libgvm_gmp >= 11.0.0
 * sqlite3 library >= 3.8.3 or PostgreSQL database
 * pkg-config
 * libical >= 1.0.0
@@ -161,8 +161,8 @@ properly.
    If the `gsf-access-key` file was already migrated for the `openvas-scanner`
    module it can be removed from the `$prefix/etc/openvas/` directory.
 
- - move ´$prefix/var/lib/openvas/scap-data`` to
-   $prefix/var/lib/gvm/scap-data
+ - move `$prefix/var/lib/openvas/scap-data` to
+   `$prefix/var/lib/gvm/scap-data`
 
  - move `$prefix/var/lib/openvas/cert-data` to
    `$prefix/var/lib/gvm/cert-data`
@@ -180,8 +180,10 @@ properly.
    `$prefix/var/lib/gvm/gvmd/gvmd.db`
 
  - (Postgres backend only) rename database to `gvmd`:
-       sudo -u postgres sh
-       psql --command='ALTER DATABASE tasks RENAME TO gvmd;'
+    ```
+    sudo -u postgres sh
+    psql --command='ALTER DATABASE tasks RENAME TO gvmd;'
+    ```
 
 
 Migrating the Database
diff --git a/report_formats/HTML/HTML.xsl b/report_formats/HTML/HTML.xsl
index 41738c711..64c02bba6 100644
--- a/report_formats/HTML/HTML.xsl
+++ b/report_formats/HTML/HTML.xsl
@@ -13,7 +13,7 @@
               encoding="UTF-8" />
 
 <!--
-Copyright (C) 2010-2018 Greenbone Networks GmbH
+Copyright (C) 2010-2019 Greenbone Networks GmbH
 
 SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -351,13 +351,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     </xsl:if>
   </xsl:template>
 
-  <xsl:template name="ref_cert_list">
-    <xsl:param name="certlist"/>
+  <xsl:template name="ref_list">
+    <xsl:param name="reflist"/>
     <xsl:variable name="token" select="/envelope/token"/>
-    <xsl:variable name="certcount" select="count($certlist/cert_ref)"/>
+    <xsl:variable name="refcount" select="count($reflist/ref)"/>
 
-    <xsl:if test="count($certlist/warning)">
-      <xsl:for-each select="$certlist/warning">
+    <xsl:if test="count($reflist/warning)">
+      <xsl:for-each select="$reflist/warning">
         <tr valign="top">
           <td>CERT:</td>
           <td><i>Warning: <xsl:value-of select="text()"/></i></td>
@@ -365,13 +365,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
       </xsl:for-each>
     </xsl:if>
 
-    <xsl:if test="$certcount &gt; 0">
+    <xsl:if test="$refcount &gt; 0">
       <tr valign="top">
         <td>CERT:</td>
         <td>
-          <xsl:for-each select="$certlist/cert_ref">
+          <xsl:for-each select="$reflist/ref">
             <xsl:value-of select="@id"/>
-            <xsl:if test="position() &lt; $certcount">
+            <xsl:if test="position() &lt; $refcount">
               <xsl:text>, </xsl:text>
             </xsl:if>
           </xsl:for-each>
@@ -665,14 +665,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <xsl:value-of select="nvt/bid/text()"/>
           </xsl:if>
         </xsl:variable>
-        <xsl:variable name="cert_ref" select="nvt/cert"/>
+        <xsl:variable name="refs" select="nvt/refs"/>
         <xsl:variable name="xref">
           <xsl:if test="nvt/xref != '' and nvt/xref != 'NOXREF'">
             <xsl:value-of select="nvt/xref/text()"/>
           </xsl:if>
         </xsl:variable>
 
-        <xsl:if test="$cve_ref != '' or $bid_ref != '' or $xref != '' or count($cert_ref/cert_ref) > 0">
+        <xsl:if test="$cve_ref != '' or $bid_ref != '' or $xref != '' or count($refs/ref) > 0">
           <div class="result_section">
             <b>References</b><br/>
             <p>
@@ -683,8 +683,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
                 <xsl:call-template name="ref_bid_list">
                   <xsl:with-param name="bidlist" select="$bid_ref"/>
                 </xsl:call-template>
-                <xsl:call-template name="ref_cert_list">
-                  <xsl:with-param name="certlist" select="$cert_ref"/>
+                <xsl:call-template name="ref_list">
+                  <xsl:with-param name="reflist" select="$refs"/>
                 </xsl:call-template>
                 <xsl:call-template name="ref_xref_list">
                   <xsl:with-param name="xreflist" select="$xref"/>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 482e76ac0..a56f89a02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018 Greenbone Networks GmbH
+# Copyright (C) 2009-2019 Greenbone Networks GmbH
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
@@ -27,10 +27,10 @@ find_package (Threads)
 ## list and throw an error, otherwise long install-cmake-install-cmake cycles
 ## might occur.
 
-pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=1.0.0)
-pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=1.0.0)
-pkg_check_modules (LIBGVM_OSP REQUIRED libgvm_osp>=1.0.0)
-pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=1.0.0)
+pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=11.0.0)
+pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=11.0.0)
+pkg_check_modules (LIBGVM_OSP REQUIRED libgvm_osp>=11.0.0)
+pkg_check_modules (LIBGVM_GMP REQUIRED libgvm_gmp>=11.0.0)
 pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
 pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
 pkg_check_modules (LIBICAL REQUIRED libical>=1.00)
@@ -237,9 +237,9 @@ if (GVM_NVT_DIR)
         add_definitions (-DGVM_NVT_DIR="${GVM_NVT_DIR}")
 endif (GVM_NVT_DIR)
 
-if (SBINDIR)
-  add_definitions (-DSBINDIR="${SBINDIR}")
-endif (SBINDIR)
+if (BINDIR)
+  add_definitions (-DBINDIR="${BINDIR}")
+endif (BINDIR)
 
 if (DEFINED GVM_SQLITE_SLEEP_MAX)
         add_definitions (-DGVM_SQLITE_SLEEP_MAX=${GVM_SQLITE_SLEEP_MAX})
diff --git a/src/alert_methods/SMB/alert b/src/alert_methods/SMB/alert
index c55dd2623..71806d6df 100755
--- a/src/alert_methods/SMB/alert
+++ b/src/alert_methods/SMB/alert
@@ -34,7 +34,7 @@ def smb_error_print(message, stdout, stderr):
 
 
 def smb_call(auth_path, share, command):
-    args = ["smbclient", "-m", "SMB3", "-A", auth_path, share, "-c", command]
+    args = ["smbclient", "-A", auth_path, share, "-c", command]
     retries = 10
     stdout = ''
     stderr = ''
diff --git a/src/alert_methods/TippingPoint/report-convert.py b/src/alert_methods/TippingPoint/report-convert.py
index 852cd356a..3f6c15d44 100755
--- a/src/alert_methods/TippingPoint/report-convert.py
+++ b/src/alert_methods/TippingPoint/report-convert.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # coding: utf-8
-# Copyright (C) 2018 Greenbone Networks GmbH
+# Copyright (C) 2019 Greenbone Networks GmbH
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
@@ -135,9 +135,17 @@ def convert (xml_tree, out_file):
     ip = result_elem.find ('host').text
     description = result_elem.find ('description').text
 
+    nvt_cve = '';
     nvt_elem = result_elem.find ('nvt')
-    nvt_cve = nvt_elem.find ('cve').text;
-    if (nvt_cve == 'NOCVE' or nvt_cve == '' or nvt_cve is None):
+    nvt_refs = nvt_elem.find ('refs');
+    for ref in nvt_refs.findall('ref'):
+      if (ref.attrib['type'] == 'cve'):
+        if (nvt_cve == ''):
+          nvt_cve = ref.attrib['id'];
+        else:
+          nvt_cve = nvt_cve + ', ' + ref.attrib['id'];
+
+    if (nvt_cve == '' or nvt_cve is None):
       continue;
 
     nvt_oid = nvt_elem.attrib['oid']
diff --git a/src/gmp.c b/src/gmp.c
index 51a2f429e..f866e7e4a 100644
--- a/src/gmp.c
+++ b/src/gmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Greenbone Networks GmbH
+/* Copyright (C) 2009-2019 Greenbone Networks GmbH
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
@@ -556,6 +556,7 @@ command_disabled (gmp_parser_t *gmp_parser, const gchar *name)
 /**
  * @brief Create a new preference.
  *
+ * @param[in]  id        ID of preference.
  * @param[in]  name      Name of preference.
  * @param[in]  type      Type of preference.
  * @param[in]  value     Value of preference.
@@ -568,13 +569,14 @@ command_disabled (gmp_parser_t *gmp_parser, const gchar *name)
  * @return Newly allocated preference.
  */
 static gpointer
-preference_new (char *name, char *type, char *value, char *nvt_name,
+preference_new (char *id, char *name, char *type, char *value, char *nvt_name,
                 char *nvt_oid, array_t *alts, char* default_value,
                 char *hr_name)
 {
   preference_t *preference;
 
   preference = (preference_t*) g_malloc0 (sizeof (preference_t));
+  preference->id = id;
   preference->name = name;
   preference->type = type;
   preference->value = value;
@@ -693,6 +695,7 @@ typedef struct
   char *preference_alt;              ///< Single radio alternative in PREFERENCE.
   char *preference_default;          ///< Default value in PREFERENCE.
   char *preference_hr_name;          ///< Human readable name in PREFERENCE.
+  char *preference_id;               ///< ID in PREFERENCE.
   char *preference_name;             ///< Name in PREFERENCE.
   char *preference_nvt_name;         ///< NVT name in PREFERENCE.
   char *preference_nvt_oid;          ///< NVT OID in PREFERENCE.
@@ -749,8 +752,9 @@ create_config_data_reset (create_config_data_t *data)
     }
 
   g_free (import->preference_alt);
+  g_free (import->preference_id);
   g_free (import->preference_name);
-  g_free (import->preference_name);
+  g_free (import->preference_hr_name);
   g_free (import->preference_nvt_name);
   g_free (import->preference_nvt_oid);
   g_free (import->preference_type);
@@ -2879,6 +2883,7 @@ typedef struct
   array_t *nvt_selection;              ///< OID array. New NVT set for config.
   char *nvt_selection_family;          ///< Family of NVT selection.
   char *nvt_selection_nvt_oid;         ///< OID during NVT_selection/NVT.
+  char *preference_id;                 ///< Config preference to modify.
   char *preference_name;               ///< Config preference to modify.
   char *preference_nvt_oid;            ///< OID of NVT of preference.
   char *preference_value;              ///< New value for preference.
@@ -3112,6 +3117,7 @@ modify_config_data_reset (modify_config_data_t *data)
   array_free (data->nvt_selection);
   free (data->nvt_selection_family);
   free (data->nvt_selection_nvt_oid);
+  free (data->preference_id);
   free (data->preference_name);
   free (data->preference_nvt_oid);
   free (data->preference_value);
@@ -4822,7 +4828,7 @@ static GMarkupParser xml_parser;
 /**
  * @brief The nvt synchronization script for this daemon.
  */
-static const gchar *nvt_sync_script = SBINDIR "/greenbone-nvt-sync";
+static const gchar *nvt_sync_script = BINDIR "/greenbone-nvt-sync";
 
 
 /* Client state. */
@@ -4914,6 +4920,7 @@ typedef enum
   CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_DEFAULT,
   CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_HR_NAME,
   CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NAME,
+  CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_ID,
   CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NVT,
   CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NVT_NAME,
   CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_TYPE,
@@ -5288,6 +5295,7 @@ typedef enum
   CLIENT_MODIFY_CONFIG_NVT_SELECTION_FAMILY,
   CLIENT_MODIFY_CONFIG_NVT_SELECTION_NVT,
   CLIENT_MODIFY_CONFIG_PREFERENCE,
+  CLIENT_MODIFY_CONFIG_PREFERENCE_ID,
   CLIENT_MODIFY_CONFIG_PREFERENCE_NAME,
   CLIENT_MODIFY_CONFIG_PREFERENCE_NVT,
   CLIENT_MODIFY_CONFIG_PREFERENCE_VALUE,
@@ -7235,6 +7243,7 @@ gmp_xml_handle_start_element (/* unused */ GMarkupParseContext* context,
           }
         else if (strcasecmp ("PREFERENCE", element_name) == 0)
           {
+            gvm_free_string_var (&modify_config_data->preference_id);
             gvm_free_string_var (&modify_config_data->preference_name);
             gvm_free_string_var (&modify_config_data->preference_nvt_oid);
             gvm_free_string_var (&modify_config_data->preference_value);
@@ -8084,6 +8093,9 @@ gmp_xml_handle_start_element (/* unused */ GMarkupParseContext* context,
         else if (strcasecmp ("HR_NAME", element_name) == 0)
           set_client_state
            (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_HR_NAME);
+        else if (strcasecmp ("ID", element_name) == 0)
+          set_client_state
+           (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_ID);
         else if (strcasecmp ("NAME", element_name) == 0)
           set_client_state
            (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NAME);
@@ -10120,7 +10132,7 @@ void
 buffer_config_preference_xml (GString *buffer, iterator_t *prefs,
                               config_t config, int hide_passwords)
 {
-  char *real_name, *type, *value, *oid, *nvt = NULL;
+  char *real_name, *type, *value, *oid, *id, *nvt = NULL;
   const char *default_value;
 
   oid = nvt_preference_iterator_oid (prefs);
@@ -10128,17 +10140,20 @@ buffer_config_preference_xml (GString *buffer, iterator_t *prefs,
   real_name = nvt_preference_iterator_real_name (prefs);
   default_value = nvt_preference_iterator_value (prefs);
   value = nvt_preference_iterator_config_value (prefs, config);
+  id = nvt_preference_iterator_id (prefs);
 
   if (oid)
     nvt = nvt_name (oid);
   buffer_xml_append_printf (buffer,
                             "<preference>"
                             "<nvt oid=\"%s\"><name>%s</name></nvt>"
+                            "<id>%s</id>"
                             "<hr_name>%s</hr_name>"
                             "<name>%s</name>"
                             "<type>%s</type>",
                             oid ? oid : "",
                             nvt ? nvt : "",
+                            id ? id : "",
                             real_name ? real_name : "",
                             real_name ? real_name : "",
                             type ? type : "");
@@ -10423,7 +10438,7 @@ add_detail (GString *buffer, const gchar *name, const gchar *value)
 }
 
 /**
- * @brief Append a CERT element to an XML buffer.
+ * @brief Append a REFS element to an XML buffer.
  *
  * @param[in]  buffer       Buffer.
  * @param[in]  oid          OID.
@@ -10437,7 +10452,6 @@ results_xml_append_cert (GString *buffer, const char *oid, int cert_loaded,
 {
   iterator_t cert_refs_iterator;
 
-  buffer_xml_append_printf (buffer, "<cert>");
   if (cert_loaded)
     {
       if (has_cert_bunds)
@@ -10446,7 +10460,7 @@ results_xml_append_cert (GString *buffer, const char *oid, int cert_loaded,
           while (next (&cert_refs_iterator))
             {
               g_string_append_printf
-               (buffer, "<cert_ref type=\"CERT-Bund\" id=\"%s\"/>",
+               (buffer, "<ref type=\"cert-bund\" id=\"%s\"/>",
                 get_iterator_name (&cert_refs_iterator));
             }
           cleanup_iterator (&cert_refs_iterator);
@@ -10458,7 +10472,7 @@ results_xml_append_cert (GString *buffer, const char *oid, int cert_loaded,
           while (next (&cert_refs_iterator))
             {
               g_string_append_printf
-               (buffer, "<cert_ref type=\"DFN-CERT\" id=\"%s\"/>",
+               (buffer, "<ref type=\"dfn-cert\" id=\"%s\"/>",
                 get_iterator_name (&cert_refs_iterator));
             }
           cleanup_iterator (&cert_refs_iterator);
@@ -10467,7 +10481,6 @@ results_xml_append_cert (GString *buffer, const char *oid, int cert_loaded,
   else
     g_string_append_printf (buffer,
                             "<warning>database not available</warning>");
-  buffer_xml_append_printf (buffer, "</cert>");
 }
 
 /**
@@ -10512,6 +10525,7 @@ results_xml_append_nvt (iterator_t *results, GString *buffer, int cert_loaded)
         {
           int ret;
           char *cves;
+          gchar **split, **item;
           get_data_t get;
           iterator_t iterator;
 
@@ -10522,25 +10536,50 @@ results_xml_append_nvt (iterator_t *results, GString *buffer, int cert_loaded)
             assert (0);
           if (!next (&iterator))
             abort ();
-          cves = ovaldef_cves (oid);
           buffer_xml_append_printf (buffer,
                                     "<nvt oid=\"%s\">"
                                     "<type>ovaldef</type>"
                                     "<name>%s</name>"
                                     "<family/>"
                                     "<cvss_base>%s</cvss_base>"
-                                    "<cve>%s</cve>"
-                                    "<bid/>"
-                                    "<tags>summary=%s</tags>"
-                                    "<xref/>",
+                                    "<tags>summary=%s</tags>",
                                     oid,
                                     ovaldef_info_iterator_title (&iterator),
                                     ovaldef_info_iterator_max_cvss (&iterator),
-                                    cves ?: "",
                                     ovaldef_info_iterator_description (&iterator));
-                                    g_free (cves);
           g_free (get.id);
           cleanup_iterator (&iterator);
+
+          buffer_xml_append_printf (buffer, "<refs>");
+
+          cves = ovaldef_cves (oid);
+          split = g_strsplit (cves, ",", 0);
+          item = split;
+          while (*item)
+            {
+              gchar *id;
+
+              id = *item;
+              g_strstrip (id);
+
+              if (strcmp (id, "") == 0)
+                {
+                  item++;
+                  continue;
+                }
+
+              buffer_xml_append_printf (buffer, "<ref type=\"cve\" id=\"%s\"/>", id);
+
+              item++;
+            }
+          g_strfreev (split);
+          g_free (cves);
+
+          results_xml_append_cert (buffer, oid, cert_loaded,
+                                   result_iterator_has_cert_bunds (results),
+                                   result_iterator_has_dfn_certs (results));
+
+          buffer_xml_append_printf (buffer, "</refs>");
         }
       else
         {
@@ -10555,23 +10594,21 @@ results_xml_append_nvt (iterator_t *results, GString *buffer, int cert_loaded)
                                     "<name>%s</name>"
                                     "<family>%s</family>"
                                     "<cvss_base>%s</cvss_base>"
-                                    "<cve>%s</cve>"
-                                    "<bid>%s</bid>"
-                                    "<xref>%s</xref>"
                                     "<tags>%s</tags>",
                                     oid,
                                     result_iterator_nvt_name (results) ?: oid,
                                     result_iterator_nvt_family (results) ?: "",
                                     cvss_base ?: "",
-                                    result_iterator_nvt_cve (results) ?: "",
-                                    result_iterator_nvt_bid (results) ?: "",
-                                    result_iterator_nvt_xref (results) ?: "",
                                     result_iterator_nvt_tag (results) ?: "");
+
+          buffer_xml_append_printf (buffer, "<refs>");
+          result_iterator_nvt_refs_append (buffer, results);
+          results_xml_append_cert (buffer, oid, cert_loaded,
+                                   result_iterator_has_cert_bunds (results),
+                                   result_iterator_has_dfn_certs (results));
+          buffer_xml_append_printf (buffer, "</refs>");
         }
 
-      results_xml_append_cert (buffer, oid, cert_loaded,
-                               result_iterator_has_cert_bunds (results),
-                               result_iterator_has_dfn_certs (results));
     }
 
   buffer_xml_append_printf (buffer, "</nvt>");
@@ -10770,7 +10807,7 @@ buffer_results_xml (GString *buffer, iterator_t *results, task_t task,
                             "<asset asset_id=\"%s\"/>"
                             "<hostname>%s</hostname>"
                             "</host>",
-                            result_iterator_host (results),
+                            result_iterator_host (results) ?: "",
                             asset_id ? asset_id : "",
                             result_iterator_hostname (results) ?: "");
 
@@ -12901,17 +12938,17 @@ handle_get_assets (gmp_parser_t *gmp_parser, GError **error)
       return;
     }
 
-  INIT_GET (asset, Asset);
-
   /* Set type specific functions. */
   if (g_strcmp0 ("host", get_assets_data->type) == 0)
     {
+      INIT_GET (asset, Host);
       init_asset_iterator = init_asset_host_iterator;
       asset_count = asset_host_count;
       get_assets_data->get.subtype = g_strdup ("host");
     }
   else if (g_strcmp0 ("os", get_assets_data->type) == 0)
     {
+      INIT_GET (asset, Operating System);
       init_asset_iterator = init_asset_os_iterator;
       asset_count = asset_os_count;
       get_assets_data->get.subtype = g_strdup ("os");
@@ -13369,6 +13406,7 @@ handle_get_configs (gmp_parser_t *gmp_parser, GError **error)
                ("<preference>"
                 "<nvt oid=\"\"><name/></nvt>"
                 "<hr_name>%s</hr_name>"
+                "<id/>"
                 "<name>%s</name>"
                 "<type>osp_%s</type>"
                 "<value>%s</value>"
@@ -13404,6 +13442,7 @@ handle_get_configs (gmp_parser_t *gmp_parser, GError **error)
                   "<nvt oid=\"%s\">"
                   "<name>%s</name>"
                   "</nvt>"
+                  "<id>0</id>"
                   "<name>Timeout</name>"
                   "<type>entry</type>"
                   "<value>%s</value>"
@@ -14117,15 +14156,15 @@ handle_get_feeds (gmp_parser_t *gmp_parser, GError **error)
                           " status_text=\"" STATUS_OK_TEXT "\">");
 
   if ((get_feeds_data->type == NULL)
-      || strcmp (get_feeds_data->type, "nvt"))
+      || (strcasecmp (get_feeds_data->type, "nvt") == 0))
     get_feed (gmp_parser, error, NVT_FEED);
 
   if ((get_feeds_data->type == NULL)
-      || strcmp (get_feeds_data->type, "scap"))
+      || (strcasecmp (get_feeds_data->type, "scap") == 0))
     get_feed (gmp_parser, error, SCAP_FEED);
 
   if ((get_feeds_data->type == NULL)
-      || strcmp (get_feeds_data->type, "cert"))
+      || (strcasecmp (get_feeds_data->type, "cert") == 0))
     get_feed (gmp_parser, error, CERT_FEED);
 
   SEND_TO_CLIENT_OR_FAIL ("</get_feeds_response>");
@@ -15100,8 +15139,8 @@ handle_get_nvts (gmp_parser_t *gmp_parser, GError **error)
 
                 if (get_nvts_data->preference_count)
                   {
-                    const char *nvt_name = nvt_iterator_name (&nvts);
-                    pref_count = nvt_preference_count (nvt_name);
+                    const char *nvt_oid = nvt_iterator_oid (&nvts);
+                    pref_count = nvt_preference_count (nvt_oid);
                   }
                 if (send_nvt (&nvts, 1, get_nvts_data->preferences,
                               pref_count, timeout, config,
@@ -18555,6 +18594,137 @@ handle_get_targets (gmp_parser_t *gmp_parser, GError **error)
   set_client_state (CLIENT_AUTHENTIC);
 }
 
+/**
+ * @brief Gets task schedule data of a task as XML.
+ *
+ * @param[in]  task  The task to get schedule data for.
+ *
+ * @return Newly allocated XML string.
+ */
+static gchar*
+get_task_schedule_xml (task_t task)
+{
+  schedule_t schedule;
+  time_t next_time;
+  int schedule_in_trash, schedule_available;
+  char *task_schedule_uuid, *task_schedule_name;
+  GString *xml;
+
+  xml = g_string_new ("");
+
+  schedule_available = 1;
+  schedule = task_schedule (task);
+  if (schedule)
+    {
+      schedule_in_trash = task_schedule_in_trash (task);
+      if (schedule_in_trash)
+        {
+          task_schedule_uuid = trash_schedule_uuid (schedule);
+          task_schedule_name = trash_schedule_name (schedule);
+          schedule_available = trash_schedule_readable (schedule);
+        }
+      else
+        {
+          schedule_t found;
+          task_schedule_uuid = schedule_uuid (schedule);
+          task_schedule_name = schedule_name (schedule);
+          if (find_schedule_with_permission (task_schedule_uuid,
+                                            &found,
+                                            "get_schedules"))
+            g_error ("%s: GET_TASKS: error finding"
+                      " task schedule, aborting",
+                      __FUNCTION__);
+          schedule_available = (found > 0);
+        }
+    }
+  else
+    {
+      task_schedule_uuid = (char*) g_strdup ("");
+      task_schedule_name = (char*) g_strdup ("");
+      schedule_in_trash = 0;
+    }
+
+  if (schedule_available && schedule)
+    {
+      time_t first_time, info_next_time;
+      int period, period_months, duration;
+      gchar *icalendar, *zone;
+
+      icalendar = zone = NULL;
+
+      if (schedule_info (schedule, schedule_in_trash,
+                          &first_time, &info_next_time, &period,
+                          &period_months, &duration,
+                          &icalendar, &zone) == 0)
+        {
+          gchar *first_time_str, *next_time_str;
+
+          // Copy ISO time strings to avoid one overwriting the other
+          first_time_str = g_strdup (first_time
+                                      ? iso_time (&first_time)
+                                      : "");
+          next_time_str = g_strdup (info_next_time
+                                      ? iso_time (&info_next_time)
+                                      : "over");
+
+          xml_string_append (xml,
+                             "<schedule id=\"%s\">"
+                             "<name>%s</name>"
+                             "<trash>%d</trash>"
+                             "<first_time>%s</first_time>"
+                             "<next_time>%s</next_time>"
+                             "<icalendar>%s</icalendar>"
+                             "<period>%d</period>"
+                             "<period_months>"
+                             "%d"
+                             "</period_months>"
+                             "<duration>%d</duration>"
+                             "<timezone>%s</timezone>"
+                             "</schedule>"
+                             "<schedule_periods>"
+                             "%d"
+                             "</schedule_periods>",
+                             task_schedule_uuid,
+                             task_schedule_name,
+                             schedule_in_trash,
+                             first_time_str,
+                             next_time_str,
+                             icalendar ? icalendar : "",
+                             period,
+                             period_months,
+                             duration,
+                             zone ? zone : "",
+                             task_schedule_periods (task));
+
+          g_free (first_time_str);
+          g_free (next_time_str);
+        }
+
+      g_free (icalendar);
+      g_free (zone);
+    }
+  else
+    {
+      next_time = task_schedule_next_time (task);
+
+      xml_string_append (xml,
+                         "<schedule id=\"%s\">"
+                         "<name>%s</name>"
+                         "<next_time>%s</next_time>"
+                         "<trash>%d</trash>"
+                         "</schedule>",
+                         task_schedule_uuid,
+                         task_schedule_name,
+                         next_time
+                            ? iso_time (&next_time)
+                            : "over",
+                         schedule_in_trash);
+    }
+
+  return g_string_free (xml, FALSE);
+}
+
+
 /**
  * @brief Handle end of GET_TASKS element.
  *
@@ -18652,22 +18822,19 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
       gchar *config_name_escaped;
       char *task_target_uuid, *task_target_name;
       gchar *task_target_name_escaped;
-      char *task_schedule_uuid, *task_schedule_name;
-      gchar *task_schedule_name_escaped;
+      gchar *task_schedule_xml;
       char *task_scanner_uuid, *task_scanner_name;
       gchar *task_scanner_name_escaped;
       gchar *last_report;
       gchar *second_last_report_id;
       gchar *current_report;
       report_t running_report;
-      schedule_t schedule;
-      time_t next_time;
       char *owner, *observers;
-      int target_in_trash, schedule_in_trash, scanner_in_trash;
+      int target_in_trash, scanner_in_trash;
       int debugs, holes = 0, infos = 0, logs, warnings = 0;
       int holes_2 = 0, infos_2 = 0, warnings_2 = 0;
       int false_positives, task_scanner_type;
-      int schedule_available, target_available, config_available;
+      int target_available, config_available;
       int scanner_available;
       double severity = 0, severity_2 = 0;
       gchar *response;
@@ -18689,6 +18856,8 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
       index = get_iterator_resource (&tasks);
       target = task_target (index);
 
+      task_schedule_xml = get_task_schedule_xml (index);
+
       if (get_tasks_data->schedules_only)
         {
           SENDF_TO_CLIENT_OR_FAIL ("<task id=\"%s\">"
@@ -18696,112 +18865,8 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
                                    get_iterator_uuid (&tasks),
                                    get_iterator_name (&tasks));
 
-          schedule_available = 1;
-          schedule = task_schedule (index);
-          if (schedule)
-            {
-              schedule_in_trash = task_schedule_in_trash (index);
-              if (schedule_in_trash)
-                {
-                  task_schedule_uuid = schedule_uuid (schedule);
-                  task_schedule_name = schedule_name (schedule);
-                  schedule_available = trash_schedule_readable (schedule);
-                }
-              else
-                {
-                  schedule_t found;
-                  task_schedule_uuid = schedule_uuid (schedule);
-                  task_schedule_name = schedule_name (schedule);
-                  if (find_schedule_with_permission (task_schedule_uuid,
-                                                    &found,
-                                                    "get_schedules"))
-                    g_error ("%s: GET_TASKS: error finding"
-                             " task schedule, aborting",
-                             __FUNCTION__);
-                  schedule_available = (found > 0);
-                }
-            }
-          else
-            {
-              task_schedule_uuid = (char*) g_strdup ("");
-              task_schedule_name = (char*) g_strdup ("");
-              schedule_in_trash = 0;
-            }
-
-          if (schedule_available && schedule)
-            {
-              time_t first_time, info_next_time;
-              int period, period_months, duration;
-              gchar *icalendar, *zone;
-
-              icalendar = zone = NULL;
-
-              if (schedule_info (schedule, schedule_in_trash,
-                                 &first_time, &info_next_time, &period,
-                                 &period_months, &duration,
-                                 &icalendar, &zone) == 0)
-                {
-                  gchar *first_time_str, *next_time_str;
-
-                  // Copy ISO time strings to avoid one overwriting the other
-                  first_time_str = g_strdup (first_time
-                                              ? iso_time (&first_time)
-                                              : "");
-                  next_time_str = g_strdup (info_next_time
-                                              ? iso_time (&info_next_time)
-                                              : "over");
-
-                  SENDF_TO_CLIENT_OR_FAIL ("<schedule id=\"%s\">"
-                                           "<name>%s</name>"
-                                           "<trash>%d</trash>"
-                                           "<first_time>%s</first_time>"
-                                           "<next_time>%s</next_time>"
-                                           "<icalendar>%s</icalendar>"
-                                           "<period>%d</period>"
-                                           "<period_months>"
-                                           "%d"
-                                           "</period_months>"
-                                           "<duration>%d</duration>"
-                                           "<timezone>%s</timezone>"
-                                           "</schedule>"
-                                           "<schedule_periods>"
-                                           "%d"
-                                           "</schedule_periods>",
-                                           task_schedule_uuid,
-                                           task_schedule_name,
-                                           schedule_in_trash,
-                                           first_time_str,
-                                           next_time_str,
-                                           icalendar ? icalendar : "",
-                                           period,
-                                           period_months,
-                                           duration,
-                                           zone ? zone : "",
-                                           task_schedule_periods (index));
-
-                  g_free (first_time_str);
-                  g_free (next_time_str);
-                }
-
-              g_free (icalendar);
-              g_free (zone);
-            }
-          else
-            {
-              next_time = task_schedule_next_time (index);
-
-              SENDF_TO_CLIENT_OR_FAIL ("<schedule id=\"%s\">"
-                                       "<name>%s</name>"
-                                       "<next_time>%s</next_time>"
-                                       "<trash>%d</trash>"
-                                       "</schedule>",
-                                       task_schedule_uuid,
-                                       task_schedule_name,
-                                       next_time
-                                        ? iso_time (&next_time)
-                                        : "over",
-                                       schedule_in_trash);
-            }
+          SEND_TO_CLIENT_OR_FAIL (task_schedule_xml);
+          g_free (task_schedule_xml);
 
           SENDF_TO_CLIENT_OR_FAIL ("</task>");
 
@@ -19056,37 +19121,6 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
                          __FUNCTION__);
               config_available = (found > 0);
             }
-          schedule_available = 1;
-          schedule = task_schedule (index);
-          if (schedule)
-            {
-              schedule_in_trash = task_schedule_in_trash (index);
-              if (schedule_in_trash)
-                {
-                  task_schedule_uuid = schedule_uuid (schedule);
-                  task_schedule_name = schedule_name (schedule);
-                  schedule_available = trash_schedule_readable (schedule);
-                }
-              else
-                {
-                  schedule_t found;
-                  task_schedule_uuid = schedule_uuid (schedule);
-                  task_schedule_name = schedule_name (schedule);
-                  if (find_schedule_with_permission (task_schedule_uuid,
-                                                     &found,
-                                                     "get_schedules"))
-                    g_error ("%s: GET_TASKS: error finding"
-                             " task schedule, aborting",
-                             __FUNCTION__);
-                  schedule_available = (found > 0);
-                }
-            }
-          else
-            {
-              task_schedule_uuid = (char*) g_strdup ("");
-              task_schedule_name = (char*) g_strdup ("");
-              schedule_in_trash = 0;
-            }
           scanner_available = 1;
           scanner = task_iterator_scanner (&tasks);
           if (scanner)
@@ -19118,7 +19152,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
               task_scanner_type = 0;
               scanner_in_trash = 0;
             }
-          next_time = task_schedule_next_time (index);
+
           config_name_escaped
             = config_name
                 ? g_markup_escape_text (config_name, -1)
@@ -19131,10 +19165,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
             = task_scanner_name
                 ? g_markup_escape_text (task_scanner_name, -1)
                 : NULL;
-          task_schedule_name_escaped
-            = task_schedule_name
-                ? g_markup_escape_text (task_schedule_name, -1)
-                : NULL;
+
           response = g_strdup_printf
                       ("<alterable>%i</alterable>"
                        "<config id=\"%s\">"
@@ -19161,13 +19192,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
                        "%u<finished>%u</finished>"
                        "</report_count>"
                        "<trend>%s</trend>"
-                       "<schedule id=\"%s\">"
-                       "<name>%s</name>"
-                       "<next_time>%s</next_time>"
-                       "<trash>%i</trash>"
-                       "%s"
-                       "</schedule>"
-                       "<schedule_periods>%i</schedule_periods>"
+                       "%s" // Schedule XML
                        "%s%s",
                        get_tasks_data->get.trash
                         ? 0
@@ -19196,12 +19221,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
                         : task_iterator_trend_counts
                            (&tasks, holes, warnings, infos, severity,
                             holes_2, warnings_2, infos_2, severity_2),
-                       task_schedule_uuid,
-                       task_schedule_name_escaped,
-                       (next_time == 0 ? "over" : iso_time (&next_time)),
-                       schedule_in_trash,
-                       schedule_available ? "" : "<permissions/>",
-                       task_schedule_periods (index),
+                       task_schedule_xml,
                        current_report,
                        last_report);
           g_free (config_name);
@@ -19213,9 +19233,7 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
           g_free (progress_xml);
           g_free (current_report);
           g_free (last_report);
-          g_free (task_schedule_uuid);
-          g_free (task_schedule_name);
-          g_free (task_schedule_name_escaped);
+          g_free (task_schedule_xml);
           g_free (task_scanner_uuid);
           g_free (task_scanner_name);
           g_free (task_scanner_name_escaped);
@@ -21530,7 +21548,8 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
           }
 
         array_add (import_config_data->preferences,
-                   preference_new (import_config_data->preference_name,
+                   preference_new (import_config_data->preference_id,
+                                   import_config_data->preference_name,
                                    import_config_data->preference_type,
                                    import_config_data->preference_value,
                                    import_config_data->preference_nvt_name,
@@ -21538,6 +21557,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                                    import_config_data->preference_alts,
                                    import_config_data->preference_default,
                                    preference_hr_name));
+        import_config_data->preference_id = NULL;
         import_config_data->preference_name = NULL;
         import_config_data->preference_type = NULL;
         import_config_data->preference_value = NULL;
@@ -21557,6 +21577,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
       CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, DEFAULT);
       CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, HR_NAME);
       CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, NAME);
+      CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, ID);
       CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, NVT);
       CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NVT, NAME);
       CLOSE (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE, TYPE);
@@ -22154,8 +22175,8 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                 SEND_TO_CLIENT_OR_FAIL
                  (XML_ERROR_SYNTAX ("create_credential",
                                     "Login may only contain alphanumeric"
-                                    " characters if autogenerating"
-                                    " credential"));
+                                    " characters or the following:"
+                                    " - _ \\ . @"));
                 break;
               case 3:
                 SEND_TO_CLIENT_OR_FAIL
@@ -23539,6 +23560,32 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
 
       case CLIENT_CREATE_REPORT_RR_H:
         {
+          if (create_report_data->host_start)
+            {
+              create_report_result_t *result;
+
+              result = g_malloc (sizeof (create_report_result_t));
+              result->description = create_report_data->host_start;
+              result->host = strdup (create_report_data->ip);
+
+              array_add (create_report_data->host_starts, result);
+
+              create_report_data->host_start = NULL;
+            }
+
+          if (create_report_data->host_end)
+            {
+              create_report_result_t *result;
+
+              result = g_malloc (sizeof (create_report_result_t));
+              result->description = create_report_data->host_end;
+              result->host = strdup (create_report_data->ip);
+
+              array_add (create_report_data->host_ends, result);
+
+              create_report_data->host_end = NULL;
+            }
+
           gvm_free_string_var (&create_report_data->ip);
           set_client_state (CLIENT_CREATE_REPORT_RR);
           break;
@@ -24255,6 +24302,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                       }
                     g_free (error_extra);
                     log_event_fail ("tag", "Tag", NULL, "created");
+                    break;
                   case 2:
                     SEND_TO_CLIENT_OR_FAIL 
                       ("<create_tag_response"
@@ -26051,8 +26099,9 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
               case 4:
                 SEND_TO_CLIENT_OR_FAIL
                  (XML_ERROR_SYNTAX ("modify_credential",
-                                    "Login name must not be empty and contain"
-                                    " only alphanumeric characters"));
+                                    "Login name must not be empty and may"
+                                    " contain only alphanumeric characters"
+                                    " or the following: - _ \\ . @"));
                 log_event_fail ("credential", "Credential",
                                 modify_credential_data->credential_id,
                                 "modified");
@@ -27109,6 +27158,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                                     "A tag_id is required"));
                 log_event_fail ("tag", "Tag", modify_tag_data->tag_id,
                                 "modified");
+                break;
               case 3:
                 SEND_TO_CLIENT_OR_FAIL
                  (XML_ERROR_SYNTAX ("modify_tag",
@@ -27117,6 +27167,7 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                                     " or empty."));
                 log_event_fail ("tag", "Tag", modify_tag_data->tag_id,
                                 "modified");
+                break;
               case 4:
                 if (send_find_error_to_client ("modify_tag", "resource",
                                                 error_extra,
@@ -27128,9 +27179,10 @@ gmp_xml_handle_end_element (/* unused */ GMarkupParseContext* context,
                   }
                 g_free (error_extra);
                 log_event_fail ("tag", "Tag", NULL, "modified");
+                break;
               case 5:
                 SEND_TO_CLIENT_OR_FAIL 
-                  ("<create_tag_response"
+                  ("<modify_tag_response"
                     " status=\"" STATUS_ERROR_MISSING "\""
                     " status_text=\"No resources found for filter\"/>");
                 log_event_fail ("tag", "Tag", NULL, "modified");
@@ -28964,6 +29016,9 @@ gmp_xml_handle_text (/* unused */ GMarkupParseContext* context,
       APPEND (CLIENT_MODIFY_CONFIG_PREFERENCE_NAME,
               &modify_config_data->preference_name);
 
+      APPEND (CLIENT_MODIFY_CONFIG_PREFERENCE_ID,
+              &modify_config_data->preference_id);
+
       APPEND (CLIENT_MODIFY_CONFIG_PREFERENCE_VALUE,
               &modify_config_data->preference_value);
 
@@ -29122,6 +29177,9 @@ gmp_xml_handle_text (/* unused */ GMarkupParseContext* context,
       APPEND (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_HR_NAME,
               &import_config_data->preference_hr_name);
 
+      APPEND (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_ID,
+              &import_config_data->preference_id);
+
       APPEND (CLIENT_C_C_GCR_CONFIG_PREFERENCES_PREFERENCE_NAME,
               &import_config_data->preference_name);
 
@@ -29447,9 +29505,15 @@ gmp_xml_handle_text (/* unused */ GMarkupParseContext* context,
       APPEND (CLIENT_CREATE_REPORT_RR_H_DETAIL_SOURCE_TYPE,
               &create_report_data->detail_source_type);
 
+      APPEND (CLIENT_CREATE_REPORT_RR_H_END,
+              &create_report_data->host_end);
+
       APPEND (CLIENT_CREATE_REPORT_RR_H_IP,
               &create_report_data->ip);
 
+      APPEND (CLIENT_CREATE_REPORT_RR_H_START,
+              &create_report_data->host_start);
+
 
       APPEND (CLIENT_CREATE_REPORT_TASK_NAME,
               &create_report_data->task_name);
@@ -30090,8 +30154,9 @@ init_gmp_process (int update_nvt_cache, const gchar *database,
   xml_parser.text = gmp_xml_handle_text;
   xml_parser.passthrough = NULL;
   xml_parser.error = gmp_xml_handle_error;
-  if (xml_context)
-    g_markup_parse_context_free (xml_context);
+  /* Don't free xml_context because we likely are inside the parser that is
+   * the context, which would cause Glib to freak out.  Just leak, the process
+   * is going to exit after this anyway. */
   xml_context = g_markup_parse_context_new
                  (&xml_parser,
                   0,
diff --git a/src/gmp_get.c b/src/gmp_get.c
index 907bb5d7e..1b082da9d 100644
--- a/src/gmp_get.c
+++ b/src/gmp_get.c
@@ -372,8 +372,7 @@ send_get_common (const char *type, get_data_t *get, iterator_t *iterator,
       /* Or the user has Admin rights and the resource is a permission or a
        * report format... */
       || (current_credentials.uuid
-          && (((strcmp (type, "permission") == 0)
-               || (strcmp (type, "report_format") == 0))
+          && ((strcmp (type, "permission") == 0)
               && get_iterator_uuid (iterator)
               /* ... but not the special Admin permission. */
               && permission_is_admin (get_iterator_uuid (iterator)))
diff --git a/src/gvmd.c b/src/gvmd.c
index b274ff797..ffb42944f 100644
--- a/src/gvmd.c
+++ b/src/gvmd.c
@@ -662,6 +662,7 @@ fork_connection_internal (gvm_connection_t *client_connection,
   int pid, parent_client_socket, ret;
   int sockets[2];
   struct sigaction action;
+  gchar *auth_uuid;
 
   /* Fork a child to use as scheduler client and server. */
 
@@ -743,13 +744,19 @@ fork_connection_internal (gvm_connection_t *client_connection,
             exit (EXIT_FAILURE);
           }
 
+        /* Copy the given uuid, because the caller may have passed a
+         * reference to some session variable that will be reset by
+         * the process initialisation. */
+        auth_uuid = g_strdup (uuid);
+
         init_gmpd_process (database, disabled_commands);
 
         /* Make any further authentications to this process succeed.  This
          * enables the scheduler to login as the owner of the scheduled
          * task. */
         manage_auth_allow_all (scheduler);
-        set_scheduled_user_uuid (uuid);
+        set_scheduled_user_uuid (auth_uuid);
+        g_free (auth_uuid);
 
         /* For TLS, create a new session, because the parent may have been in
          * the middle of using the old one. */
diff --git a/src/manage.c b/src/manage.c
index ccddf25fb..4c0e6079f 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Greenbone Networks GmbH
+/* Copyright (C) 2009-2019 Greenbone Networks GmbH
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
@@ -1621,15 +1621,11 @@ nvt_selector_plugins (config_t config)
 static gchar*
 preference_value (const char* name, const char* full_value)
 {
-  char *bracket = strchr (name, ':');
-  if (bracket)
+  if (g_strrstr (name, ":radio:"))
     {
-      if (strncmp (bracket, ":radio:", strlen (":radio:")) == 0)
-        {
-          char *semicolon = strchr (full_value, ';');
-          if (semicolon)
-            return g_strndup (full_value, semicolon - full_value);
-        }
+      char *semicolon = strchr (full_value, ';');
+      if (semicolon)
+        return g_strndup (full_value, semicolon - full_value);
     }
   return g_strdup (full_value);
 }
@@ -1678,10 +1674,10 @@ send_config_preferences (config_t config, const char* section_name,
         {
           char **splits;
           int is_file = 0;
-          /* OID:PrefType:PrefName value */
-          splits = g_strsplit (pref_name, ":", 3);
-          if (splits && g_strv_length (splits) == 3
-              && strcmp (splits[1], "file") == 0)
+          /* OID:PrefID:PrefType:PrefName value */
+          splits = g_strsplit (pref_name, ":", 4);
+          if (splits && g_strv_length (splits) == 4
+              && strcmp (splits[2], "file") == 0)
             is_file = 1;
           g_strfreev (splits);
           if (is_file)
@@ -2094,14 +2090,14 @@ send_alive_test_preferences (target_t target)
   if (alive_test == 0)
     return 0;
 
-  if (sendf_to_server (OID_PING_HOST ":checkbox:Do a TCP ping <|> %s\n",
+  if (sendf_to_server (OID_PING_HOST ":1:checkbox:Do a TCP ping <|> %s\n",
                        alive_test & ALIVE_TEST_TCP_ACK_SERVICE
                        || alive_test & ALIVE_TEST_TCP_SYN_SERVICE
                         ? "yes"
                         : "no"))
     return -1;
 
-  if (sendf_to_server (OID_PING_HOST ":checkbox:TCP ping tries also TCP-SYN ping"
+  if (sendf_to_server (OID_PING_HOST ":2:checkbox:TCP ping tries also TCP-SYN ping"
                        " <|> %s\n",
                        ((alive_test & ALIVE_TEST_TCP_SYN_SERVICE)
                         && (alive_test & ALIVE_TEST_TCP_ACK_SERVICE))
@@ -2109,7 +2105,7 @@ send_alive_test_preferences (target_t target)
                         : "no"))
     return -1;
 
-  if (sendf_to_server (OID_PING_HOST ":checkbox:TCP ping tries only TCP-SYN ping"
+  if (sendf_to_server (OID_PING_HOST ":7:checkbox:TCP ping tries only TCP-SYN ping"
                        " <|> %s\n",
                        ((alive_test & ALIVE_TEST_TCP_SYN_SERVICE)
                         && !(alive_test & ALIVE_TEST_TCP_ACK_SERVICE))
@@ -2117,19 +2113,19 @@ send_alive_test_preferences (target_t target)
                         : "no"))
     return -1;
 
-  if (sendf_to_server (OID_PING_HOST ":checkbox:Do an ICMP ping <|> %s\n",
+  if (sendf_to_server (OID_PING_HOST ":3:checkbox:Do an ICMP ping <|> %s\n",
                        (alive_test & ALIVE_TEST_ICMP)
                         ? "yes"
                         : "no"))
     return -1;
 
-  if (sendf_to_server (OID_PING_HOST ":checkbox:Use ARP <|> %s\n",
+  if (sendf_to_server (OID_PING_HOST ":4:checkbox:Use ARP <|> %s\n",
                        (alive_test & ALIVE_TEST_ARP)
                         ? "yes"
                         : "no"))
     return -1;
 
-  if (sendf_to_server (OID_PING_HOST ":checkbox:"
+  if (sendf_to_server (OID_PING_HOST ":5:checkbox:"
                        "Mark unrechable Hosts as dead (not scanning) <|> %s\n",
                        (alive_test & ALIVE_TEST_CONSIDER_ALIVE)
                         ? "no"
@@ -2139,7 +2135,7 @@ send_alive_test_preferences (target_t target)
   if (alive_test == ALIVE_TEST_CONSIDER_ALIVE)
     {
       /* Also select a method, otherwise Ping Host logs a warning. */
-      if (sendf_to_server (OID_PING_HOST ":checkbox:Do a TCP ping <|> yes\n"))
+      if (sendf_to_server (OID_PING_HOST ":1:checkbox:Do a TCP ping <|> yes\n"))
         return -1;
     }
 
@@ -3243,6 +3239,7 @@ slave_setup (gvm_connection_t *connection, const char *name, task_t task,
                                      "<name>%s</name>"
                                      "</nvt>"
                                      "<name>Timeout</name>"
+                                     "<id>0</id>"
                                      "<type>entry</type>"
                                      "<value>%s</value>"
                                      "</preference>",
@@ -3794,7 +3791,7 @@ handle_slave_task (task_t task, target_t target,
                               "",
                               port_string,
                               /* NVT: Global variable settings. */
-                              "1.3.6.1.4.1.25623.1.0.12288",
+                              OID_GLOBAL_SETTINGS,
                               "Error Message",
                               "Authentication with the slave failed.");
         g_free (port_string);
@@ -5032,13 +5029,15 @@ run_task_setup (task_t task, config_t *config, target_t *target,
  *                          continue if stopped else start from beginning.
  * @param[in]   run_status  The task's run status.
  * @param[in]   last_stopped_report  Last stopped report of task.
+ * @param[in]   for_slave_scan  If the report is for a slave scan.
  *
  * @return 0 success, -1 error, -3 creating the report failed.
  */
 static int
 run_task_prepare_report (task_t task, char **report_id, int from,
                          task_status_t run_status,
-                         report_t *last_stopped_report)
+                         report_t *last_stopped_report,
+                         gboolean for_slave_scan)
 {
   if ((from == 1)
       || ((from == 2)
@@ -5056,7 +5055,10 @@ run_task_prepare_report (task_t task, char **report_id, int from,
 
       /* Remove partial host information from the report. */
 
-      trim_partial_report (*last_stopped_report);
+      if (for_slave_scan)
+        trim_report (*last_stopped_report);
+      else
+        trim_partial_report (*last_stopped_report);
 
       /* Ensure the report is marked as requested. */
 
@@ -5138,7 +5140,7 @@ run_slave_or_gmp_task (task_t task, int from, char **report_id,
   /* Prepare the report. */
 
   ret = run_task_prepare_report (task, report_id, from, run_status,
-                                 &last_stopped_report);
+                                 &last_stopped_report, TRUE);
   if (ret)
     {
       set_task_run_status (task, run_status);
@@ -5394,7 +5396,7 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
   /* Prepare the report. */
 
   ret = run_task_prepare_report (task, report_id, from, run_status,
-                                 &last_stopped_report);
+                                 &last_stopped_report, FALSE);
   if (ret)
     {
       set_task_run_status (task, run_status);
@@ -5626,15 +5628,15 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
           const char *user = credential_iterator_login (&credentials);
           const char *password = credential_iterator_password (&credentials);
 
-          if (sendf_to_server (OID_SSH_AUTH ":entry:SSH login name:"
+          if (sendf_to_server (OID_SSH_AUTH ":1:entry:SSH login name:"
                                " <|> %s\n",
                                user ? user : "")
               || (credential_iterator_private_key (&credentials)
-                   ? sendf_to_server (OID_SSH_AUTH ":password:"
+                   ? sendf_to_server (OID_SSH_AUTH ":2:password:"
                                       "SSH key passphrase:"
                                       " <|> %s\n",
                                       password ? password : "")
-                   : sendf_to_server (OID_SSH_AUTH ":password:"
+                   : sendf_to_server (OID_SSH_AUTH ":3:password:"
                                       "SSH password (unsafe!):"
                                       " <|> %s\n",
                                       password ? password : "")))
@@ -5665,7 +5667,7 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
                 (gpointer) g_strdup (credential_iterator_private_key
                                       (&credentials)));
 
-              if (sendf_to_server (OID_SSH_AUTH ":file:SSH private key:"
+              if (sendf_to_server (OID_SSH_AUTH ":4:file:SSH private key:"
                                    " <|> %s\n",
                                    file_uuid))
                 goto fail;
@@ -5684,9 +5686,9 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
           const char *user = credential_iterator_login (&credentials);
           const char *password = credential_iterator_password (&credentials);
 
-          if (sendf_to_server (OID_SMB_AUTH ":entry:SMB login: <|> %s\n",
+          if (sendf_to_server (OID_SMB_AUTH ":1:entry:SMB login: <|> %s\n",
                                user ? user : "")
-              || sendf_to_server (OID_SMB_AUTH ":password:SMB password:"
+              || sendf_to_server (OID_SMB_AUTH ":2:password:SMB password:"
                                   " <|> %s\n",
                                   password ? password : ""))
             {
@@ -5715,10 +5717,10 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
           const char *user = credential_iterator_login (&credentials);
           const char *password = credential_iterator_password (&credentials);
 
-          if (sendf_to_server (OID_ESXI_AUTH ":entry:ESXi login name:"
+          if (sendf_to_server (OID_ESXI_AUTH ":1:entry:ESXi login name:"
                                " <|> %s\n",
                                user ? user : "")
-              || sendf_to_server (OID_ESXI_AUTH ":password:ESXi login password:"
+              || sendf_to_server (OID_ESXI_AUTH ":2:password:ESXi login password:"
                                   " <|> %s\n",
                                   password ? password : ""))
             {
@@ -5754,25 +5756,25 @@ run_otp_task (task_t task, scanner_t scanner, int from, char **report_id)
           const char *privacy_algorithm
             = credential_iterator_privacy_algorithm (&credentials);
 
-          if (sendf_to_server (OID_SNMP_AUTH ":password:SNMP Community:"
+          if (sendf_to_server (OID_SNMP_AUTH ":1:password:SNMP Community:"
                                " <|> %s\n",
                                community ? community : "")
-              || sendf_to_server (OID_SNMP_AUTH ":entry:SNMPv3 Username:"
+              || sendf_to_server (OID_SNMP_AUTH ":2:entry:SNMPv3 Username:"
                                   " <|> %s\n",
                                   user ? user : "")
-              || sendf_to_server (OID_SNMP_AUTH ":password:"
+              || sendf_to_server (OID_SNMP_AUTH ":3:password:"
                                   "SNMPv3 Password:"
                                   " <|> %s\n",
                                   password ? password : "")
-              || sendf_to_server (OID_SNMP_AUTH ":radio:"
+              || sendf_to_server (OID_SNMP_AUTH ":4:radio:"
                                   "SNMPv3 Authentication Algorithm:"
                                   " <|> %s\n",
                                   auth_algorithm ? auth_algorithm : "")
-              || sendf_to_server (OID_SNMP_AUTH ":password:"
+              || sendf_to_server (OID_SNMP_AUTH ":5:password:"
                                   "SNMPv3 Privacy Password:"
                                   " <|> %s\n",
                                   privacy_password ? privacy_password : "")
-              || sendf_to_server (OID_SNMP_AUTH ":radio:"
+              || sendf_to_server (OID_SNMP_AUTH ":6:radio:"
                                   "SNMPv3 Privacy Algorithm:"
                                   " <|> %s\n",
                                   privacy_algorithm ? privacy_algorithm : ""))
@@ -8368,25 +8370,25 @@ get_nvti_xml (iterator_t *nvts, int details, int pref_count,
   if (details)
     {
       int tag_count;
-      GString *cert_refs_str, *tags_str, *buffer;
+      GString *refs_str, *tags_str, *buffer;
       iterator_t cert_refs_iterator, tags;
       gchar *tag_name_esc, *tag_value_esc, *tag_comment_esc;
       char *default_timeout = nvt_default_timeout (oid);
 
       DEF (family);
-      DEF (xref);
       DEF (tag);
 
 #undef DEF
 
-      cert_refs_str = g_string_new ("");
+      refs_str = g_string_new ("");
+
       if (manage_cert_loaded())
         {
           init_nvt_cert_bund_adv_iterator (&cert_refs_iterator, oid, 0, 0);
           while (next (&cert_refs_iterator))
             {
-              g_string_append_printf (cert_refs_str,
-                                      "<cert_ref type=\"CERT-Bund\" id=\"%s\"/>",
+              g_string_append_printf (refs_str,
+                                      "<ref type=\"cert-bund\" id=\"%s\"/>",
                                       get_iterator_name (&cert_refs_iterator));
           }
           cleanup_iterator (&cert_refs_iterator);
@@ -8394,17 +8396,19 @@ get_nvti_xml (iterator_t *nvts, int details, int pref_count,
           init_nvt_dfn_cert_adv_iterator (&cert_refs_iterator, oid, 0, 0);
           while (next (&cert_refs_iterator))
             {
-              g_string_append_printf (cert_refs_str,
-                                      "<cert_ref type=\"DFN-CERT\" id=\"%s\"/>",
+              g_string_append_printf (refs_str,
+                                      "<ref type=\"dfn-cert\" id=\"%s\"/>",
                                       get_iterator_name (&cert_refs_iterator));
           }
           cleanup_iterator (&cert_refs_iterator);
         }
       else
         {
-          g_string_append (cert_refs_str, "<warning>database not available</warning>");
+          g_string_append (refs_str, "<warning>database not available</warning>");
         }
 
+      nvti_refs_append_xml (refs_str, oid);
+
       tags_str = g_string_new ("");
       tag_count = resource_tag_count ("nvt",
                                       get_iterator_resource (nvts),
@@ -8465,10 +8469,7 @@ get_nvti_xml (iterator_t *nvts, int details, int pref_count,
                               "<value>%s</value>"
                               "<type>%s</type>"
                               "</qod>"
-                              "<cve_id>%s</cve_id>"
-                              "<bugtraq_id>%s</bugtraq_id>"
-                              "<cert_refs>%s</cert_refs>"
-                              "<xrefs>%s</xrefs>"
+                              "<refs>%s</refs>"
                               "<tags>%s</tags>"
                               "<preference_count>%i</preference_count>"
                               "<timeout>%s</timeout>"
@@ -8489,18 +8490,14 @@ get_nvti_xml (iterator_t *nvts, int details, int pref_count,
                                : "",
                               nvt_iterator_qod (nvts),
                               nvt_iterator_qod_type (nvts),
-                              nvt_iterator_cve (nvts),
-                              nvt_iterator_bid (nvts),
-                              cert_refs_str->str,
-                              xref_text,
+                              refs_str->str,
                               tag_text,
                               pref_count,
                               timeout ? timeout : "",
                               default_timeout ? default_timeout : "");
       g_free (family_text);
-      g_free (xref_text);
       g_free (tag_text);
-      g_string_free(cert_refs_str, 1);
+      g_string_free(refs_str, 1);
       g_string_free(tags_str, 1);
 
       if (preferences)
diff --git a/src/manage.h b/src/manage.h
index 1ae2cfec9..d6b033368 100644
--- a/src/manage.h
+++ b/src/manage.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Greenbone Networks GmbH
+/* Copyright (C) 2009-2019 Greenbone Networks GmbH
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
@@ -1432,14 +1432,8 @@ result_iterator_nvt_family (iterator_t *);
 const char*
 result_iterator_nvt_cvss_base (iterator_t *);
 
-const char*
-result_iterator_nvt_cve (iterator_t *);
-
-const char*
-result_iterator_nvt_bid (iterator_t *);
-
-const char*
-result_iterator_nvt_xref (iterator_t *);
+void
+result_iterator_nvt_refs_append (GString *, iterator_t *);
 
 const char*
 result_iterator_nvt_tag (iterator_t *);
@@ -1779,6 +1773,7 @@ trash_target_login_port (target_t, const char*);
 typedef struct
 {
   char *name;      ///< Name of preference.
+  char *id;        ///< ID of preference.
   char *type;      ///< Type of preference (radio, password, ...).
   char *value;     ///< Value of preference.
   char *nvt_name;  ///< Name of NVT preference affects.
@@ -1935,6 +1930,9 @@ config_timeout_iterator_nvt_name (iterator_t *);
 const char*
 config_timeout_iterator_value (iterator_t *);
 
+void
+update_config_preference (const char *, const char *, const char *,
+                          const char *, gboolean);
 
 
 /* NVT's. */
@@ -1982,15 +1980,6 @@ nvt_iterator_description (iterator_t*);
 const char*
 nvt_iterator_copyright (iterator_t*);
 
-const char*
-nvt_iterator_cve (iterator_t*);
-
-const char*
-nvt_iterator_bid (iterator_t*);
-
-const char*
-nvt_iterator_xref (iterator_t*);
-
 const char*
 nvt_iterator_tag (iterator_t*);
 
@@ -2104,9 +2093,15 @@ nvt_preference_iterator_type (iterator_t*);
 char*
 nvt_preference_iterator_oid (iterator_t*);
 
+char*
+nvt_preference_iterator_id (iterator_t*);
+
 int
 nvt_preference_count (const char *);
 
+void
+nvti_refs_append_xml (GString *, const char *);
+
 gchar*
 get_nvti_xml (iterator_t*, int, int, int, const char*, config_t, int);
 
@@ -2875,9 +2870,15 @@ manage_schedule (manage_connection_forker_t,
 char *
 schedule_uuid (schedule_t);
 
+char *
+trash_schedule_uuid (schedule_t);
+
 char *
 schedule_name (schedule_t);
 
+char *
+trash_schedule_name (schedule_t);
+
 int
 schedule_duration (schedule_t);
 
diff --git a/src/manage_config_discovery.c b/src/manage_config_discovery.c
index c37b33835..aa50eb885 100644
--- a/src/manage_config_discovery.c
+++ b/src/manage_config_discovery.c
@@ -919,7 +919,7 @@ make_config_discovery (char *const uuid, char *const selector_name)
   NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.104143", "Nmap NSE net");
   NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.104021", "Nmap NSE net");
   NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.104098", "Nmap NSE net");
-  NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.100315", "Port scanners");
+  NVT_SELECTOR (selector_name, OID_PING_HOST, "Port scanners");
   NVT_SELECTOR (selector_name, "1.3.6.1.4.1.25623.1.0.14259", "Port scanners");
 
   /* Add the Product Detection family. */
@@ -941,13 +941,13 @@ make_config_discovery (char *const uuid, char *const selector_name)
   sql ("INSERT INTO config_preferences (config, type, name, value)"
        " VALUES ((SELECT id FROM configs WHERE uuid = '%s'),"
        "         'PLUGINS_PREFS',"
-       "         '" OID_PING_HOST ":checkbox:Mark unrechable Hosts as dead (not scanning)',"
+       "         '" OID_PING_HOST ":5:checkbox:Mark unrechable Hosts as dead (not scanning)',"
        " 'yes');",
        uuid);
   sql ("INSERT INTO config_preferences (config, type, name, value)"
        " VALUES ((SELECT id FROM configs WHERE uuid = '%s'),"
        "         'PLUGINS_PREFS',"
-       "         '" OID_PING_HOST ":checkbox:Report about unrechable Hosts',"
+       "         '" OID_PING_HOST ":6:checkbox:Report about unrechable Hosts',"
        "         'no');",
        uuid);
 
@@ -955,7 +955,7 @@ make_config_discovery (char *const uuid, char *const selector_name)
   sql ("INSERT INTO config_preferences (config, type, name, value)"
        " VALUES ((SELECT id FROM configs WHERE uuid = '%s'),"
        "         'PLUGINS_PREFS',"
-       "         '" OID_SERVICES ":radio:Test SSL based services',"
+       "         '" OID_SERVICES ":1:radio:Test SSL based services',"
        "         'All;Known SSL ports;None');",
        uuid);
 }
@@ -970,14 +970,21 @@ make_config_discovery (char *const uuid, char *const selector_name)
 int
 check_config_discovery (const char *uuid)
 {
-  /* Check new preference. */
+  /* Check preferences. */
 
   sql ("UPDATE config_preferences SET value = 'no'"
        " WHERE config = (SELECT id FROM configs WHERE uuid = '%s')"
        " AND type = 'PLUGINS_PREFS'"
-       " AND name = '" OID_PING_HOST ":checkbox:Report about unrechable Hosts'"
+       " AND name = '" OID_PING_HOST ":6:checkbox:Report about unrechable Hosts'"
        " AND value = 'yes';",
        uuid);
 
+  update_config_preference (uuid,
+                            "PLUGINS_PREFS",
+                            OID_PING_HOST ":5:checkbox:"
+                            "Mark unrechable Hosts as dead (not scanning)",
+                            "yes",
+                            TRUE);
+
   return 0;
 }
diff --git a/src/manage_config_host_discovery.c b/src/manage_config_host_discovery.c
index e29159c6d..38ab153f1 100644
--- a/src/manage_config_host_discovery.c
+++ b/src/manage_config_host_discovery.c
@@ -66,7 +66,7 @@ make_config_host_discovery (char *const uuid, char *const selector_name)
 
   sql ("INSERT INTO nvt_selectors (name, exclude, type, family_or_nvt, family)"
        " VALUES ('%s', 0, " G_STRINGIFY (NVT_SELECTOR_TYPE_NVT) ","
-       "         '1.3.6.1.4.1.25623.1.0.100315', 'Port scanners');",
+       "         '" OID_PING_HOST "', 'Port scanners');",
        selector_name);
 
   /* Update number of families and nvts. */
@@ -84,21 +84,21 @@ make_config_host_discovery (char *const uuid, char *const selector_name)
   sql ("INSERT INTO config_preferences (config, type, name, value)"
        " VALUES (%llu,"
        "         'PLUGINS_PREFS',"
-       "         '" OID_PING_HOST ":checkbox:Mark unrechable Hosts as dead (not scanning)',"
+       "         '" OID_PING_HOST ":5:checkbox:Mark unrechable Hosts as dead (not scanning)',"
        "         'yes');",
        config);
 
   sql ("INSERT INTO config_preferences (config, type, name, value)"
        " VALUES (%llu,"
        "         'PLUGINS_PREFS',"
-       "         '" OID_PING_HOST ":checkbox:Report about reachable Hosts',"
+       "         '" OID_PING_HOST ":6:checkbox:Report about reachable Hosts',"
        "         'yes');",
        config);
 
   sql ("INSERT INTO config_preferences (config, type, name, value)"
        " VALUES (%llu,"
        "         'PLUGINS_PREFS',"
-       "         '" OID_PING_HOST ":checkbox:Report about unrechable Hosts',"
+       "         '" OID_PING_HOST ":6:checkbox:Report about unrechable Hosts',"
        "         'no');",
        config);
 }
@@ -122,14 +122,14 @@ check_config_host_discovery (const char *uuid)
   if (sql_int ("SELECT count (*) FROM config_preferences"
                " WHERE config = (SELECT id FROM configs WHERE uuid = '%s')"
                "       AND type = 'PLUGINS_PREFS'"
-               "       AND name = '" OID_GLOBAL_SETTINGS ":checkbox:Strictly unauthenticated';",
+               "       AND name = '" OID_GLOBAL_SETTINGS ":1:checkbox:Strictly unauthenticated';",
                uuid)
       == 0)
     {
       sql ("INSERT INTO config_preferences (config, type, name, value)"
            " VALUES ((SELECT id FROM configs WHERE uuid = '%s'),"
            "         'PLUGINS_PREFS',"
-           "         '" OID_GLOBAL_SETTINGS ":checkbox:Strictly unauthenticated',"
+           "         '" OID_GLOBAL_SETTINGS ":1:checkbox:Strictly unauthenticated',"
            "         'yes');",
            uuid);
       update = 1;
@@ -140,14 +140,14 @@ check_config_host_discovery (const char *uuid)
   if (sql_int ("SELECT count (*) FROM nvt_selectors"
                " WHERE name = (SELECT nvt_selector FROM configs"
                "               WHERE uuid = '%s')"
-               "       AND family_or_nvt = '1.3.6.1.4.1.25623.1.0.12288';",
+               "       AND family_or_nvt = '" OID_GLOBAL_SETTINGS "';",
                uuid)
       == 0)
     {
       sql ("INSERT INTO nvt_selectors (name, exclude, type, family_or_nvt, family)"
            " VALUES ((SELECT nvt_selector FROM configs WHERE uuid = '%s'), 0,"
            "         " G_STRINGIFY (NVT_SELECTOR_TYPE_NVT) ","
-           "         '1.3.6.1.4.1.25623.1.0.12288', 'Settings');",
+           "         '" OID_GLOBAL_SETTINGS "', 'Settings');",
            uuid);
       update = 1;
     }
@@ -155,5 +155,14 @@ check_config_host_discovery (const char *uuid)
   if (update)
     update_config_cache_init (uuid);
 
+  /* Check preferences. */
+
+  update_config_preference (uuid,
+                            "PLUGINS_PREFS",
+                            OID_PING_HOST ":5:checkbox:"
+                            "Mark unrechable Hosts as dead (not scanning)",
+                            "yes",
+                            TRUE);
+
   return 0;
 }
diff --git a/src/manage_config_system_discovery.c b/src/manage_config_system_discovery.c
index 1de52b8ad..917c18a36 100644
--- a/src/manage_config_system_discovery.c
+++ b/src/manage_config_system_discovery.c
@@ -66,7 +66,7 @@ make_config_system_discovery (char *const uuid, char *const selector_name)
 
   sql ("INSERT INTO nvt_selectors (name, exclude, type, family_or_nvt, family)"
        " VALUES ('%s', 0, " G_STRINGIFY (NVT_SELECTOR_TYPE_NVT) ","
-       "         '1.3.6.1.4.1.25623.1.0.100315', 'Port scanners');",
+       "         '" OID_PING_HOST "', 'Port scanners');",
        selector_name);
   sql ("INSERT INTO nvt_selectors (name, exclude, type, family_or_nvt, family)"
        " VALUES ('%s', 0, " G_STRINGIFY (NVT_SELECTOR_TYPE_NVT) ","
@@ -245,5 +245,14 @@ check_config_system_discovery (const char *uuid)
   if (update)
     update_config_cache_init (uuid);
 
+  /* Check preferences. */
+
+  update_config_preference (uuid,
+                            "PLUGINS_PREFS",
+                            OID_PING_HOST ":5:checkbox:"
+                            "Mark unrechable Hosts as dead (not scanning)",
+                            "yes",
+                            TRUE);
+
   return 0;
 }
diff --git a/src/manage_migrators.c b/src/manage_migrators.c
index 58022011e..5cbfafb47 100644
--- a/src/manage_migrators.c
+++ b/src/manage_migrators.c
@@ -116,13835 +116,77 @@
 /* time.h in glibc2 needs this for strptime. */
 #define _XOPEN_SOURCE
 
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <glib/gstdio.h>
-#include <assert.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#ifdef __FreeBSD__
-#include <sys/wait.h>
-#endif
-#include <ctype.h>
-#include <dirent.h>
-
-#include "manage_sql.h"
-#include "utils.h"
-#include "sql.h"
-
-#include <gvm/base/logging.h>
-#include <gvm/util/fileutils.h>
-#include <gvm/util/uuidutils.h>
-
-
-#undef G_LOG_DOMAIN
-/**
- * @brief GLib log domain.
- */
-#define G_LOG_DOMAIN "md   main"
-
-
-/* Old config IDs. */
-
-/**
- * @brief Database ROWID of 'Full and fast' config.
- */
-#define CONFIG_ID_FULL_AND_FAST 1
-
-/**
- * @brief Database ROWID of 'Full and fast ultimate' config.
- */
-#define CONFIG_ID_FULL_AND_FAST_ULTIMATE 2
-
-/**
- * @brief Database ROWID of 'Full and very deep' config.
- */
-#define CONFIG_ID_FULL_AND_VERY_DEEP 3
-
-/**
- * @brief Database ROWID of 'Full and very deep ultimate' config.
- */
-#define CONFIG_ID_FULL_AND_VERY_DEEP_ULTIMATE 4
-
-
-/* Headers from backend specific manage_xxx.c file. */
-
-int
-manage_create_migrate_51_to_52_convert ();
-
-void
-manage_create_result_indexes ();
-
-
-/* Types. */
-
-/**
- * @brief A migrator.
- */
-typedef struct
-{
-  int version;         ///< Version that the migrator produces.
-  int (*function) ();  ///< Function that does the migration.  NULL if too hard.
-} migrator_t;
-
-
-/* Functions. */
-
-/** @todo May be better ensure a ROLLBACK when functions like "sql" fail.
- *
- * Currently the SQL functions abort on failure.  This a general problem,
- * not just for migrators, so perhaps the SQL interface should keep
- * track of the transaction, and rollback before aborting. */
-
-/**
- * @brief Create all tables, using the version 4 schema.
- */
-static void
-create_tables_version_4 ()
-{
-  sql ("CREATE TABLE IF NOT EXISTS config_preferences"
-       " (id INTEGER PRIMARY KEY, config INTEGER, type, name, value);");
-  sql ("CREATE TABLE IF NOT EXISTS configs"
-       " (id INTEGER PRIMARY KEY, name UNIQUE, nvt_selector, comment,"
-       "  family_count INTEGER, nvt_count INTEGER, families_growing INTEGER,"
-       "  nvts_growing INTEGER);");
-  sql ("CREATE TABLE IF NOT EXISTS lsc_credentials"
-       " (id INTEGER PRIMARY KEY, name, password, comment, public_key TEXT,"
-       "  private_key TEXT, rpm TEXT, deb TEXT, exe TEXT);");
-  sql ("CREATE TABLE IF NOT EXISTS meta"
-       " (id INTEGER PRIMARY KEY, name UNIQUE, value);");
-  sql ("CREATE TABLE IF NOT EXISTS nvt_preferences"
-       " (id INTEGER PRIMARY KEY, name, value);");
-  /* nvt_selectors types: 0 all, 1 family, 2 NVT (NVT_SELECTOR_TYPE_* above). */
-  sql ("CREATE TABLE IF NOT EXISTS nvt_selectors"
-       " (id INTEGER PRIMARY KEY, name, exclude INTEGER, type INTEGER,"
-       "  family_or_nvt, family);");
-  sql ("CREATE TABLE IF NOT EXISTS nvts"
-       " (id INTEGER PRIMARY KEY, oid, version, name, summary, description,"
-       "  copyright, cve, bid, xref, tag, sign_key_ids, category INTEGER,"
-       "  family);");
-  sql ("CREATE TABLE IF NOT EXISTS report_hosts"
-       " (id INTEGER PRIMARY KEY, report INTEGER, host, start_time, end_time,"
-       "  attack_state, current_port, max_port);");
-  sql ("CREATE INDEX IF NOT EXISTS report_hosts_by_report_and_host"
-       " ON report_hosts (report, host);");
-  sql ("CREATE TABLE IF NOT EXISTS report_results"
-       " (id INTEGER PRIMARY KEY, report INTEGER, result INTEGER);");
-  sql ("CREATE TABLE IF NOT EXISTS reports"
-       " (id INTEGER PRIMARY KEY, uuid, hidden INTEGER, task INTEGER,"
-       "  date INTEGER, start_time, end_time, nbefile, comment,"
-       "  scan_run_status INTEGER);");
-  sql ("CREATE TABLE IF NOT EXISTS results"
-       " (id INTEGER PRIMARY KEY, task INTEGER, subnet, host, port, nvt, type,"
-       "  description)");
-  sql ("CREATE TABLE IF NOT EXISTS targets"
-       " (id INTEGER PRIMARY KEY, name, hosts, comment);");
-  sql ("CREATE TABLE IF NOT EXISTS task_files"
-       " (id INTEGER PRIMARY KEY, task INTEGER, name, content);");
-  sql ("CREATE TABLE IF NOT EXISTS tasks"
-       " (id INTEGER PRIMARY KEY, uuid, name, hidden INTEGER, time, comment,"
-       "  description, owner" /** @todo INTEGER */ ", run_status INTEGER,"
-       "  start_time, end_time, config, target);");
-  sql ("CREATE TABLE IF NOT EXISTS users"
-       " (id INTEGER PRIMARY KEY, name UNIQUE, password);");
-}
-
-/**
- * @brief Migrate the database from version 0 to version 1.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_0_to_1 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 0. */
-
-  if (manage_db_version () != 0)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* In SVN the database version flag changed from 0 to 1 on 2009-09-30,
-   * while the database changed to the version 1 schema on 2009-08-29.  This
-   * means the database could be flagged as version 0 while it has a version
-   * 1 schema.  In this case the ADD COLUMN below would fail.  A work around
-   * would be simply to update the version number to 1 in the database by
-   * hand. */
-
-  sql ("ALTER TABLE reports ADD COLUMN scan_run_status INTEGER;");
-
-  /* SQLite 3.1.3 and earlier requires a VACUUM before it can read
-   * from the new column.  However, vacuuming might change the ROWIDs,
-   * which would screw up the data.  Debian 5.0 (Lenny) is 3.5.9-6
-   * already. */
-
-  sql ("UPDATE reports SET scan_run_status = '%u';",
-       TASK_STATUS_INTERRUPTED);
-
-  sql ("UPDATE reports SET scan_run_status = '%u'"
-       " WHERE start_time IS NULL OR end_time IS NULL;",
-       TASK_STATUS_STOPPED);
-
-  sql ("UPDATE reports SET scan_run_status = '%u'"
-       " WHERE end_time IS NOT NULL;",
-       TASK_STATUS_DONE);
-
-  /* Set the database version to 1. */
-
-  set_db_version (1);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 1 to version 2.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_1_to_2 ()
-{
-  iterator_t nvts;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 1. */
-
-  if (manage_db_version () != 1)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The category column in nvts changed type from string to int.  This
-   * may be a redundant conversion, as SQLite may have converted these
-   * values automatically in each query anyway. */
-
-  init_iterator (&nvts, "SELECT ROWID, category FROM nvts;");
-  while (next (&nvts))
-    {
-      int category;
-      const char *category_string;
-
-      category_string = iterator_string (&nvts, 1);
-
-      category = atoi (category_string);
-      sql ("UPDATE nvts SET category = %i WHERE ROWID = %llu;",
-           category,
-           iterator_int64 (&nvts, 0));
-    }
-  cleanup_iterator (&nvts);
-
-  /* Set the database version to 2. */
-
-  set_db_version (2);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 2 to version 3.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_2_to_3 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 2. */
-
-  if (manage_db_version () != 2)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add tables added since version 2 that are adjust later in the
-   * migration. */
-
-  sql ("CREATE TABLE IF NOT EXISTS lsc_credentials (name, comment, rpm, deb, dog);");
-
-  /* The lsc_credentials table changed: package columns changed type from BLOB
-   * to string, new columns "password", "public key" and "private key" appeared
-   * and the dog column changed name to exe.
-   *
-   * Just remove all the LSC credentials, as credential generation only
-   * started working after version 3. */
-
-  sql ("DELETE from lsc_credentials;");
-  /* Before revision 5769 this could have caused problems, because these
-   * columns are added on the end of the table, so columns referenced by
-   * position in * queries may have been wrong (for example, with the iterator
-   * returned by init_lsc_credential_iterator).  Since 5769 the queries
-   * name all columns explicitly. */
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN password;");
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN public_key TEXT;");
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN private_key TEXT;");
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN exe TEXT;");
-
-  /* Set the database version to 3. */
-
-  set_db_version (3);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 3 to version 4.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_3_to_4 ()
-{
-  iterator_t nvts;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 3. */
-
-  if (manage_db_version () != 3)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The nvt_selectors table got a family column. */
-
-  sql ("ALTER TABLE nvt_selectors ADD COLUMN family;");
-
-  init_nvt_selector_iterator (&nvts, NULL, (config_t) 0, 2);
-  while (next (&nvts))
-    {
-      gchar *quoted_name = sql_quote (nvt_selector_iterator_name (&nvts));
-      gchar *quoted_nvt = sql_quote (nvt_selector_iterator_nvt (&nvts));
-      sql ("UPDATE nvt_selectors SET family ="
-           " (SELECT family FROM nvts where oid = '%s')"
-           " WHERE name = '%s';",
-           quoted_nvt, quoted_name);
-      g_free (quoted_name);
-      g_free (quoted_nvt);
-    }
-  cleanup_iterator (&nvts);
-
-  /* Set the database version to 4. */
-
-  set_db_version (4);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Move all the data to the new tables for the 4 to 5 migrator.
- */
-void
-migrate_4_to_5_copy_data ()
-{
-  iterator_t rows;
-
-  /* Table config_preferences. */
-  init_iterator (&rows,
-                 "SELECT rowid, config, type, name, value"
-                 " FROM config_preferences_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_type = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 3));
-      gchar *quoted_value = sql_insert (iterator_string (&rows, 4));
-      sql ("INSERT into config_preferences (id, config, type, name, value)"
-           " VALUES (%llu, %llu, %s, %s, %s);",
-           iterator_int64 (&rows, 0),
-           iterator_int64 (&rows, 1),
-           quoted_type,
-           quoted_name,
-           quoted_value);
-      g_free (quoted_type);
-      g_free (quoted_name);
-      g_free (quoted_value);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE config_preferences_4;");
-
-  /* Table configs. */
-  init_iterator (&rows,
-                 "SELECT rowid, name, nvt_selector, comment, family_count,"
-                 " nvt_count, families_growing, nvts_growing"
-                 " FROM configs_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_nvt_selector = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_comment = sql_insert (iterator_string (&rows, 3));
-      sql ("INSERT into configs"
-           " (id, name, nvt_selector, comment, family_count, nvt_count,"
-           "  families_growing, nvts_growing)"
-           " VALUES"
-           " (%llu, %s, %s, %s, %llu, %llu, %llu, %llu);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           quoted_nvt_selector,
-           quoted_comment,
-           iterator_int64 (&rows, 4),
-           iterator_int64 (&rows, 5),
-           iterator_int64 (&rows, 6),
-           iterator_int64 (&rows, 7));
-      g_free (quoted_name);
-      g_free (quoted_nvt_selector);
-      g_free (quoted_comment);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE configs_4;");
-
-  /* Table lsc_credentials. */
-  init_iterator (&rows,
-                 "SELECT rowid, name, password, comment, public_key,"
-                 " private_key, rpm, deb, exe"
-                 " FROM lsc_credentials_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_password = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_comment = sql_insert (iterator_string (&rows, 3));
-      gchar *quoted_public_key = sql_insert (iterator_string (&rows, 4));
-      gchar *quoted_private_key = sql_insert (iterator_string (&rows, 5));
-      gchar *quoted_rpm = sql_insert (iterator_string (&rows, 6));
-      gchar *quoted_deb = sql_insert (iterator_string (&rows, 7));
-      gchar *quoted_exe = sql_insert (iterator_string (&rows, 8));
-      sql ("INSERT into lsc_credentials"
-           " (id, name, password, comment, public_key, private_key, rpm, deb,"
-           "  exe)"
-           " VALUES"
-           " (%llu, %s, %s, %s, %s, %s, %s, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           quoted_password,
-           quoted_comment,
-           quoted_public_key,
-           quoted_private_key,
-           quoted_rpm,
-           quoted_deb,
-           quoted_exe);
-      g_free (quoted_name);
-      g_free (quoted_password);
-      g_free (quoted_comment);
-      g_free (quoted_public_key);
-      g_free (quoted_private_key);
-      g_free (quoted_rpm);
-      g_free (quoted_deb);
-      g_free (quoted_exe);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE lsc_credentials_4;");
-
-  /* Table meta. */
-  init_iterator (&rows, "SELECT rowid, name, value FROM meta_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_value = sql_insert (iterator_string (&rows, 2));
-      sql ("INSERT into meta (id, name, value)"
-           " VALUES (%llu, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           quoted_value);
-      g_free (quoted_name);
-      g_free (quoted_value);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE meta_4;");
-
-  /* Table nvt_preferences. */
-  init_iterator (&rows, "SELECT rowid, name, value FROM nvt_preferences_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_value = sql_insert (iterator_string (&rows, 2));
-      sql ("INSERT into nvt_preferences (id, name, value)"
-           " VALUES (%llu, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           quoted_value);
-      g_free (quoted_name);
-      g_free (quoted_value);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE nvt_preferences_4;");
-
-  /* Table nvt_selectors. */
-  init_iterator (&rows,
-                 "SELECT rowid, name, exclude, type, family_or_nvt, family"
-                 " FROM nvt_selectors_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_family_or_nvt = sql_insert (iterator_string (&rows, 4));
-      gchar *quoted_family = sql_insert (iterator_string (&rows, 5));
-      sql ("INSERT into nvt_selectors"
-           " (id, name, exclude, type, family_or_nvt, family)"
-           " VALUES"
-           " (%llu, %s, %llu, %llu, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           iterator_int64 (&rows, 2),
-           iterator_int64 (&rows, 3),
-           quoted_family_or_nvt,
-           quoted_family);
-      g_free (quoted_name);
-      g_free (quoted_family_or_nvt);
-      g_free (quoted_family);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE nvt_selectors_4;");
-
-  /* Table nvts. */
-  init_iterator (&rows,
-                 "SELECT rowid, oid, version, name, summary, description,"
-                 " copyright, cve, bid, xref, tag, sign_key_ids, category,"
-                 " family"
-                 " FROM nvts_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_oid = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_version = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 3));
-      gchar *quoted_summary = sql_insert (iterator_string (&rows, 4));
-      gchar *quoted_description = sql_insert (iterator_string (&rows, 5));
-      gchar *quoted_copyright = sql_insert (iterator_string (&rows, 6));
-      gchar *quoted_cve = sql_insert (iterator_string (&rows, 7));
-      gchar *quoted_bid = sql_insert (iterator_string (&rows, 8));
-      gchar *quoted_xref = sql_insert (iterator_string (&rows, 9));
-      gchar *quoted_tag = sql_insert (iterator_string (&rows, 10));
-      gchar *quoted_sign_key_ids = sql_insert (iterator_string (&rows, 11));
-      gchar *quoted_family = sql_insert (iterator_string (&rows, 13));
-
-      {
-        /* Starting from revision 5726 on 2009-10-26 (just before 0.9.2),
-         * the Manager converts semicolons in OTP NVT descriptions to newlines
-         * before entering them in the database.  Convert the existing
-         * semicolons here, because it is a convenient place to do it. */
-        gchar* pos = quoted_description;
-        while ((pos = strchr (pos, ';')))
-          pos[0] = '\n';
-      }
-
-      sql ("INSERT into nvts"
-           " (id, oid, version, name, summary, description, copyright, cve,"
-           "  bid, xref, tag, sign_key_ids, category, family)"
-           " VALUES"
-           " (%llu, %s, %s, %s, %s, %s, %s, %s, %s, %s,"
-           "  %s, %s, %llu, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_oid,
-           quoted_version,
-           quoted_name,
-           quoted_summary,
-           quoted_description,
-           quoted_copyright,
-           quoted_cve,
-           quoted_bid,
-           quoted_xref,
-           quoted_tag,
-           quoted_sign_key_ids,
-           iterator_int64 (&rows, 12),
-           quoted_family);
-      g_free (quoted_oid);
-      g_free (quoted_version);
-      g_free (quoted_name);
-      g_free (quoted_summary);
-      g_free (quoted_description);
-      g_free (quoted_copyright);
-      g_free (quoted_cve);
-      g_free (quoted_bid);
-      g_free (quoted_xref);
-      g_free (quoted_tag);
-      g_free (quoted_sign_key_ids);
-      g_free (quoted_family);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE nvts_4;");
-
-  /* Table report_hosts. */
-  init_iterator (&rows,
-                 "SELECT rowid, report, host, start_time, end_time,"
-                 " attack_state, current_port, max_port"
-                 " FROM report_hosts_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_host = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_start_time = sql_insert (iterator_string (&rows, 3));
-      gchar *quoted_end_time = sql_insert (iterator_string (&rows, 4));
-      gchar *quoted_attack_state = sql_insert (iterator_string (&rows, 5));
-      gchar *quoted_current_port = sql_insert (iterator_string (&rows, 6));
-      gchar *quoted_max_port = sql_insert (iterator_string (&rows, 7));
-      sql ("INSERT into report_hosts"
-           " (id, report, host, start_time, end_time, attack_state,"
-           "  current_port, max_port)"
-           " VALUES"
-           " (%llu, %llu, %s, %s, %s, %s, %s, %s);",
-           iterator_int64 (&rows, 0),
-           iterator_int64 (&rows, 1),
-           quoted_host,
-           quoted_start_time,
-           quoted_end_time,
-           quoted_attack_state,
-           quoted_current_port,
-           quoted_max_port);
-      g_free (quoted_host);
-      g_free (quoted_start_time);
-      g_free (quoted_end_time);
-      g_free (quoted_attack_state);
-      g_free (quoted_current_port);
-      g_free (quoted_max_port);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE report_hosts_4;");
-
-  /* Table report_results. */
-  init_iterator (&rows, "SELECT rowid, report, result FROM report_results_4;");
-  while (next (&rows))
-    {
-      sql ("INSERT into report_results (id, report, result)"
-           " VALUES (%llu, %llu, %llu)",
-           iterator_int64 (&rows, 0),
-           iterator_int64 (&rows, 1),
-           iterator_int64 (&rows, 2));
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE report_results_4;");
-
-  /* Table reports. */
-  init_iterator (&rows,
-                 "SELECT rowid, uuid, hidden, task, date, start_time, end_time,"
-                 " nbefile, comment, scan_run_status"
-                 " FROM reports_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_uuid = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_start_time = sql_insert (iterator_string (&rows, 5));
-      gchar *quoted_end_time = sql_insert (iterator_string (&rows, 6));
-      gchar *quoted_nbefile = sql_insert (iterator_string (&rows, 7));
-      gchar *quoted_comment = sql_insert (iterator_string (&rows, 8));
-      sql ("INSERT into reports"
-           " (id, uuid, hidden, task, date, start_time, end_time, nbefile,"
-           "  comment, scan_run_status)"
-           " VALUES"
-           " (%llu, %s, %llu, %llu, %llu, %s, %s, %s, %s, %llu);",
-           iterator_int64 (&rows, 0),
-           quoted_uuid,
-           iterator_int64 (&rows, 2),
-           iterator_int64 (&rows, 3),
-           iterator_int64 (&rows, 4),
-           quoted_start_time,
-           quoted_end_time,
-           quoted_nbefile,
-           quoted_comment,
-           iterator_int64 (&rows, 9));
-      g_free (quoted_uuid);
-      g_free (quoted_start_time);
-      g_free (quoted_end_time);
-      g_free (quoted_nbefile);
-      g_free (quoted_comment);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE reports_4;");
-
-  /* Table results. */
-  init_iterator (&rows,
-                 "SELECT rowid, task, subnet, host, port, nvt, type,"
-                 " description"
-                 " FROM results_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_subnet = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_host = sql_insert (iterator_string (&rows, 3));
-      gchar *quoted_port = sql_insert (iterator_string (&rows, 4));
-      gchar *quoted_nvt = sql_insert (iterator_string (&rows, 5));
-      gchar *quoted_type = sql_insert (iterator_string (&rows, 6));
-      gchar *quoted_description = sql_insert (iterator_string (&rows, 7));
-      sql ("INSERT into results"
-           " (id, task, subnet, host, port, nvt, type, description)"
-           " VALUES"
-           " (%llu, %llu, %s, %s, %s, %s, %s, %s);",
-           iterator_int64 (&rows, 0),
-           iterator_int64 (&rows, 1),
-           quoted_subnet,
-           quoted_host,
-           quoted_port,
-           quoted_nvt,
-           quoted_type,
-           quoted_description);
-      g_free (quoted_subnet);
-      g_free (quoted_host);
-      g_free (quoted_port);
-      g_free (quoted_nvt);
-      g_free (quoted_type);
-      g_free (quoted_description);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE results_4;");
-
-  /* Table targets. */
-  init_iterator (&rows, "SELECT rowid, name, hosts, comment FROM targets_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_hosts = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_comment = sql_insert (iterator_string (&rows, 3));
-      sql ("INSERT into targets (id, name, hosts, comment)"
-           " VALUES (%llu, %s, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           quoted_hosts,
-           quoted_comment);
-      g_free (quoted_name);
-      g_free (quoted_hosts);
-      g_free (quoted_comment);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE targets_4;");
-
-  /* Table task_files. */
-  init_iterator (&rows, "SELECT rowid, task, name, content FROM task_files_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_content = sql_insert (iterator_string (&rows, 3));
-      sql ("INSERT into task_files (id, task, name, content)"
-           " VALUES (%llu, %llu, %s, %s);",
-           iterator_int64 (&rows, 0),
-           iterator_int64 (&rows, 1),
-           quoted_name,
-           quoted_content);
-      g_free (quoted_name);
-      g_free (quoted_content);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE task_files_4;");
-
-  /* Table tasks. */
-  init_iterator (&rows,
-                 "SELECT rowid, uuid, name, hidden, time, comment, description,"
-                 " owner, run_status, start_time, end_time, config, target"
-                 " FROM tasks_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_uuid = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 2));
-      gchar *quoted_time = sql_insert (iterator_string (&rows, 4));
-      gchar *quoted_comment = sql_insert (iterator_string (&rows, 5));
-      gchar *quoted_description = sql_insert (iterator_string (&rows, 6));
-      gchar *quoted_start_time = sql_insert (iterator_string (&rows, 9));
-      gchar *quoted_end_time = sql_insert (iterator_string (&rows, 10));
-      gchar *quoted_config = sql_insert (iterator_string (&rows, 11));
-      gchar *quoted_target = sql_insert (iterator_string (&rows, 12));
-      sql ("INSERT into tasks"
-           " (id, uuid, name, hidden, time, comment, description, owner,"
-           "  run_status, start_time, end_time, config, target)"
-           " VALUES"
-           " (%llu, %s, %s, %llu, %s, %s, %s, %llu, %llu, %s,"
-           "  %s, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_uuid,
-           quoted_name,
-           iterator_int64 (&rows, 3),
-           quoted_time,
-           quoted_comment,
-           quoted_description,
-           iterator_int64 (&rows, 7),
-           iterator_int64 (&rows, 8),
-           quoted_start_time,
-           quoted_end_time,
-           quoted_config,
-           quoted_target);
-      g_free (quoted_uuid);
-      g_free (quoted_name);
-      g_free (quoted_time);
-      g_free (quoted_comment);
-      g_free (quoted_description);
-      g_free (quoted_start_time);
-      g_free (quoted_end_time);
-      g_free (quoted_config);
-      g_free (quoted_target);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE tasks_4;");
-
-  /* Table users. */
-  init_iterator (&rows, "SELECT rowid, name, password FROM users_4;");
-  while (next (&rows))
-    {
-      gchar *quoted_name = sql_insert (iterator_string (&rows, 1));
-      gchar *quoted_password = sql_insert (iterator_string (&rows, 2));
-      sql ("INSERT into users (id, name, password)"
-           " VALUES (%llu, %s, %s);",
-           iterator_int64 (&rows, 0),
-           quoted_name,
-           quoted_password);
-      g_free (quoted_name);
-      g_free (quoted_password);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE users_4;");
-}
-
-/**
- * @brief Migrate the database from version 4 to version 5.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_4_to_5 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 4. */
-
-  if (manage_db_version () != 4)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Every table got an "id INTEGER PRIMARY KEY" column.  As the column is a
-   * primary key, every table must be recreated and the data transferred.
-   *
-   * Also, starting from revision 5726 on 2009-10-26 (just before 0.9.2),
-   * the Manager converts semicolons in OTP NVT descriptions to newlines
-   * before entering them in the database.  Convert the existing
-   * semicolons while transferring the data.  This should have been an
-   * entirely separate version and migration between the current 4 and 5. */
-
-  /* Ensure that all tables exist that will be adjusted below. */
-
-  /* Both introduced between version 1 and 2. */
-  sql ("CREATE TABLE IF NOT EXISTS nvt_preferences (name, value);");
-  sql ("CREATE TABLE IF NOT EXISTS task_files (task INTEGER, name, content);");
-
-  /* Move the tables away. */
-
-  sql ("ALTER TABLE config_preferences RENAME TO config_preferences_4;");
-  sql ("ALTER TABLE configs RENAME TO configs_4;");
-  sql ("ALTER TABLE lsc_credentials RENAME TO lsc_credentials_4;");
-  sql ("ALTER TABLE meta RENAME TO meta_4;");
-  sql ("ALTER TABLE nvt_preferences RENAME TO nvt_preferences_4;");
-  sql ("ALTER TABLE nvt_selectors RENAME TO nvt_selectors_4;");
-  sql ("ALTER TABLE nvts RENAME TO nvts_4;");
-  sql ("ALTER TABLE report_hosts RENAME TO report_hosts_4;");
-  sql ("ALTER TABLE report_results RENAME TO report_results_4;");
-  sql ("ALTER TABLE reports RENAME TO reports_4;");
-  sql ("ALTER TABLE results RENAME TO results_4;");
-  sql ("ALTER TABLE targets RENAME TO targets_4;");
-  sql ("ALTER TABLE task_files RENAME TO task_files_4;");
-  sql ("ALTER TABLE tasks RENAME TO tasks_4;");
-  sql ("ALTER TABLE users RENAME TO users_4;");
-
-  /* Create the new tables in version 4 format. */
-
-  create_tables_version_4 ();
-
-  /* Copy the data into the new tables, dropping the old tables. */
-
-  migrate_4_to_5_copy_data ();
-
-  /* Set the database version to 5. */
-
-  set_db_version (5);
-
-  sql_commit ();
-
-  /* All the moving may have left much empty space, so vacuum. */
-
-  sql ("VACUUM;");
-
-  return 0;
-}
-
-/**
- * @brief Move a config that is using a predefined ID.
- *
- * @param[in]  predefined_config_name  Name of the predefined config.
- * @param[in]  predefined_config_id    Row ID of the predefined config.
- */
-void
-migrate_5_to_6_move_other_config (const char *predefined_config_name,
-                                  config_t predefined_config_id)
-{
-  if (sql_int ("SELECT COUNT(*) = 0 FROM configs"
-               " WHERE name = '%s';",
-               predefined_config_name)
-      && sql_int ("SELECT COUNT(*) = 1 FROM configs"
-                  " WHERE id = %llu;",
-                  predefined_config_id))
-    {
-      config_t config;
-      char *name;
-      gchar *quoted_name;
-
-      sql ("INSERT into configs (nvt_selector, comment, family_count,"
-           " nvt_count, nvts_growing, families_growing)"
-           " SELECT nvt_selector, comment, family_count,"
-           " nvt_count, nvts_growing, families_growing"
-           " FROM configs"
-           " WHERE id = %llu;",
-           predefined_config_id);
-      /* This ID will be larger then predefined_config_id because
-       * predefined_config_id exists already.  At worst the ID will be one
-       * larger. */
-      config = sql_last_insert_id ();
-      sql ("UPDATE config_preferences SET config = %llu WHERE config = %llu;",
-           config,
-           predefined_config_id);
-      name = sql_string ("SELECT name FROM configs WHERE id = %llu;",
-                         predefined_config_id);
-      if (name == NULL)
-        {
-          sql_rollback ();
-          abort ();
-        }
-      quoted_name = sql_quote (name);
-      free (name);
-      /* Table tasks references config by name, so it stays the same. */
-      sql ("DELETE FROM configs WHERE id = %llu;",
-           predefined_config_id);
-      sql ("UPDATE configs SET name = '%s' WHERE id = %llu;",
-           quoted_name,
-           config);
-      g_free (quoted_name);
-    }
-}
-
-/**
- * @brief Migrate the database from version 5 to version 6.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_5_to_6 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 5. */
-
-  if (manage_db_version () != 5)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The predefined configs got predefined ID's and the manager now also
-   * caches counts for growing configs. */
-
-  /* Fail with a message if the predefined configs have somehow got ID's
-   * other than the usual ones. */
-
-  if (sql_int ("SELECT COUNT(*) = 0 OR id == 1 FROM configs"
-               " WHERE name = 'Full and fast';")
-      && sql_int ("SELECT COUNT(*) = 0 OR id == 2 FROM configs"
-                  " WHERE name = 'Full and fast ultimate';")
-      && sql_int ("SELECT COUNT(*) = 0 OR id == 3 FROM configs"
-                  " WHERE name = 'Full and very deep';")
-      && sql_int ("SELECT COUNT(*) = 0 OR id == 4 FROM configs"
-                  " WHERE name = 'Full and very deep ultimate';"))
-    {
-      /* Any predefined configs are OK.  Move any other configs that have the
-       * predefined ID's. */
-
-      /* The ID of the moved config may be only one larger, so these must
-       * be done in ID order. */
-      migrate_5_to_6_move_other_config ("Full and fast", 1);
-      migrate_5_to_6_move_other_config ("Full and fast ultimate", 2);
-      migrate_5_to_6_move_other_config ("Full and very deep", 3);
-      migrate_5_to_6_move_other_config ("Full and very deep ultimate", 4);
-    }
-  else
-    {
-      g_warning ("%s: a predefined config has moved from the standard location,"
-                 " giving up",
-                 __FUNCTION__);
-      sql_rollback ();
-      return -1;
-    }
-
-  /* This would need a duplicate version of update_all_config_caches that
-   * worked with the version 6 database.  Just let the cache be wrong.  This
-   * is a very old version now. */
-#if 0
-  /* Update cache counts for growing configs. */
-
-  update_all_config_caches ();
-#endif
-
-  /* Set the database version to 6. */
-
-  set_db_version (6);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 6 to version 7.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_6_to_7 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 6. */
-
-  if (manage_db_version () != 6)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add lsc_credential column to targets table. */
-  sql ("ALTER TABLE targets ADD COLUMN lsc_credential INTEGER;");
-  sql ("UPDATE targets SET lsc_credential = 0;");
-
-  /* Set the database version to 7. */
-
-  set_db_version (7);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 7 to version 8.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_7_to_8 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 7. */
-
-  if (manage_db_version () != 7)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The lsc_credentials table got a login column. */
-
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN login;");
-  sql ("UPDATE lsc_credentials SET login = name;");
-
-  /* Set the database version to 8. */
-
-  set_db_version (8);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 8 to version 9.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_8_to_9 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 8. */
-
-  if (manage_db_version () != 8)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure that all tables that will be modified here exist.  These were
-   * all added after version 8 anyway. */
-
-  sql ("CREATE TABLE IF NOT EXISTS escalators"
-       " (id INTEGER PRIMARY KEY, name UNIQUE, comment, event INTEGER,"
-       "  condition INTEGER, method INTEGER);");
-
-  sql ("CREATE TABLE IF NOT EXISTS agents"
-       " (id INTEGER PRIMARY KEY, name UNIQUE, comment, installer TEXT,"
-       "  howto_install TEXT, howto_use TEXT);");
-
-  /* Many tables got an owner column. */
-
-  sql ("ALTER TABLE targets ADD COLUMN owner INTEGER;");
-  sql ("UPDATE targets SET owner = NULL;");
-
-  sql ("ALTER TABLE configs ADD COLUMN owner INTEGER;");
-  sql ("UPDATE configs SET owner = NULL;");
-
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN owner INTEGER;");
-  sql ("UPDATE lsc_credentials SET owner = NULL;");
-
-  sql ("ALTER TABLE escalators ADD COLUMN owner INTEGER;");
-  sql ("UPDATE escalators SET owner = NULL;");
-
-  sql ("ALTER TABLE reports ADD COLUMN owner INTEGER;");
-  sql ("UPDATE reports SET owner = NULL;");
-
-  sql ("ALTER TABLE agents ADD COLUMN owner INTEGER;");
-  sql ("UPDATE agents SET owner = NULL;");
-
-  /* The owner column in tasks changed type from string to int.  This
-   * may be a redundant conversion, as SQLite may have converted these
-   * values automatically in each query anyway. */
-
-  sql ("UPDATE tasks SET owner = CAST (owner AS INTEGER);"),
-
-  /* Set the database version to 9. */
-
-  set_db_version (9);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Return the UUID of a user from the GVM user UUID file.
- *
- * @param[in]  name   User name.
- *
- * @return UUID of given user if user exists, else NULL.
- */
-gchar *
-migrate_9_to_10_user_uuid (const char *name)
-{
-  gchar *uuid_file;
-
-  uuid_file = g_build_filename (GVM_STATE_DIR, "users", name, "uuid", NULL);
-  if (g_file_test (uuid_file, G_FILE_TEST_EXISTS))
-    {
-      gsize size;
-      gchar *uuid;
-      /* File exists, get its content (the uuid). */
-      if (g_file_get_contents (uuid_file, &uuid, &size, NULL))
-        {
-          if (strlen (uuid) < 36)
-            g_free (uuid);
-          else
-            {
-              g_free (uuid_file);
-              /* Drop any trailing characters. */
-              uuid[36] = '\0';
-              return uuid;
-            }
-        }
-    }
-  g_free (uuid_file);
-  return NULL;
-}
-
-/**
- * @brief Migrate the database from version 9 to version 10.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_9_to_10 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 9. */
-
-  if (manage_db_version () != 9)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The user table got a unique "uuid" column and lost the
-   * uniqueness of its "name" column. */
-
-  sql ("ALTER TABLE users RENAME TO users_9;");
-
-  sql ("CREATE TABLE users"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, name, password);");
-
-  init_iterator (&rows, "SELECT id, name, password FROM users_9;");
-  while (next (&rows))
-    {
-      gchar *quoted_name, *quoted_password, *uuid;
-
-      uuid = migrate_9_to_10_user_uuid (iterator_string (&rows, 1));
-      if (uuid == NULL)
-        {
-          uuid = gvm_uuid_make ();
-          if (uuid == NULL)
-            {
-              cleanup_iterator (&rows);
-              sql_rollback ();
-              return -1;
-            }
-        }
-
-      quoted_name = sql_insert (iterator_string (&rows, 1));
-      quoted_password = sql_insert (iterator_string (&rows, 2));
-      sql ("INSERT into users (id, uuid, name, password)"
-           " VALUES (%llu, '%s', %s, %s);",
-           iterator_int64 (&rows, 0),
-           uuid,
-           quoted_name,
-           quoted_password);
-      g_free (uuid);
-      g_free (quoted_name);
-      g_free (quoted_password);
-    }
-  cleanup_iterator (&rows);
-  sql ("DROP TABLE users_9;");
-
-  /* Set the database version to 10. */
-
-  set_db_version (10);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 10 to version 11.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_10_to_11 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 10. */
-
-  if (manage_db_version () != 10)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The config and target columns of the tasks table changed from the name
-   * of the config/target to the id of the config/target.
-   *
-   * Recreate the table, in order to add INTEGER to the column definitions. */
-
-  sql ("ALTER TABLE tasks RENAME TO tasks_10;");
-
-  sql ("CREATE TABLE tasks"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, hidden INTEGER,"
-       "  time, comment, description, run_status INTEGER, start_time,"
-       "  end_time, config INTEGER, target INTEGER);");
-
-  sql ("INSERT into tasks"
-       " (id, uuid, owner, name, hidden, time, comment, description,"
-       "  run_status, start_time, end_time, config, target)"
-       " SELECT"
-       "  id, uuid, owner, name, hidden, time, comment, description,"
-       "  run_status, start_time, end_time,"
-       "  (SELECT id FROM configs WHERE configs.name = tasks_10.config),"
-       "  (SELECT id FROM targets WHERE targets.name = tasks_10.target)"
-       " FROM tasks_10;");
-
-  sql ("DROP TABLE tasks_10;");
-
-  /* Set the database version to 11. */
-
-  set_db_version (11);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 11 to version 12.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_11_to_12 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 11. */
-
-  if (manage_db_version () != 11)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Tables agents, configs and escalators were relieved of the UNIQUE
-   * constraint on the name column.
-   *
-   * Recreate the tables, in order to remove the constraint. */
-
-  sql ("ALTER TABLE agents RENAME TO agents_11;");
-
-  sql ("CREATE TABLE agents"
-       " (id INTEGER PRIMARY KEY, owner INTEGER, name, comment,"
-       "  installer TEXT, howto_install TEXT, howto_use TEXT);");
-
-  sql ("INSERT into agents"
-       " (id, owner, name, comment, installer, howto_install, howto_use)"
-       " SELECT"
-       "  id, owner, name, comment, installer, howto_install, howto_use"
-       " FROM agents_11;");
-
-  sql ("DROP TABLE agents_11;");
-
-  sql ("ALTER TABLE configs RENAME TO configs_11;");
-
-  sql ("CREATE TABLE configs"
-       " (id INTEGER PRIMARY KEY, owner INTEGER, name, nvt_selector, comment,"
-       "  family_count INTEGER, nvt_count INTEGER, families_growing INTEGER,"
-       "  nvts_growing INTEGER);");
-
-  sql ("INSERT into configs"
-       " (id, owner, name, nvt_selector, comment, family_count, nvt_count,"
-       "  families_growing, nvts_growing)"
-       " SELECT"
-       "  id, owner, name, nvt_selector, comment, family_count, nvt_count,"
-       "  families_growing, nvts_growing"
-       " FROM configs_11;");
-
-  sql ("DROP TABLE configs_11;");
-
-  sql ("ALTER TABLE escalators RENAME TO escalators_11;");
-
-  sql ("CREATE TABLE escalators"
-       " (id INTEGER PRIMARY KEY, owner INTEGER, name, comment, event INTEGER,"
-       "  condition INTEGER, method INTEGER);");
-
-  sql ("INSERT into escalators"
-       " (id, owner, name, comment, event, condition, method)"
-       " SELECT"
-       "  id, owner, name, comment, event, condition, method"
-       " FROM escalators_11;");
-
-  sql ("DROP TABLE escalators_11;");
-
-  /* Set the database version to 12. */
-
-  set_db_version (12);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 12 to version 13.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_12_to_13 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 12. */
-
-  if (manage_db_version () != 12)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Table nvt_selectors column name changed to a UUID.
-   *
-   * Replace names with UUIDs, ensuring that the 'All' selector gets the
-   * predefined UUID. */
-
-  init_iterator (&rows, "SELECT distinct name FROM nvt_selectors;");
-  while (next (&rows))
-    {
-      gchar *quoted_name, *uuid;
-
-      if (strcmp (iterator_string (&rows, 0), "All") == 0)
-        continue;
-
-      uuid = gvm_uuid_make ();
-      if (uuid == NULL)
-        {
-          cleanup_iterator (&rows);
-          sql_rollback ();
-          return -1;
-        }
-
-      quoted_name = sql_insert (iterator_string (&rows, 0));
-
-      sql ("UPDATE nvt_selectors SET name = '%s' WHERE name = %s;",
-           uuid,
-           quoted_name);
-
-      sql ("UPDATE configs SET nvt_selector = '%s' WHERE nvt_selector = %s;",
-           uuid,
-           quoted_name);
-
-      g_free (uuid);
-      g_free (quoted_name);
-    }
-  cleanup_iterator (&rows);
-
-  if (sql_int ("SELECT COUNT(*) FROM nvt_selectors WHERE name = '"
-               MANAGE_NVT_SELECTOR_UUID_ALL "';"))
-    sql ("DELETE FROM nvt_selectors WHERE name = 'All';");
-  else
-    sql ("UPDATE nvt_selectors"
-         " SET name = '" MANAGE_NVT_SELECTOR_UUID_ALL "'"
-         " WHERE name = 'All';");
-
-  sql ("UPDATE configs"
-       " SET nvt_selector = '" MANAGE_NVT_SELECTOR_UUID_ALL "'"
-       " WHERE nvt_selector = 'All';");
-
-  /* Set the database version to 13. */
-
-  set_db_version (13);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 13 to version 14.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_13_to_14 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 13. */
-
-  if (manage_db_version () != 13)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Table results got a UUID column. */
-
-  sql ("ALTER TABLE results ADD COLUMN uuid;");
-  sql ("UPDATE results SET uuid = make_uuid();");
-
-  /* Set the database version to 14. */
-
-  set_db_version (14);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 14 to version 15.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_14_to_15 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 14. */
-
-  if (manage_db_version () != 14)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Table tasks got columns for scheduling info. */
-
-  sql ("ALTER TABLE tasks ADD COLUMN schedule INTEGER;");
-  sql ("ALTER TABLE tasks ADD COLUMN schedule_next_time;");
-  sql ("UPDATE tasks SET schedule = 0, schedule_next_time = 0;");
-
-  /* Set the database version to 15. */
-
-  set_db_version (15);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 15 to version 16.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_15_to_16 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 15. */
-
-  if (manage_db_version () != 15)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Table schedules got a period_months column. */
-
-  sql ("CREATE TABLE IF NOT EXISTS schedules"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment,"
-       "  first_time, period, duration);");
-
-  sql ("ALTER TABLE schedules ADD COLUMN period_months;");
-  sql ("UPDATE schedules SET period_months = 0;");
-
-  /* GSA was hardcoded to set the comment to "comment" before revision 7157,
-   * so clear all task comments here. */
-
-  sql ("UPDATE tasks SET comment = '';");
-
-  /* Set the database version to 16. */
-
-  set_db_version (16);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 16 to version 17.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_16_to_17 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 16. */
-
-  if (manage_db_version () != 16)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Table nvts got columns for CVSS base and risk factor. */
-
-  sql ("ALTER TABLE nvts ADD COLUMN cvss_base;");
-  sql ("ALTER TABLE nvts ADD COLUMN risk_factor;");
-
-  /* Move the CVSS and risk values out of any existing tags. */
-
-  init_iterator (&rows, "SELECT id, tag FROM nvts;");
-  while (next (&rows))
-    {
-      gchar *tags, *cvss_base;
-
-      /* With db version 83, the risk_factor is dropped anyway, so
-       * the value can be ignored already here.
-       */
-      parse_tags (iterator_string (&rows, 1), &tags, &cvss_base);
-
-      sql ("UPDATE nvts SET cvss_base = '%s', risk_factor = '%s', tag = '%s'"
-           " WHERE id = %llu;",
-           cvss_base ? cvss_base : "",
-           "",
-           tags ? tags : "",
-           iterator_int64 (&rows, 0));
-
-      g_free (tags);
-      g_free (cvss_base);
-    }
-  cleanup_iterator (&rows);
-
-  /* Set the database version to 17. */
-
-  set_db_version (17);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Set the pref for migrate_17_to_18.
- *
- * @param[in]  config  Config to set pref on.
- */
-void
-migrate_17_to_18_set_pref (config_t config)
-{
-  if (sql_int ("SELECT count(*) FROM config_preferences"
-               " WHERE config = %llu"
-               " AND name ="
-               " 'Ping Host[checkbox]:Mark unrechable Hosts as dead"
-               " (not scanning)'",
-               config)
-      == 0)
-    sql ("INSERT into config_preferences (config, type, name, value)"
-         " VALUES (%llu, 'PLUGINS_PREFS',"
-         " 'Ping Host[checkbox]:Mark unrechable Hosts as dead (not scanning)',"
-         " 'yes');",
-         config);
-}
-
-/**
- * @brief Migrate the database from version 17 to version 18.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_17_to_18 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 17. */
-
-  if (manage_db_version () != 17)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* NVT "Ping Host" was added to the predefined configs, with the
-   * "Mark unrechable..." preference set to "yes". */
-
-  /* Add "Ping Host" to the "All" NVT selector. */
-
-  if (sql_int ("SELECT count(*) FROM nvt_selectors WHERE name ="
-               " '" MANAGE_NVT_SELECTOR_UUID_ALL "'"
-               " AND family_or_nvt = '1.3.6.1.4.1.25623.1.0.100315';")
-      == 0)
-    {
-      sql ("INSERT into nvt_selectors"
-           " (name, exclude, type, family_or_nvt, family)"
-           " VALUES ('" MANAGE_NVT_SELECTOR_UUID_ALL "', 0, "
-           G_STRINGIFY (NVT_SELECTOR_TYPE_NVT) ","
-           /* OID of the "Ping Host" NVT. */
-           " '1.3.6.1.4.1.25623.1.0.100315', 'Port scanners');");
-    }
-
-  /* Ensure the preference is set on the predefined configs. */
-
-  migrate_17_to_18_set_pref (CONFIG_ID_FULL_AND_FAST);
-  migrate_17_to_18_set_pref (CONFIG_ID_FULL_AND_FAST_ULTIMATE);
-  migrate_17_to_18_set_pref (CONFIG_ID_FULL_AND_VERY_DEEP);
-  migrate_17_to_18_set_pref (CONFIG_ID_FULL_AND_VERY_DEEP_ULTIMATE);
-
-  /* Set the database version to 18. */
-
-  set_db_version (18);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 18 to version 19.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_18_to_19 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 18. */
-
-  if (manage_db_version () != 18)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Many tables got a unique UUID column.  As a result the predefined
-   * configs and target got fixed UUIDs.
-   *
-   * Recreate the tables, in order to add the unique constraint. */
-
-  sql ("ALTER TABLE agents RENAME TO agents_18;");
-
-  sql ("CREATE TABLE agents"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  installer TEXT, howto_install TEXT, howto_use TEXT);");
-
-  sql ("INSERT into agents"
-       " (id, uuid, owner, name, comment, installer, howto_install, howto_use)"
-       " SELECT"
-       "  id, make_uuid (), owner, name, comment, installer, howto_install, howto_use"
-       " FROM agents_18;");
-
-  sql ("DROP TABLE agents_18;");
-
-  sql ("ALTER TABLE configs RENAME TO configs_18;");
-
-  sql ("CREATE TABLE configs"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name,"
-       "  nvt_selector, comment, family_count INTEGER, nvt_count INTEGER,"
-       "  families_growing INTEGER, nvts_growing INTEGER);");
-
-  sql ("INSERT into configs"
-       " (id, uuid, owner, name, nvt_selector, comment, family_count,"
-       "  nvt_count, families_growing, nvts_growing)"
-       " SELECT"
-       "  id, make_uuid (), owner, name, nvt_selector, comment, family_count,"
-       "  nvt_count, families_growing, nvts_growing"
-       " FROM configs_18;");
-
-  sql ("DROP TABLE configs_18;");
-
-  sql ("ALTER TABLE escalators RENAME TO escalators_18;");
-
-  sql ("CREATE TABLE escalators"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  event INTEGER, condition INTEGER, method INTEGER);");
-
-  sql ("INSERT into escalators"
-       " (id, uuid, owner, name, comment, event, condition, method)"
-       " SELECT"
-       "  id, make_uuid (), owner, name, comment, event, condition, method"
-       " FROM escalators_18;");
-
-  sql ("DROP TABLE escalators_18;");
-
-  sql ("ALTER TABLE lsc_credentials RENAME TO lsc_credentials_18;");
-
-  sql ("CREATE TABLE lsc_credentials"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, login,"
-       "  password, comment, public_key TEXT, private_key TEXT, rpm TEXT,"
-       "  deb TEXT, exe TEXT);");
-
-  sql ("INSERT into lsc_credentials"
-       " (id, uuid, owner, name, login, password, comment, public_key,"
-       "  private_key, rpm, deb, exe)"
-       " SELECT"
-       "  id, make_uuid (), owner, name, login, password, comment, public_key,"
-       "  private_key, rpm, deb, exe"
-       " FROM lsc_credentials_18;");
-
-  sql ("DROP TABLE lsc_credentials_18;");
-
-  sql ("ALTER TABLE targets RENAME TO targets_18;");
-
-  sql ("CREATE TABLE targets"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, hosts,"
-       "  comment, lsc_credential INTEGER);");
-
-  sql ("INSERT into targets"
-       " (id, uuid, owner, name, hosts, comment, lsc_credential)"
-       " SELECT"
-       "  id, make_uuid (), owner, name, hosts, comment, lsc_credential"
-       " FROM targets_18;");
-
-  sql ("DROP TABLE targets_18;");
-
-  /* Set the new predefined UUIDs. */
-
-  sql ("UPDATE configs"
-       " SET uuid = '" CONFIG_UUID_FULL_AND_FAST "'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_FAST) ";");
-
-  sql ("UPDATE configs"
-       " SET uuid = '" CONFIG_UUID_FULL_AND_FAST_ULTIMATE "'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_FAST_ULTIMATE) ";");
-
-  sql ("UPDATE configs"
-       " SET uuid = '" CONFIG_UUID_FULL_AND_VERY_DEEP "'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_VERY_DEEP) ";");
-
-  sql ("UPDATE configs"
-       " SET uuid = '" CONFIG_UUID_FULL_AND_VERY_DEEP_ULTIMATE "'"
-       " WHERE id = "
-       G_STRINGIFY (CONFIG_ID_FULL_AND_VERY_DEEP_ULTIMATE) ";");
-
-  sql ("UPDATE configs"
-       " SET uuid = '" CONFIG_UUID_EMPTY "'"
-       " WHERE name = 'empty';");
-
-  sql ("UPDATE targets"
-       " SET uuid = 'b493b7a8-7489-11df-a3ec-002264764cea'"
-       " WHERE name = 'Localhost';");
-
-  /* Set the database version to 19. */
-
-  set_db_version (19);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 19 to version 20.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_19_to_20 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 19. */
-
-  if (manage_db_version () != 19)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The agents table got new columns.  In particular the installer column
-   * moved to installer_64 and the table got a new installer column with the
-   * plain installer. */
-
-  sql ("ALTER TABLE agents ADD COLUMN installer_64 TEXT;");
-  sql ("ALTER TABLE agents ADD COLUMN installer_signature_64 TEXT;");
-  sql ("ALTER TABLE agents ADD COLUMN installer_trust INTEGER;");
-
-  init_iterator (&rows, "SELECT id, installer FROM agents;");
-  while (next (&rows))
-    {
-      const char *installer_64 = iterator_string (&rows, 1);
-      gchar *installer;
-      gsize installer_size;
-      int ret;
-      sql_stmt_t* stmt;
-
-      sql ("UPDATE agents SET"
-           " installer_trust = %i,"
-           " installer_64 = installer,"
-           " installer_signature_64 = ''"
-           " WHERE id = %llu",
-           TRUST_UNKNOWN,
-           iterator_int64 (&rows, 0));
-
-      stmt = sql_prepare ("UPDATE agents SET installer = $1"
-                          " WHERE id = %llu;",
-                          iterator_int64 (&rows, 0));
-
-      /* Prepare statement. */
-
-      if (stmt == NULL)
-        {
-          g_warning ("%s: sql_prepare failed", __FUNCTION__);
-          cleanup_iterator (&rows);
-          sql_rollback ();
-          return -1;
-        }
-
-      if (strlen (installer_64) > 0)
-        installer = (gchar*) g_base64_decode (installer_64, &installer_size);
-      else
-        {
-          installer = g_strdup ("");
-          installer_size = 0;
-        }
-
-      /* Bind the packages to the "$1" in the SQL statement. */
-
-      if (sql_bind_text (stmt, 1, installer, installer_size))
-        {
-          g_warning ("%s: sql_bind_text failed", __FUNCTION__);
-          cleanup_iterator (&rows);
-          sql_rollback ();
-          g_free (installer);
-          return -1;
-        }
-      g_free (installer);
-
-      /* Run the statement. */
-
-      while ((ret = sql_exec (stmt)) > 0);
-      if (ret < 0)
-        {
-          g_warning ("%s: sql_exec failed", __FUNCTION__);
-          cleanup_iterator (&rows);
-          sql_rollback ();
-          return -1;
-        }
-
-      sql_finalize (stmt);
-    }
-  cleanup_iterator (&rows);
-
-  /* Set the database version to 20. */
-
-  set_db_version (20);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 20 to version 21.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_20_to_21 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 20. */
-
-  if (manage_db_version () != 20)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The agents table got an installer_filename columns. */
-
-  sql ("ALTER TABLE agents ADD COLUMN installer_filename TEXT;");
-
-  /* Set the database version to 21. */
-
-  set_db_version (21);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the report formats from version 21 to version 22.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_21_to_22 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 21. */
-
-  if (manage_db_version () != 21)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the report formats.
-   *
-   * The name of the report format directories on disk changed from the report
-   * format name to the report format UUID. */
-
-  /* Ensure that the report_formats table exists. */
-
-  sql ("CREATE TABLE IF NOT EXISTS report_formats"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, extension,"
-       "  content_type, summary, description);");
-
-  /* Ensure that the predefined formats all exist in the database. */
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'CPE';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'CPE',"
-         " 'Common Product Enumeration CSV table.',"
-         " 'CPE stands for Common Product Enumeration.  It is a structured naming scheme for\n"
-         "information technology systems, platforms, and packages.  In other words: CPE\n"
-         "provides a unique identifier for virtually any software product that is known for\n"
-         "a vulnerability.\n"
-         "\n"
-         "The CPE dictionary is maintained by MITRE and NIST.  MITRE also maintains CVE\n"
-         "(Common Vulnerability Enumeration) and other relevant security standards.\n"
-         "\n"
-         "The report selects all CPE tables from the results and forms a single table\n"
-         "as a comma separated values file.\n',"
-         " 'csv', 'text/csv');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'HTML';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'HTML', 'Single page HTML report.',"
-         " 'A single HTML page listing results of a scan.  Style information is embedded in\n"
-         "the HTML, so the page is suitable for viewing in a browser as is.\n',"
-         " 'html', 'text/html');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'ITG';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'ITG',"
-         " 'German \"IT-Grundschutz-Kataloge\" report.',"
-         " 'Tabular report on the German \"IT-Grundschutz-Kataloge\",\n"
-         "as published and maintained by the German Federal Agency for IT-Security.\n',"
-         " 'csv', 'text/csv');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'LaTeX';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'LaTeX',"
-         " 'LaTeX source file.',"
-         " 'Report as LaTeX source file for further processing.\n',"
-         " 'tex', 'text/plain');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'NBE';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'NBE', 'Legacy OpenVAS report.',"
-         " 'The traditional OpenVAS Scanner text based format.',"
-         " 'nbe', 'text/plain');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'PDF';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'PDF',"
-         " 'Portable Document Format report.',"
-         " 'Scan results in Portable Document Format (PDF).',"
-         "'pdf', 'application/pdf');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'TXT';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'TXT', 'Plain text report.',"
-         " 'Plain text report, best viewed with fixed font size.',"
-         " 'txt', 'text/plain');");
-
-  if (sql_int ("SELECT count(*) FROM report_formats WHERE name = 'XML';")
-      == 0)
-    sql ("INSERT into report_formats (uuid, owner, name, summary, description,"
-         " extension, content_type)"
-         " VALUES (make_uuid (), NULL, 'XML',"
-         " 'Raw XML report.',"
-         " 'Complete scan report in Greenbone Vulnerability Manager XML format.',"
-         " 'xml', 'text/xml');");
-
-  /* Update the UUIDs of the predefined formats to the new predefined UUIDs. */
-
-  sql ("UPDATE report_formats SET uuid = 'a0704abb-2120-489f-959f-251c9f4ffebd'"
-       " WHERE name = 'CPE'");
-
-  sql ("UPDATE report_formats SET uuid = 'b993b6f5-f9fb-4e6e-9c94-dd46c00e058d'"
-       " WHERE name = 'HTML'");
-
-  sql ("UPDATE report_formats SET uuid = '929884c6-c2c4-41e7-befb-2f6aa163b458'"
-       " WHERE name = 'ITG'");
-
-  sql ("UPDATE report_formats SET uuid = '9f1ab17b-aaaa-411a-8c57-12df446f5588'"
-       " WHERE name = 'LaTeX'");
-
-  sql ("UPDATE report_formats SET uuid = 'f5c2a364-47d2-4700-b21d-0a7693daddab'"
-       " WHERE name = 'NBE'");
-
-  sql ("UPDATE report_formats SET uuid = '1a60a67e-97d0-4cbf-bc77-f71b08e7043d'"
-       " WHERE name = 'PDF'");
-
-  sql ("UPDATE report_formats SET uuid = '19f6f1b3-7128-4433-888c-ccc764fe6ed5'"
-       " WHERE name = 'TXT'");
-
-  sql ("UPDATE report_formats SET uuid = 'd5da9f67-8551-4e51-807b-b6a873d70e34'"
-       " WHERE name = 'XML'");
-
-  /* Rename the directories. */
-
-  init_iterator (&rows, "SELECT id, uuid, owner, name FROM report_formats;");
-  while (next (&rows))
-    {
-      const char *name, *uuid;
-      gchar *old_dir, *new_dir;
-      int user_format = 0;
-
-      uuid = iterator_string (&rows, 1);
-      name = iterator_string (&rows, 3);
-
-      if (sql_int ("SELECT owner is NULL FROM report_formats"
-                   " WHERE id = %llu;",
-                   iterator_int64 (&rows, 0)))
-        {
-          /* Global. */
-          old_dir = g_build_filename (GVM_SYSCONF_DIR,
-                                      "openvasmd",
-                                      "global_report_formats",
-                                      name,
-                                      NULL);
-          new_dir = g_build_filename (GVM_SYSCONF_DIR,
-                                      "openvasmd",
-                                      "global_report_formats",
-                                      uuid,
-                                      NULL);
-        }
-      else
-        {
-          char *owner_uuid;
-          owner_uuid = sql_string ("SELECT uuid FROM users"
-                                   " WHERE id = %llu;",
-                                   iterator_int64 (&rows, 2));
-          if (owner_uuid == NULL)
-            {
-              g_warning ("%s: owner missing from users table", __FUNCTION__);
-              cleanup_iterator (&rows);
-              sql_rollback ();
-              return -1;
-            }
-          old_dir = g_build_filename (GVM_SYSCONF_DIR,
-                                      "openvasmd",
-                                      "report_formats",
-                                      owner_uuid,
-                                      name,
-                                      NULL);
-          new_dir = g_build_filename (GVM_SYSCONF_DIR,
-                                      "openvasmd",
-                                      "report_formats",
-                                      owner_uuid,
-                                      uuid,
-                                      NULL);
-          free (owner_uuid);
-          user_format = 1;
-        }
-      if (g_file_test (new_dir, G_FILE_TEST_EXISTS))
-        {
-          if (g_file_test (old_dir, G_FILE_TEST_EXISTS)
-              && gvm_file_remove_recurse (old_dir))
-            g_warning ("%s: failed to remove %s",
-                       __FUNCTION__,
-                       old_dir);
-        }
-      /* If the old dir of a predefined format is missing that's OK, the
-       * Manager will create the dir when it starts proper. */
-      else if ((g_file_test (old_dir, G_FILE_TEST_EXISTS)
-                || user_format)
-               && rename (old_dir, new_dir))
-        {
-          g_warning ("%s: renaming %s to %s failed: %s",
-                     __FUNCTION__,
-                     old_dir,
-                     new_dir,
-                     strerror (errno));
-          g_free (old_dir);
-          g_free (new_dir);
-          cleanup_iterator (&rows);
-          sql_rollback ();
-          return -1;
-        }
-      g_free (old_dir);
-      g_free (new_dir);
-    }
-
-  /* Set the database version to 22. */
-
-  set_db_version (22);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the report formats from version 22 to version 23.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_22_to_23 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 22. */
-
-  if (manage_db_version () != 22)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the report formats.
-   *
-   * The report_formats table got signature and trust columns. */
-
-  sql ("ALTER TABLE report_formats ADD COLUMN signature;");
-  sql ("UPDATE report_formats SET signature = '';");
-
-  sql ("ALTER TABLE report_formats ADD COLUMN trust;");
-  sql ("UPDATE report_formats SET trust = %i;", TRUST_UNKNOWN);
-
-  /* Set the database version to 23. */
-
-  set_db_version (23);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 23 to version 24.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_23_to_24 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 23. */
-
-  if (manage_db_version () != 23)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The 8 to 9 migrator cast owner to an integer because owner had
-   * changed from a string to an integer.  This means empty strings would
-   * be converted to 0 instead of NULL, so convert any 0's to NULL. */
-
-  sql ("UPDATE tasks SET owner = NULL where owner = 0;"),
-
-  /* Set the database version to 24. */
-
-  set_db_version (24);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 24 to version 25.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_24_to_25 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 24. */
-
-  if (manage_db_version () != 24)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Missing parameter chunking handling in the GSA may have resulted in
-   * empty options in NVT radio preference values. */
-
-  init_iterator (&rows, "SELECT id, name, value FROM nvt_preferences;");
-  while (next (&rows))
-    {
-      const char *name;
-      int type_start = -1, type_end = -1, count;
-
-      name = iterator_string (&rows, 1);
-
-      /* NVT[radio]:Preference */
-      count = sscanf (name, "%*[^[][%nradio%n]:", &type_start, &type_end);
-      if (count == 0 && type_start > 0 && type_end > 0)
-        {
-          const char *value;
-          gchar **split, **point, *quoted_value;
-          GString *string;
-          gboolean first;
-
-          /* Flush any empty options (";a;;b;" becomes "a;b"). */
-          first = TRUE;
-          value = iterator_string (&rows, 2);
-          split = g_strsplit (value, ";", 0);
-          string = g_string_new ("");
-          point = split;
-          while (*point)
-            {
-              if (strlen (*point))
-                {
-                  if (first)
-                    first = FALSE;
-                  else
-                    g_string_append_c (string, ';');
-                  g_string_append (string, *point);
-                }
-              point++;
-            }
-          g_strfreev (split);
-
-          quoted_value = sql_nquote (string->str, string->len);
-          g_string_free (string, TRUE);
-          sql ("UPDATE nvt_preferences SET value = '%s' WHERE id = %llu",
-               quoted_value,
-               iterator_int64 (&rows, 0));
-          g_free (quoted_value);
-        }
-    }
-  cleanup_iterator (&rows);
-
-  init_iterator (&rows,
-                 "SELECT id, name, value FROM config_preferences"
-                 " WHERE type = 'PLUGINS_PREFS';");
-  while (next (&rows))
-    {
-      const char *name;
-      int type_start = -1, type_end = -1, count;
-
-      name = iterator_string (&rows, 1);
-
-      /* NVT[radio]:Preference */
-      count = sscanf (name, "%*[^[][%nradio%n]:", &type_start, &type_end);
-      if (count == 0 && type_start > 0 && type_end > 0)
-        {
-          const char *value;
-          gchar **split, **point, *quoted_value;
-          GString *string;
-          gboolean first;
-
-          /* Flush any empty options (";a;;b;" becomes "a;b"). */
-          first = TRUE;
-          value = iterator_string (&rows, 2);
-          split = g_strsplit (value, ";", 0);
-          string = g_string_new ("");
-          point = split;
-          while (*point)
-            {
-              if (strlen (*point))
-                {
-                  if (first)
-                    first = FALSE;
-                  else
-                    g_string_append_c (string, ';');
-                  g_string_append (string, *point);
-                }
-              point++;
-            }
-          g_strfreev (split);
-
-          quoted_value = sql_nquote (string->str, string->len);
-          g_string_free (string, TRUE);
-          sql ("UPDATE config_preferences SET value = '%s' WHERE id = %llu",
-               quoted_value,
-               iterator_int64 (&rows, 0));
-          g_free (quoted_value);
-        }
-    }
-  cleanup_iterator (&rows);
-
-  /* Set the database version to 25. */
-
-  set_db_version (25);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 25 to version 26.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_25_to_26 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 25. */
-
-  if (manage_db_version () != 25)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report_formats table got a trust_time column. */
-
-  sql ("ALTER TABLE report_formats ADD column trust_time;");
-  sql ("UPDATE report_formats SET trust_time = %i;", time (NULL));
-
-  /* Set the database version to 26. */
-
-  set_db_version (26);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 26 to version 27.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_26_to_27 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 26. */
-
-  if (manage_db_version () != 26)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The reports table got a slave_progress column and the tasks table got a
-   * slave column. */
-
-  sql ("ALTER TABLE reports ADD column slave_progress;");
-  sql ("UPDATE reports SET slave_progress = 0;");
-
-  sql ("ALTER TABLE tasks ADD column slave;");
-  sql ("UPDATE tasks SET slave = 0;");
-
-  /* Set the database version to 27. */
-
-  set_db_version (27);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 27 to version 28.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_27_to_28 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 27. */
-
-  if (manage_db_version () != 27)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report_formats table got a flags column. */
-
-  sql ("ALTER TABLE report_formats ADD COLUMN flags INTEGER;");
-  sql ("UPDATE report_formats SET flags = 1;");
-
-  /* Set the database version to 28. */
-
-  set_db_version (28);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 27 to version 28.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_28_to_29 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 28. */
-
-  if (manage_db_version () != 28)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The reports table got a slave_task_uuid column. */
-
-  sql ("ALTER TABLE reports ADD COLUMN slave_task_uuid;");
-  sql ("UPDATE reports SET slave_task_uuid = ''");
-
-  /* Set the database version to 29. */
-
-  set_db_version (29);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 29 to version 30.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_29_to_30 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 29. */
-
-  if (manage_db_version () != 29)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The agents table got an installer_trust_time column. */
-
-  sql ("ALTER TABLE agents ADD column installer_trust_time;");
-  sql ("UPDATE agents SET installer_trust_time = %i;", time (NULL));
-
-  /* Set the database version to 30. */
-
-  set_db_version (30);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 30 to version 31.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_30_to_31 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 30. */
-
-  if (manage_db_version () != 30)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Slaves switched from being targets to being resources of their own.
-   * Just clear any task slaves. */
-
-  sql ("UPDATE tasks SET slave = 0;");
-
-  /* Set the database version to 31. */
-
-  set_db_version (31);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 31 to version 32.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_31_to_32 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 31. */
-
-  if (manage_db_version () != 31)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure that the report_format_params table exists. */
-
-  sql ("CREATE TABLE IF NOT EXISTS report_format_params"
-       " (id INTEGER PRIMARY KEY, report_format, name, value);");
-
-  /* The report_format_params table got a type column. */
-
-  sql ("ALTER TABLE report_format_params ADD column type INTEGER;");
-  sql ("UPDATE report_format_params SET type = 3;");
-
-  /* Set the database version to 32. */
-
-  set_db_version (32);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 32 to version 33.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_32_to_33 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 32. */
-
-  if (manage_db_version () != 32)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report_format_params table got a few new columns. */
-
-  sql ("ALTER TABLE report_format_params ADD column type_min;");
-  sql ("UPDATE report_format_params SET type_min = %lli;", LLONG_MIN);
-
-  sql ("ALTER TABLE report_format_params ADD column type_max;");
-  sql ("UPDATE report_format_params SET type_max = %lli;", LLONG_MAX);
-
-  sql ("ALTER TABLE report_format_params ADD column type_regex;");
-  sql ("UPDATE report_format_params SET type_regex = '';");
-
-  sql ("ALTER TABLE report_format_params ADD column fallback;");
-  sql ("UPDATE report_format_params SET fallback = value;");
-
-  /* Set the database version to 33. */
-
-  set_db_version (33);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Set the pref for migrate_33_to_34.
- *
- * @param[in]  config  Config to set pref on.
- */
-void
-migrate_33_to_34_set_pref (config_t config)
-{
-  if (sql_int ("SELECT count(*) FROM config_preferences"
-               " WHERE config = %llu"
-               " AND name ="
-               " 'Login configurations[checkbox]:NTLMSSP';",
-               config)
-      == 0)
-    sql ("INSERT into config_preferences (config, type, name, value)"
-         " VALUES (%llu, 'PLUGINS_PREFS',"
-         " 'Login configurations[checkbox]:NTLMSSP',"
-         " 'yes');",
-         config);
-}
-
-/**
- * @brief Migrate the database from version 33 to version 34.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_33_to_34 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 33. */
-
-  if (manage_db_version () != 33)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The preference "NTLMSSP" was set to yes in the predefined configs. */
-
-  migrate_33_to_34_set_pref (CONFIG_ID_FULL_AND_FAST);
-  migrate_33_to_34_set_pref (CONFIG_ID_FULL_AND_FAST_ULTIMATE);
-  migrate_33_to_34_set_pref (CONFIG_ID_FULL_AND_VERY_DEEP);
-  migrate_33_to_34_set_pref (CONFIG_ID_FULL_AND_VERY_DEEP_ULTIMATE);
-
-  /* Set the database version to 34. */
-
-  set_db_version (34);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 34 to version 35.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_34_to_35 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 34. */
-
-  if (manage_db_version () != 34)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The LSC credential element of the target resource was split into two
-   * elements, for SSH and SMB. */
-
-  sql ("ALTER TABLE targets ADD column smb_lsc_credential;");
-  sql ("UPDATE targets SET smb_lsc_credential = lsc_credential;");
-
-  /* Set the database version to 35. */
-
-  set_db_version (35);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Make a copy of a target.
- *
- * @param[in]  target  Target to copy.
- * @param[in]  name    Name for new target.
- *
- * @return Address of matching character, else NULL.
- */
-target_t
-migrate_35_to_36_duplicate_target (target_t target, const char *name)
-{
-  char *quoted_name = sql_quote (name);
-  sql ("INSERT INTO targets"
-       " (uuid, owner, name, hosts, comment, lsc_credential,"
-       "  smb_lsc_credential)"
-       " SELECT make_uuid (), owner, uniquify ('target', '%s', owner, ''),"
-       "        hosts, comment, lsc_credential, smb_lsc_credential"
-       " FROM targets WHERE id = %llu;",
-       quoted_name,
-       target);
-  g_free (quoted_name);
-  return sql_last_insert_id ();
-}
-
-/**
- * @brief Migrate the database from version 35 to version 36.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_35_to_36 ()
-{
-  iterator_t tasks;
-  char *scanner_range, *quoted_scanner_range;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 35. */
-
-  if (manage_db_version () != 35)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* For a time between 1.0.0 beta3 and 1.0.0 beta5 the Manager would create
-   * the example task with name references to the target and config, instead
-   * of ID references.  Correct this now. */
-
-  sql ("UPDATE tasks SET"
-       " target = (SELECT id FROM targets WHERE name = 'Localhost'),"
-       " config = (SELECT id FROM configs WHERE name = 'Full and fast')"
-       " WHERE uuid = '343435d6-91b0-11de-9478-ffd71f4c6f29';");
-
-  /* Scanner preference "port_range" moved from config into target. */
-
-  sql ("ALTER TABLE targets ADD column port_range;");
-  sql ("UPDATE targets SET port_range = NULL;");
-
-  scanner_range = sql_string ("SELECT value FROM nvt_preferences"
-                              " WHERE name = 'port_range'");
-  if (scanner_range)
-    {
-      quoted_scanner_range = sql_quote (scanner_range);
-      free (scanner_range);
-    }
-  else
-    quoted_scanner_range = NULL;
-
-  init_iterator (&tasks, "SELECT id, target, config FROM tasks;");
-  while (next (&tasks))
-    {
-      char *config_range, *quoted_config_range;
-      target_t target;
-
-      target = iterator_int64 (&tasks, 1);
-
-      if (sql_int ("SELECT port_range IS NULL FROM targets WHERE id = %llu;",
-                   target)
-          == 0)
-        {
-          gchar *name;
-
-          /* Already used this target, use a copy of it. */
-
-          name = sql_string ("SELECT name || ' Migration' FROM targets"
-                             " WHERE id = %llu;",
-                             target);
-          assert (name);
-          target = migrate_35_to_36_duplicate_target (target, name);
-          free (name);
-
-          sql ("UPDATE tasks SET target = %llu WHERE id = %llu",
-               target,
-               iterator_int64 (&tasks, 0));
-        }
-
-      config_range = sql_string ("SELECT value FROM config_preferences"
-                                 " WHERE config = %llu"
-                                 " AND name = 'port_range';",
-                                 iterator_int64 (&tasks, 2));
-
-      if (config_range)
-        {
-          quoted_config_range = sql_quote (config_range);
-          free (config_range);
-        }
-      else
-        quoted_config_range = NULL;
-
-      sql ("UPDATE targets SET port_range = '%s'"
-           " WHERE id = %llu;",
-           quoted_config_range
-            ? quoted_config_range
-            : (quoted_scanner_range ? quoted_scanner_range : "default"),
-           target);
-
-      free (quoted_config_range);
-    }
-  cleanup_iterator (&tasks);
-
-  sql ("UPDATE targets SET port_range = 'default' WHERE port_range IS NULL;");
-
-  sql ("DELETE FROM config_preferences WHERE name = 'port_range';");
-  sql ("DELETE FROM nvt_preferences WHERE name = 'port_range';");
-
-  free (quoted_scanner_range);
-
-  /* Set the database version to 36. */
-
-  set_db_version (36);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 36 to version 37.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_36_to_37 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 36. */
-
-  if (manage_db_version () != 36)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The target and config clauses were swapped in the example task statement
-     in migrate_35_to_36 in SVN for some time.  Run the statement again with
-     the correct clauses. */
-
-  sql ("UPDATE tasks SET"
-       " target = (SELECT id FROM targets WHERE name = 'Localhost'),"
-       " config = (SELECT id FROM configs WHERE name = 'Full and fast')"
-       " WHERE uuid = '343435d6-91b0-11de-9478-ffd71f4c6f29';");
-
-  /* Set the database version to 37. */
-
-  set_db_version (37);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 37 to version 38.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_37_to_38 ()
-{
-  gchar *old_dir, *new_dir;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 37. */
-
-  if (manage_db_version () != 37)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report formats moved to FHS compliant locations. */
-
-  /* Remove the global report format dirs, as they should have been
-   * installed in the new location already. */
-
-  old_dir = g_build_filename (GVM_SYSCONF_DIR,
-                              "openvasmd",
-                              "global_report_formats",
-                              NULL);
-
-  gvm_file_remove_recurse (old_dir);
-  g_free (old_dir);
-
-  /* Move user uploaded report formats. */
-
-  new_dir = g_build_filename (GVMD_STATE_DIR,
-                              NULL);
-
-  if (g_mkdir_with_parents (new_dir, 0755 /* "rwxr-xr-x" */))
-    {
-      g_warning ("%s: failed to create dir %s", __FUNCTION__, new_dir);
-      g_free (new_dir);
-      sql_rollback ();
-      return -1;
-    }
-
-  old_dir = g_build_filename (GVM_SYSCONF_DIR,
-                              "openvasmd",
-                              "report_formats",
-                              NULL);
-
-  /* Ensure the old dir exists. */
-  g_mkdir_with_parents (old_dir, 0755 /* "rwxr-xr-x" */);
-
-  {
-    gchar **cmd;
-    gchar *standard_out = NULL;
-    gchar *standard_err = NULL;
-    gint exit_status;
-
-    cmd = (gchar **) g_malloc (4 * sizeof (gchar *));
-    cmd[0] = g_strdup ("mv");
-    cmd[1] = old_dir;
-    cmd[2] = new_dir;
-    cmd[3] = NULL;
-    g_debug ("%s: Spawning in .: %s %s %s",
-             __FUNCTION__, cmd[0], cmd[1], cmd[2]);
-    if ((g_spawn_sync (".",
-                       cmd,
-                       NULL,                  /* Environment. */
-                       G_SPAWN_SEARCH_PATH,
-                       NULL,                  /* Setup function. */
-                       NULL,
-                       &standard_out,
-                       &standard_err,
-                       &exit_status,
-                       NULL)
-         == FALSE)
-        || (WIFEXITED (exit_status) == 0)
-        || WEXITSTATUS (exit_status))
-      {
-        g_warning ("%s: failed rename: %d (WIF %i, WEX %i)",
-                   __FUNCTION__,
-                   exit_status,
-                   WIFEXITED (exit_status),
-                 WEXITSTATUS (exit_status));
-        g_debug ("%s: stdout: %s", __FUNCTION__, standard_out);
-        g_debug ("%s: stderr: %s", __FUNCTION__, standard_err);
-        g_free (old_dir);
-        g_free (new_dir);
-        g_free (cmd[0]);
-        g_free (cmd);
-        sql_rollback ();
-        return -1;
-      }
-
-    g_free (cmd[0]);
-    g_free (cmd);
-  }
-
-  g_free (old_dir);
-  g_free (new_dir);
-
-  /* Set the database version to 38. */
-
-  set_db_version (38);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 38 to version 39.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_38_to_39 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 38. */
-
-  if (manage_db_version () != 38)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The w3af NVT (80109) was removed from the predefined configs. */
-
-  /* Just update the config comments, because init_manage will add the new
-   * selectors. */
-
-  sql ("UPDATE configs SET comment ="
-       " 'Most NVT''s; optimized by using previously collected information.'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_FAST) ";");
-
-  sql ("UPDATE configs SET comment ="
-       " 'Most NVT''s including those that can stop services/hosts;"
-       " optimized by using previously collected information.'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_FAST_ULTIMATE) ";");
-
-  sql ("UPDATE configs SET comment ="
-       " 'Most NVT''s; don''t trust previously collected information; slow.'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_VERY_DEEP) ";");
-
-  sql ("UPDATE configs SET comment ="
-       " 'Most NVT''s including those that can stop services/hosts;"
-       " don''t trust previously collected information; slow.'"
-       " WHERE id = " G_STRINGIFY (CONFIG_ID_FULL_AND_VERY_DEEP_ULTIMATE) ";");
-
-  /* Set the database version to 39. */
-
-  set_db_version (39);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Set the pref for migrate_39_to_40.
- *
- * @param[in]  config  Config to set pref on.
- */
-void
-migrate_39_to_40_set_pref (config_t config)
-{
-  sql ("UPDATE config_preferences SET value = 'yes'"
-       " WHERE config = %llu"
-       " AND type = 'SERVER_PREFS'"
-       " AND name = 'unscanned_closed';",
-       config);
-}
-
-/**
- * @brief Migrate the database from version 39 to version 40.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_39_to_40 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 39. */
-
-  if (manage_db_version () != 39)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The preference "unscanned_closed" was set to yes in the predefined
-   * configs. */
-
-  migrate_39_to_40_set_pref (CONFIG_ID_FULL_AND_FAST);
-  migrate_39_to_40_set_pref (CONFIG_ID_FULL_AND_FAST_ULTIMATE);
-  migrate_39_to_40_set_pref (CONFIG_ID_FULL_AND_VERY_DEEP);
-  migrate_39_to_40_set_pref (CONFIG_ID_FULL_AND_VERY_DEEP_ULTIMATE);
-
-  /* Set the database version to 40. */
-
-  set_db_version (40);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 40 to version 41.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_40_to_41 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 40. */
-
-  if (manage_db_version () != 40)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* For report formats, feed signatures were given priority over signatures
-   * in imported XML.  This includes only setting the db signature when it is
-   * imported.  So remove the db signatures for all predefined reports. */
-
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = 'a0704abb-2120-489f-959f-251c9f4ffebd';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = 'b993b6f5-f9fb-4e6e-9c94-dd46c00e058d';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = '929884c6-c2c4-41e7-befb-2f6aa163b458';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = '9f1ab17b-aaaa-411a-8c57-12df446f5588';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = 'f5c2a364-47d2-4700-b21d-0a7693daddab';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = '1a60a67e-97d0-4cbf-bc77-f71b08e7043d';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = '19f6f1b3-7128-4433-888c-ccc764fe6ed5';");
-  sql ("UPDATE report_formats SET signature = NULL"
-       " WHERE uuid = 'd5da9f67-8551-4e51-807b-b6a873d70e34';");
-
-  /* Set the database version to 41. */
-
-  set_db_version (41);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 41 to version 42.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_41_to_42 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 41. */
-
-  if (manage_db_version () != 41)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Two task tables got trashcan location fields. */
-
-  sql ("ALTER TABLE tasks ADD column config_location INTEGER;");
-  sql ("ALTER TABLE tasks ADD column target_location INTEGER;");
-  sql ("ALTER TABLE tasks ADD column schedule_location INTEGER;");
-  sql ("ALTER TABLE tasks ADD column slave_location INTEGER;");
-
-  sql ("UPDATE tasks SET"
-       " config_location = " G_STRINGIFY (LOCATION_TABLE) ","
-       " target_location = " G_STRINGIFY (LOCATION_TABLE) ","
-       " schedule_location = " G_STRINGIFY (LOCATION_TABLE) ","
-       " slave_location = " G_STRINGIFY (LOCATION_TABLE) ";");
-
-  /* Ensure that the task_escalators table exists. */
-  sql ("CREATE TABLE IF NOT EXISTS task_escalators"
-       " (id INTEGER PRIMARY KEY, task INTEGER, escalator INTEGER);");
-
-  sql ("ALTER TABLE task_escalators ADD column escalator_location INTEGER;");
-
-  sql ("UPDATE task_escalators"
-       " SET escalator_location = " G_STRINGIFY (LOCATION_TABLE) ";");
-
-  /* Set the database version to 42. */
-
-  set_db_version (42);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 42 to version 43.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_42_to_43 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 42. */
-
-  if (manage_db_version () != 42)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The targets table got an ssh_port field. */
-
-  /* Ensure that the targets_trash table exists. */
-  sql ("CREATE TABLE IF NOT EXISTS targets_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, hosts,"
-       "  comment, lsc_credential INTEGER, smb_lsc_credential INTEGER,"
-       "  port_range, ssh_location INTEGER, smb_location INTEGER);");
-
-  sql ("ALTER TABLE targets ADD column ssh_port;");
-  sql ("ALTER TABLE targets_trash ADD column ssh_port;");
-
-  sql ("UPDATE targets SET ssh_port = 22"
-       " WHERE lsc_credential > 0;");
-  sql ("UPDATE targets_trash SET ssh_port = 22"
-       " WHERE lsc_credential > 0;");
-
-  /* Set the database version to 43. */
-
-  set_db_version (43);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 43 to version 44.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_43_to_44 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 43. */
-
-  if (manage_db_version () != 43)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The file permission got much tighter. */
-
-  if (chmod (gvmd_db_name ? gvmd_db_name : GVM_STATE_DIR "/mgr/tasks.db",
-             S_IRUSR | S_IWUSR))
-    {
-      g_warning ("%s: failed to chmod %s: %s",
-                 __FUNCTION__,
-                 gvmd_db_name ? gvmd_db_name
-                              : GVM_STATE_DIR "/mgr/tasks.db",
-                 strerror (errno));
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Set the database version to 44. */
-
-  set_db_version (44);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 44 to version 45.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_44_to_45 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 44. */
-
-  if (manage_db_version () != 44)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The tasks table got a upload_result_count column. */
-
-  sql ("ALTER TABLE tasks ADD column upload_result_count;");
-  sql ("UPDATE tasks SET upload_result_count = -1;");
-
-  /* Set the database version to 45. */
-
-  set_db_version (45);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 45 to version 46.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_45_to_46 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 45. */
-
-  if (manage_db_version () != 45)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* CREATE_TARGET now cleans the hosts string. */
-
-  sql ("UPDATE targets SET hosts = clean_hosts (hosts);");
-  sql ("UPDATE targets_trash SET hosts = clean_hosts (hosts);");
-
-  /* Set the database version to 46. */
-
-  set_db_version (46);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 46 to version 47.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_46_to_47 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 46. */
-
-  if (manage_db_version () != 46)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Performance prefs move from config to task. */
-
-  /* Ensure that the table exists. */
-  sql ("CREATE TABLE IF NOT EXISTS task_preferences"
-       " (id INTEGER PRIMARY KEY, task INTEGER, name, value);");
-
-  sql ("INSERT INTO task_preferences (task, name, value)"
-       " SELECT tasks.id, config_preferences.name, config_preferences.value"
-       " FROM tasks, config_preferences"
-       " WHERE tasks.config = config_preferences.config"
-       " AND (config_preferences.name = 'max_checks'"
-       "      OR config_preferences.name = 'max_hosts')");
-
-  /* Set the database version to 47. */
-
-  set_db_version (47);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 47 to version 48.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_47_to_48 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 47. */
-
-  if (manage_db_version () != 47)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Scanner "app" host detail changed name to "App". */
-
-  /* Ensure that the table exists. */
-  sql ("CREATE TABLE IF NOT EXISTS report_host_details"
-       " (id INTEGER PRIMARY KEY, report_host INTEGER, source_type,"
-       "  source_name, source_description, name, value);");
-
-  sql ("UPDATE report_host_details SET name = 'App' WHERE name = 'app';");
-
-  /* Set the database version to 48. */
-
-  set_db_version (48);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 48 to version 49.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_48_to_49 ()
-{
-  sql_begin_immediate ();
-
-  /* Require that the database is currently version 48. */
-
-  if (manage_db_version () != 48)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* If the example task was created before version 14 then the 13 to 14
-   * migrator would have given the example result an arbitrary UUID instead
-   * of the predefined one.
-   *
-   * Also, the host of the example result has now changed to an IP. */
-
-  sql ("UPDATE results SET uuid = 'cb291ec0-1b0d-11df-8aa1-002264764cea'"
-       " WHERE host = 'localhost';");
-
-  sql ("UPDATE results SET host = '127.0.0.1'"
-       " WHERE uuid = 'cb291ec0-1b0d-11df-8aa1-002264764cea';");
-
-  sql ("UPDATE report_hosts SET host = '127.0.0.1'"
-       " WHERE host = 'localhost';");
-
-  /* Set the database version to 49. */
-
-  set_db_version (49);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 49 to version 50.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_49_to_50 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 49. */
-
-  if (manage_db_version () != 49)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The UNIQUE constraint in task_preferences was removed. */
-
-  /* Move the table away. */
-
-  sql ("ALTER TABLE task_preferences RENAME TO task_preferences_49;");
-
-  /* Create the table in the new format. */
-
-  sql ("CREATE TABLE IF NOT EXISTS task_preferences"
-       " (id INTEGER PRIMARY KEY, task INTEGER, name, value);");
-
-  /* Copy the data into the new table. */
-
-  sql ("INSERT into task_preferences"
-       " (id, task, name, value)"
-       " SELECT"
-       "  id, task, name, value"
-       " FROM task_preferences_49;");
-
-  /* Drop the old tables. */
-
-  sql ("DROP TABLE task_preferences_49;");
-
-  /* Set the database version to 50. */
-
-  set_db_version (50);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 50 to version 51.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_50_to_51 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 50. */
-
-  if (manage_db_version () != 50)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The user table got a timezone column. */
-
-  sql ("ALTER TABLE users ADD column timezone;");
-  sql ("UPDATE users SET timezone = NULL;");
-
-  /* Set the database version to 51. */
-
-  set_db_version (51);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 51 to version 52.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_51_to_52 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 51. */
-
-  if (manage_db_version () != 51)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Add an SQL helper. */
-
-  if (manage_create_migrate_51_to_52_convert ())
-    {
-      sql_rollback ();
-      g_critical ("%s: failed to create convert", __FUNCTION__);
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Date storage switched from text format to seconds since the epoch. */
-
-  sql ("UPDATE report_hosts SET start_time = convert (start_time);");
-  sql ("UPDATE report_hosts SET end_time = convert (end_time);");
-  sql ("UPDATE reports SET start_time = convert (start_time);");
-  sql ("UPDATE reports SET end_time = convert (end_time);");
-  sql ("UPDATE tasks SET start_time = convert (start_time);");
-  sql ("UPDATE tasks SET end_time = convert (end_time);");
-
-  /* Set the database version to 52. */
-
-  set_db_version (52);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 52 to version 53.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_52_to_53 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 52. */
-
-  if (manage_db_version () != 52)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The overrides table got a end_time column. */
-
-  /* Ensure that the table exists. */
-  sql ("CREATE TABLE IF NOT EXISTS overrides"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, threat,"
-       "  new_threat, task INTEGER, result INTEGER);");
-
-  sql ("ALTER TABLE overrides ADD column end_time;");
-  sql ("UPDATE overrides SET end_time = 0;");
-
-  /* Set the database version to 53. */
-
-  set_db_version (53);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 53 to version 54.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_53_to_54 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 53. */
-
-  if (manage_db_version () != 53)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The notes table got a end_time column. */
-
-  /* Ensure that the table exists. */
-  sql ("CREATE TABLE IF NOT EXISTS notes"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, threat,"
-       "  task INTEGER, result INTEGER);");
-
-  sql ("ALTER TABLE notes ADD column end_time;");
-  sql ("UPDATE notes SET end_time = 0;");
-
-  /* Set the database version to 54. */
-
-  set_db_version (54);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate a report format from version 54 to version 55.
- *
- * @param[in]  old_uuid  Old UUID.
- * @param[in]  new_uuid  New UUID.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_54_to_55_format (const char *old_uuid, const char *new_uuid)
-{
-  gchar *dir;
-
-  dir = g_build_filename (GVMD_DATA_DIR,
-                          "global_report_formats",
-                          old_uuid,
-                          NULL);
-
-  if (g_file_test (dir, G_FILE_TEST_EXISTS) && gvm_file_remove_recurse (dir))
-    {
-      g_warning ("%s: failed to remove dir %s", __FUNCTION__, dir);
-      g_free (dir);
-      return -1;
-    }
-  g_free (dir);
-
-  sql ("UPDATE report_formats"
-       " SET uuid = '%s'"
-       " WHERE uuid = '%s';",
-       new_uuid,
-       old_uuid);
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 54 to version 55.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_54_to_55 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 54. */
-
-  if (manage_db_version () != 54)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* For report formats, feed signatures were given priority over signatures
-   * in imported XML.  This includes only setting the db signature when it is
-   * imported.  So remove the db signatures for all predefined reports. */
-
-  if (migrate_54_to_55_format ("a0704abb-2120-489f-959f-251c9f4ffebd",
-                               "5ceff8ba-1f62-11e1-ab9f-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("b993b6f5-f9fb-4e6e-9c94-dd46c00e058d",
-                               "6c248850-1f62-11e1-b082-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("929884c6-c2c4-41e7-befb-2f6aa163b458",
-                               "77bd6c4a-1f62-11e1-abf0-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("9f1ab17b-aaaa-411a-8c57-12df446f5588",
-                               "7fcc3a1a-1f62-11e1-86bf-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("f5c2a364-47d2-4700-b21d-0a7693daddab",
-                               "9ca6fe72-1f62-11e1-9e7c-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("1a60a67e-97d0-4cbf-bc77-f71b08e7043d",
-                               "a0b5bfb2-1f62-11e1-85db-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("19f6f1b3-7128-4433-888c-ccc764fe6ed5",
-                               "a3810a62-1f62-11e1-9219-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  if (migrate_54_to_55_format ("d5da9f67-8551-4e51-807b-b6a873d70e34",
-                               "a994b278-1f62-11e1-96ac-406186ea4fc5"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Set the database version to 55. */
-
-  set_db_version (55);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Insert a port range.
- */
-#define MIGRATE_55_TO_56_RANGE(type, start, end)                    \
-  sql ("INSERT INTO port_ranges"                                    \
-       " (uuid, port_list, type, start, \"end\", comment, exclude)" \
-       " VALUES"                                                    \
-       " (make_uuid (), %llu, %i,"                                  \
-       "  '" G_STRINGIFY (start) "',"                               \
-       "  '" G_STRINGIFY (end) "',"                                 \
-       "  '', 0)",                                                  \
-       list,                                                        \
-       type)
-
-/**
- * @brief Ensure that the predefined port lists exist.
- */
-void
-migrate_55_to_56_ensure_predefined_port_lists_exist ()
-{
-  if (sql_int ("SELECT count(*) FROM port_lists"
-               " WHERE uuid = '" PORT_LIST_UUID_DEFAULT "';")
-      == 0)
-    {
-      resource_t list;
-      sql ("INSERT INTO port_lists (uuid, owner, name, comment)"
-           " VALUES ('" PORT_LIST_UUID_DEFAULT "', NULL, 'OpenVAS Default',"
-           " '')");
-      list = sql_last_insert_id ();
-
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1, 5);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7, 7);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9, 9);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11, 11);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13, 13);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 15, 15);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 17, 25);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27, 27);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 29, 29);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31, 31);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 33, 33);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 35, 35);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 37, 39);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 41, 59);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 61, 224);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 242, 248);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 256, 268);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 280, 287);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 308, 322);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 333, 333);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 344, 700);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 702, 702);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 704, 707);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 709, 711);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 721, 721);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 723, 723);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 729, 731);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 740, 742);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 744, 744);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 747, 754);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 758, 765);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 767, 767);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 769, 777);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 780, 783);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 786, 787);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 799, 801);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 808, 808);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 810, 810);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 828, 829);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 847, 848);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 860, 860);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 871, 871);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 873, 873);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 886, 888);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 898, 898);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 900, 904);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 911, 913);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 927, 927);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 950, 950);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 953, 953);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 975, 975);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 989, 1002);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1005, 1005);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1008, 1008);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1010, 1010);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1023, 1027);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1029, 1036);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1040, 1040);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1042, 1042);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1045, 1045);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1047, 1112);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1114, 1117);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1119, 1120);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1122, 1127);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1139, 1139);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1154, 1155);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1161, 1162);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1168, 1170);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1178, 1178);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1180, 1181);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1183, 1188);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1194, 1194);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1199, 1231);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1233, 1286);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1288, 1774);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 1776, 2028);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2030, 2030);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2032, 2035);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2037, 2038);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2040, 2065);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2067, 2083);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2086, 2087);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2089, 2152);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2155, 2155);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2159, 2167);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2170, 2177);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2180, 2181);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2190, 2191);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2199, 2202);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2213, 2213);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2220, 2223);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2232, 2246);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2248, 2255);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2260, 2260);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2273, 2273);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2279, 2289);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2294, 2311);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2313, 2371);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2381, 2425);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2427, 2681);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2683, 2824);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2826, 2854);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2856, 2924);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 2926, 3096);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3098, 3299);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3302, 3321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3326, 3366);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3372, 3403);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3405, 3545);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3547, 3707);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3709, 3765);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3767, 3770);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3772, 3800);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3802, 3802);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3845, 3871);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3875, 3876);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3885, 3885);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3900, 3900);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3928, 3929);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3939, 3939);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3959, 3959);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3970, 3971);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3984, 3987);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 3999, 4036);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4040, 4042);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4045, 4045);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4080, 4080);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4096, 4100);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4111, 4111);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4114, 4114);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4132, 4134);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4138, 4138);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4141, 4145);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4154, 4154);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4160, 4160);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4199, 4200);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4242, 4242);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4300, 4300);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4321, 4321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4333, 4333);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4343, 4351);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4353, 4358);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4369, 4369);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4400, 4400);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4442, 4457);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4480, 4480);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4500, 4500);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4545, 4547);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4555, 4555);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4557, 4557);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4559, 4559);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4567, 4568);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4600, 4601);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4658, 4662);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4672, 4672);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4752, 4752);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4800, 4802);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4827, 4827);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4837, 4839);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4848, 4849);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4868, 4869);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4885, 4885);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4894, 4894);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4899, 4899);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4950, 4950);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4983, 4983);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4987, 4989);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 4998, 4998);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5000, 5011);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5020, 5025);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5031, 5031);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5042, 5042);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5050, 5057);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5060, 5061);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5064, 5066);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5069, 5069);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5071, 5071);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5081, 5081);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5093, 5093);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5099, 5102);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5137, 5137);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5145, 5145);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5150, 5152);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5154, 5154);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5165, 5165);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5190, 5193);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5200, 5203);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5222, 5222);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5225, 5226);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5232, 5232);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5236, 5236);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5250, 5251);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5264, 5265);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5269, 5269);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5272, 5272);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5282, 5282);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5300, 5311);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5314, 5315);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5351, 5355);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5400, 5432);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5435, 5435);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5454, 5456);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5461, 5463);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5465, 5465);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5500, 5504);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5510, 5510);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5520, 5521);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5530, 5530);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5540, 5540);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5550, 5550);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5553, 5556);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5566, 5566);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5569, 5569);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5595, 5605);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5631, 5632);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5666, 5666);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5673, 5680);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5688, 5688);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5690, 5690);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5713, 5717);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5720, 5720);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5729, 5730);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5741, 5742);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5745, 5746);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5755, 5755);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5757, 5757);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5766, 5768);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5771, 5771);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5800, 5803);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5813, 5813);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5858, 5859);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5882, 5882);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5888, 5889);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5900, 5903);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5968, 5969);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5977, 5979);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5987, 5991);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 5997, 6010);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6050, 6051);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6064, 6073);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6085, 6085);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6100, 6112);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6123, 6123);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6141, 6150);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6175, 6177);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6200, 6200);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6253, 6253);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6255, 6255);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6270, 6270);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6300, 6300);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6321, 6322);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6343, 6343);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6346, 6347);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6373, 6373);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6382, 6382);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6389, 6389);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6400, 6400);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6455, 6456);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6471, 6471);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6500, 6503);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6505, 6510);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6543, 6543);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6547, 6550);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6558, 6558);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6566, 6566);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6580, 6582);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6588, 6588);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6620, 6621);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6623, 6623);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6628, 6628);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6631, 6631);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6665, 6670);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6672, 6673);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6699, 6701);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6714, 6714);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6767, 6768);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6776, 6776);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6788, 6790);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6831, 6831);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6841, 6842);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6850, 6850);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6881, 6889);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6891, 6891);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6901, 6901);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6939, 6939);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6961, 6966);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6969, 6970);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 6998, 7015);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7020, 7021);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7030, 7030);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7070, 7070);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7099, 7100);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7121, 7121);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7161, 7161);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7170, 7170);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7174, 7174);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7200, 7201);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7210, 7210);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7269, 7269);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7273, 7273);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7280, 7281);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7283, 7283);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7300, 7300);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7320, 7320);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7326, 7326);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7391, 7392);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7395, 7395);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7426, 7431);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7437, 7437);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7464, 7464);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7491, 7491);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7501, 7501);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7510, 7511);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7544, 7545);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7560, 7560);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7566, 7566);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7570, 7570);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7575, 7575);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7588, 7588);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7597, 7597);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7624, 7624);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7626, 7627);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7633, 7634);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7648, 7649);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7666, 7666);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7674, 7676);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7743, 7743);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7775, 7779);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7781, 7781);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7786, 7786);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7797, 7798);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7800, 7801);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7845, 7846);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7875, 7875);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7902, 7902);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7913, 7913);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7932, 7933);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7967, 7967);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7979, 7980);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 7999, 8005);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8007, 8010);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8022, 8022);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8032, 8033);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8044, 8044);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8074, 8074);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8080, 8082);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8088, 8089);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8098, 8098);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8100, 8100);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8115, 8116);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8118, 8118);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8121, 8122);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8130, 8132);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8160, 8161);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8181, 8194);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8199, 8201);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8204, 8208);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8224, 8225);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8245, 8245);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8311, 8311);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8351, 8351);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8376, 8380);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8400, 8403);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8416, 8417);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8431, 8431);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8443, 8444);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8450, 8450);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8473, 8473);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8554, 8555);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8649, 8649);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8733, 8733);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8763, 8765);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8786, 8787);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8804, 8804);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8863, 8864);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8875, 8875);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8880, 8880);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8888, 8894);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8900, 8901);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8910, 8911);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8954, 8954);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8989, 8989);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 8999, 9002);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9006, 9006);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9009, 9009);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9020, 9026);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9080, 9080);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9090, 9091);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9100, 9103);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9110, 9111);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9131, 9131);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9152, 9152);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9160, 9164);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9200, 9207);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9210, 9211);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9217, 9217);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9281, 9285);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9287, 9287);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9292, 9292);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9321, 9321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9343, 9344);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9346, 9346);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9374, 9374);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9390, 9390);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9396, 9397);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9400, 9400);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9418, 9418);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9495, 9495);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9500, 9500);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9535, 9537);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9593, 9595);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9600, 9600);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9612, 9612);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9704, 9704);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9747, 9747);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9753, 9753);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9797, 9797);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9800, 9802);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9872, 9872);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9875, 9876);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9888, 9889);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9898, 9901);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9909, 9909);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9911, 9911);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9950, 9952);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 9990, 10005);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10007, 10008);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10012, 10012);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10080, 10083);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10101, 10103);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10113, 10116);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10128, 10128);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10252, 10252);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10260, 10260);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10288, 10288);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10607, 10607);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10666, 10666);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10752, 10752);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 10990, 10990);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11000, 11001);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11111, 11111);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11201, 11201);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11223, 11223);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11319, 11321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11367, 11367);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11371, 11371);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11600, 11600);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11720, 11720);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11751, 11751);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11965, 11965);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11967, 11967);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 11999, 12006);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12076, 12076);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12109, 12109);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12168, 12168);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12172, 12172);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12223, 12223);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12321, 12321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12345, 12346);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12361, 12362);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12468, 12468);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12701, 12701);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 12753, 12753);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13160, 13160);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13223, 13224);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13701, 13702);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13705, 13706);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13708, 13718);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13720, 13722);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13724, 13724);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13782, 13783);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 13818, 13822);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14001, 14001);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14033, 14034);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14141, 14141);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14145, 14145);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14149, 14149);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14194, 14194);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14237, 14237);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 14936, 14937);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 15000, 15000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 15126, 15126);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 15345, 15345);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 15363, 15363);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16360, 16361);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16367, 16368);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16384, 16384);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16660, 16661);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16959, 16959);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16969, 16969);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 16991, 16991);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 17007, 17007);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 17185, 17185);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 17219, 17219);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 17300, 17300);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 17770, 17772);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18000, 18000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18181, 18187);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18190, 18190);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18241, 18241);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18463, 18463);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18769, 18769);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 18888, 18888);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19191, 19191);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19194, 19194);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19283, 19283);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19315, 19315);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19398, 19398);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19410, 19412);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19540, 19541);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19638, 19638);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 19726, 19726);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20000, 20001);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20005, 20005);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20011, 20012);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20034, 20034);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20200, 20200);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20202, 20203);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20222, 20222);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20670, 20670);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 20999, 21000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 21490, 21490);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 21544, 21544);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 21590, 21590);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 21800, 21800);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 21845, 21849);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22000, 22001);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22222, 22222);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22273, 22273);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22289, 22289);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22305, 22305);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22321, 22321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22370, 22370);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22555, 22555);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22800, 22800);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 22951, 22951);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 23456, 23456);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24000, 24006);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24242, 24242);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24249, 24249);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24345, 24347);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24386, 24386);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24554, 24554);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24677, 24678);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 24922, 24922);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25000, 25009);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25378, 25378);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25544, 25544);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25793, 25793);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25867, 25867);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25901, 25901);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 25903, 25903);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 26000, 26000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 26208, 26208);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 26260, 26264);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27000, 27010);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27345, 27345);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27374, 27374);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27504, 27504);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27665, 27665);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 27999, 27999);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 28001, 28001);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 29559, 29559);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 29891, 29891);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 30001, 30002);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 30100, 30102);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 30303, 30303);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 30999, 30999);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31337, 31337);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31339, 31339);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31416, 31416);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31457, 31457);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31554, 31554);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31556, 31556);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31620, 31620);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31765, 31765);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 31785, 31787);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 32261, 32261);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 32666, 32666);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 32768, 32780);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 32786, 32787);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 32896, 32896);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 33270, 33270);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 33331, 33331);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 33434, 33434);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 33911, 33911);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 34249, 34249);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 34324, 34324);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 34952, 34952);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 36865, 36865);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 37475, 37475);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 37651, 37651);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 38037, 38037);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 38201, 38201);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 38292, 38293);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 39681, 39681);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 40412, 40412);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 40841, 40843);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 41111, 41111);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 41508, 41508);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 41794, 41795);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 42508, 42510);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 43118, 43118);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 43188, 43190);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 44321, 44322);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 44333, 44334);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 44442, 44443);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 44818, 44818);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 45000, 45000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 45054, 45054);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 45678, 45678);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 45966, 45966);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 47000, 47000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 47557, 47557);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 47624, 47624);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 47806, 47806);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 47808, 47808);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 47891, 47891);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 48000, 48003);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 48556, 48556);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 49400, 49400);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 50000, 50004);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 50505, 50505);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 50776, 50776);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 51210, 51210);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 53001, 53001);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 54320, 54321);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 57341, 57341);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 59595, 59595);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 60177, 60177);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 60179, 60179);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 61439, 61441);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 61446, 61446);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 65000, 65000);
-      MIGRATE_55_TO_56_RANGE (PORT_PROTOCOL_TCP, 65301, 65301);
-    }
-}
-
-/**
- * @brief Migrate the database from version 55 to version 56.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_55_to_56 ()
-{
-  iterator_t rows;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 55. */
-
-  if (manage_db_version () != 55)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The port_range in the targets and targets_trash tables changed to
-   * refer to a port list.  The targets_trash table got a port_list_location
-   * column. */
-
-  /* Add the new column. */
-
-  sql ("ALTER TABLE targets_trash ADD COLUMN port_list_location;");
-  sql ("UPDATE targets_trash"
-       " SET port_list_location = " G_STRINGIFY (LOCATION_TRASH) ";");
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS port_lists"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment);");
-  sql ("CREATE TABLE IF NOT EXISTS port_lists_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment);");
-  sql ("CREATE TABLE IF NOT EXISTS port_ranges"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, port_list INTEGER, type,"
-       "  start, end, comment, exclude);");
-  sql ("CREATE TABLE IF NOT EXISTS port_ranges_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, port_list INTEGER, type,"
-       "  start, end, comment, exclude);");
-
-  migrate_55_to_56_ensure_predefined_port_lists_exist ();
-
-  /* Make a port list and port range(s) for each target. */
-
-  init_iterator (&rows, "SELECT id, owner, name, port_range FROM targets;");
-  while (next (&rows))
-    {
-      resource_t target;
-      const gchar *range;
-
-      target = iterator_int64 (&rows, 0);
-      range = iterator_string (&rows, 3);
-
-      if (range && strcmp (range, "default"))
-        {
-          resource_t owner, list;
-          const gchar *name;
-          gchar *quoted_name;
-
-          owner = iterator_int64 (&rows, 1);
-          name = iterator_string (&rows, 2);
-          quoted_name = sql_quote (name);
-
-          /* Make the port list.  Store target in comment for modification
-           * outside iteration. */
-
-          sql ("INSERT INTO port_lists (uuid, owner, name, comment)"
-               " VALUES (make_uuid (), %llu, '%s', %llu)",
-               owner,
-               quoted_name,
-               target);
-
-          g_free (quoted_name);
-
-          list = sql_last_insert_id ();
-
-          /* Convert old range (1-100,1649,210-214) to multiple new ranges. */
-
-          {
-            gchar **split, **point;
-
-            while (*range && isblank (*range)) range++;
-
-            split = g_strsplit (range, ",", 0);
-            point = split;
-
-            while (*point)
-              {
-                gchar *hyphen;
-
-                hyphen = strchr (*point, '-');
-                if (hyphen)
-                  {
-                    *hyphen = '\0';
-                    hyphen++;
-
-                    /* A range. */
-
-                    sql ("INSERT INTO port_ranges"
-                         " (uuid, port_list, type, start, \"end\", comment,"
-                         "  exclude)"
-                         " VALUES"
-                         " (make_uuid (), %llu, %i, %s, %s, '', 0)",
-                         list,
-                         PORT_PROTOCOL_TCP,
-                         *point,
-                         hyphen);
-                  }
-                else
-                  {
-                    /* A single port. */
-
-                    sql ("INSERT INTO port_ranges"
-                         " (uuid, port_list, type, start, \"end\", comment,"
-                         "  exclude)"
-                         " VALUES"
-                         " (make_uuid (), %llu, %i, %s, NULL, '',"
-                         " 0)",
-                         list,
-                         PORT_PROTOCOL_TCP,
-                         *point);
-                  }
-                point += 1;
-              }
-
-            g_strfreev (split);
-          }
-        }
-      else
-        sql ("UPDATE targets SET port_range"
-             " = (SELECT id FROM port_lists"
-             "    WHERE uuid = '" PORT_LIST_UUID_DEFAULT "')"
-             " WHERE id = %llu;",
-             target);
-    }
-  cleanup_iterator (&rows);
-
-  /* Set the port_ranges of the targets to the new port lists. */
-
-  sql ("UPDATE targets SET"
-       " port_range = (SELECT id FROM port_lists"
-       "               WHERE comment = targets.id)"
-       " WHERE port_range"
-       " != (SELECT id FROM port_lists"
-       "     WHERE uuid = '" PORT_LIST_UUID_DEFAULT "');");
-
-  sql ("UPDATE port_lists SET"
-       " comment = 'Migrated from target '"
-       "           || (SELECT targets.name FROM targets"
-       "               WHERE port_lists.id = targets.port_range)"
-       "           || '.'"
-       " WHERE uuid != '" PORT_LIST_UUID_DEFAULT "';");
-
-  /* Make a port list and port range(s) for each trash target. */
-
-  init_iterator (&rows,
-                 "SELECT id, owner, name, port_range FROM targets_trash;");
-  while (next (&rows))
-    {
-      resource_t target;
-      gchar *range;
-
-      target = iterator_int64 (&rows, 0);
-      range = g_strdup (iterator_string (&rows, 3));
-
-      if (range && strcmp (range, "default"))
-        {
-          resource_t owner, list;
-          const gchar *name;
-          gchar *quoted_name;
-
-          owner = iterator_int64 (&rows, 1);
-          name = iterator_string (&rows, 2);
-          quoted_name = sql_quote (name);
-
-          /* Make the port list.  Store target in comment for modification
-           * outside iteration. */
-
-          sql ("INSERT INTO port_lists_trash (uuid, owner, name, comment)"
-               " VALUES (make_uuid (), %llu, '%s', %llu)",
-               owner,
-               quoted_name,
-               target);
-
-          g_free (quoted_name);
-
-          list = sql_last_insert_id ();
-
-          /* Convert old range (1-100,1649,210-214) to multiple new ranges. */
-
-          {
-            gchar **split, **point;
-
-            while (*range && isblank (*range)) range++;
-
-            split = g_strsplit (range, ",", 0);
-            point = split;
-
-            while (*point)
-              {
-                gchar *hyphen;
-
-                hyphen = strchr (*point, '-');
-                if (hyphen)
-                  {
-                    *hyphen = '\0';
-                    hyphen++;
-
-                    /* A range. */
-
-                    sql ("INSERT INTO port_ranges_trash"
-                         " (uuid, port_list, type, start, \"end\", comment,"
-                         "  exclude)"
-                         " VALUES"
-                         " (make_uuid (), %llu, %i, %s, %s, '', 0)",
-                         list,
-                         PORT_PROTOCOL_TCP,
-                         *point,
-                         hyphen);
-                  }
-                else
-                  {
-                    /* A single port. */
-
-                    sql ("INSERT INTO port_ranges_trash"
-                         " (uuid, port_list, type, start, \"end\", comment,"
-                         "  exclude)"
-                         " VALUES"
-                         " (make_uuid (), %llu, %i, %s, NULL, '',"
-                         " 0)",
-                         list,
-                         PORT_PROTOCOL_TCP,
-                         *point);
-                  }
-                point += 1;
-              }
-
-            g_strfreev (split);
-          }
-        }
-      else
-        sql ("UPDATE targets_trash SET port_range"
-             " = (SELECT id FROM port_lists"
-             "    WHERE uuid = '" PORT_LIST_UUID_DEFAULT "'),"
-             " port_list_location = " G_STRINGIFY (LOCATION_TABLE)
-             " WHERE id = %llu;",
-             target);
-
-      g_free (range);
-    }
-  cleanup_iterator (&rows);
-
-  /* Set the port_ranges of the trash targets to the new port lists. */
-
-  sql ("UPDATE targets_trash SET"
-       " port_range = (SELECT id FROM port_lists_trash"
-       "               WHERE comment = targets_trash.id)"
-       " WHERE port_range"
-       " != (SELECT id FROM port_lists"
-       "     WHERE uuid = '" PORT_LIST_UUID_DEFAULT "');");
-
-  sql ("UPDATE port_lists_trash SET"
-       " comment = 'Migrated from trashcan target '"
-       "           || (SELECT targets_trash.name FROM targets_trash"
-       "               WHERE port_lists_trash.id = targets_trash.port_range)"
-       "           || '.'");
-
-  /* Set the database version to 56. */
-
-  set_db_version (56);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 56 to version 57.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_56_to_57 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 56. */
-
-  if (manage_db_version () != 56)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS escalator_condition_data"
-       " (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS escalator_condition_data_trash"
-       " (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS escalator_event_data"
-       " (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS escalator_event_data_trash"
-       " (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS escalator_method_data"
-       " (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS escalator_method_data_trash"
-       " (id INTEGER PRIMARY KEY, escalator INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS escalators"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  event INTEGER, condition INTEGER, method INTEGER);");
-  sql ("CREATE TABLE IF NOT EXISTS escalators_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  event INTEGER, condition INTEGER, method INTEGER);");
-  sql ("CREATE TABLE IF NOT EXISTS task_escalators"
-       " (id INTEGER PRIMARY KEY, task INTEGER, escalator INTEGER,"
-       "  escalator_location INTEGER);");
-
-  /* Escalators were renamed to alerts. */
-
-  sql ("CREATE TABLE alert_condition_data"
-       " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
-  sql_rename_column ("escalator_condition_data", "alert_condition_data",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalator_condition_data;");
-
-  /* Note: This is missing the escalator_condition_data_trash case.  It's so
-   * long ago that anyone who was affected has probably worked through the
-   * problem already, so I'm leaving it like this. */
-
-  sql ("CREATE TABLE alert_event_data"
-       " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
-  sql_rename_column ("escalator_event_data", "alert_event_data",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalator_event_data;");
-
-  sql ("CREATE TABLE alert_event_data_trash"
-       " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
-  sql_rename_column ("escalator_event_data_trash", "alert_event_data_trash",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalator_event_data_trash;");
-
-  sql ("CREATE TABLE alert_method_data"
-       " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
-  sql_rename_column ("escalator_method_data", "alert_method_data",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalator_method_data;");
-
-  sql ("CREATE TABLE alert_method_data_trash"
-       " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
-  sql_rename_column ("escalator_method_data_trash", "alert_method_data_trash",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalator_method_data_trash;");
-
-  sql ("CREATE TABLE alerts"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  event INTEGER, condition INTEGER, method INTEGER);");
-  sql_rename_column ("escalators", "alerts",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalators;");
-
-  sql ("CREATE TABLE alerts_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  event INTEGER, condition INTEGER, method INTEGER);");
-  sql_rename_column ("escalators_trash", "alerts_trash",
-                     "escalator", "alert");
-  sql ("DROP TABLE escalators_trash;");
-
-  sql ("CREATE TABLE task_alerts_56"
-       " (id INTEGER PRIMARY KEY, task INTEGER, alert INTEGER,"
-       "  escalator_location INTEGER);");
-  sql_rename_column ("task_escalators", "task_alerts_56",
-                     "escalator", "alert");
-  sql ("DROP TABLE task_escalators;");
-
-  sql ("CREATE TABLE task_alerts"
-       " (id INTEGER PRIMARY KEY, task INTEGER, alert INTEGER,"
-       "  alert_location INTEGER);");
-  sql_rename_column ("task_alerts_56", "task_alerts",
-                     "escalator_location", "alert_location");
-  sql ("DROP TABLE task_alerts_56;");
-
-  /* Set the database version to 57. */
-
-  set_db_version (57);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 57 to version 58.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_57_to_58 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 57. */
-
-  if (manage_db_version () != 57)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS agents_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  installer TEXT, installer_64 TEXT, installer_filename,"
-       "  installer_signature_64 TEXT, installer_trust INTEGER,"
-       "  installer_trust_time, howto_install TEXT, howto_use TEXT);");
-
-  /* Targets and agents got creation and modification times. */
-
-  sql ("ALTER TABLE targets ADD COLUMN creation_time;");
-  sql ("ALTER TABLE targets ADD COLUMN modification_time;");
-  sql ("UPDATE targets SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE targets_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE targets_trash ADD COLUMN modification_time;");
-  sql ("UPDATE targets_trash SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE agents ADD COLUMN creation_time;");
-  sql ("ALTER TABLE agents ADD COLUMN modification_time;");
-  sql ("UPDATE agents SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE agents_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE agents_trash ADD COLUMN modification_time;");
-  sql ("UPDATE agents_trash SET creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 58. */
-
-  set_db_version (58);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 58 to version 59.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_58_to_59 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 58. */
-
-  if (manage_db_version () != 58)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Database version 55 introduced new UUIDs for the predefined report formats.
-     Update the alert method data to use these new UUIDs. */
-
-  sql ("UPDATE alert_method_data"
-       " SET data = '5ceff8ba-1f62-11e1-ab9f-406186ea4fc5'"
-       " WHERE data = 'a0704abb-2120-489f-959f-251c9f4ffebd';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = '6c248850-1f62-11e1-b082-406186ea4fc5'"
-       " WHERE data = 'b993b6f5-f9fb-4e6e-9c94-dd46c00e058d';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = '77bd6c4a-1f62-11e1-abf0-406186ea4fc5'"
-       " WHERE data = '929884c6-c2c4-41e7-befb-2f6aa163b458';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = '7fcc3a1a-1f62-11e1-86bf-406186ea4fc5'"
-       " WHERE data = '9f1ab17b-aaaa-411a-8c57-12df446f5588';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = '9ca6fe72-1f62-11e1-9e7c-406186ea4fc5'"
-       " WHERE data = 'f5c2a364-47d2-4700-b21d-0a7693daddab';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = 'a0b5bfb2-1f62-11e1-85db-406186ea4fc5'"
-       " WHERE data = '1a60a67e-97d0-4cbf-bc77-f71b08e7043d';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = 'a3810a62-1f62-11e1-9219-406186ea4fc5'"
-       " WHERE data = '19f6f1b3-7128-4433-888c-ccc764fe6ed5';");
-
-  sql ("UPDATE alert_method_data"
-       " SET data = 'a994b278-1f62-11e1-96ac-406186ea4fc5'"
-       " WHERE data = 'd5da9f67-8551-4e51-807b-b6a873d70e34';");
-
-  /* Set the database version to 59. */
-
-  set_db_version (59);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 59 to version 60.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_59_to_60 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 59. */
-
-  if (manage_db_version () != 59)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Every task must now have an in_assets task preference. */
-
-  sql ("INSERT INTO task_preferences (task, name, value)"
-       " SELECT id, 'in_assets', 'yes' FROM tasks;");
-
-  /* Set the database version to 60. */
-
-  set_db_version (60);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 60 to version 61.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_60_to_61 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 60. */
-
-  if (manage_db_version () != 60)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The alerts and alerts_trash tables got filter columns. */
-
-  sql ("ALTER TABLE alerts ADD COLUMN filter INTEGER;");
-  sql ("UPDATE alerts SET filter = 0;");
-
-  sql ("ALTER TABLE alerts_trash ADD COLUMN filter INTEGER;");
-  sql ("UPDATE alerts_trash SET filter = 0;");
-
-  sql ("ALTER TABLE alerts_trash ADD COLUMN filter_location INTEGER;");
-  sql ("UPDATE alerts_trash SET filter_location = 0;");
-
-  /* Set the database version to 61. */
-
-  set_db_version (61);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 61 to version 62.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_61_to_62 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 61. */
-
-  if (manage_db_version () != 61)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The reports table got count cache columns. */
-
-  sql ("ALTER TABLE reports ADD COLUMN highs;");
-  sql ("ALTER TABLE reports ADD COLUMN mediums;");
-  sql ("ALTER TABLE reports ADD COLUMN lows;");
-  sql ("ALTER TABLE reports ADD COLUMN logs;");
-  sql ("ALTER TABLE reports ADD COLUMN fps;");
-  sql ("ALTER TABLE reports ADD COLUMN override_highs;");
-  sql ("ALTER TABLE reports ADD COLUMN override_mediums;");
-  sql ("ALTER TABLE reports ADD COLUMN override_lows;");
-  sql ("ALTER TABLE reports ADD COLUMN override_logs;");
-  sql ("ALTER TABLE reports ADD COLUMN override_fps;");
-
-  sql ("UPDATE reports SET highs = -1, override_highs = -1;");
-
-  /* Set the database version to 62. */
-
-  set_db_version (62);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 62 to version 63.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_62_to_63 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 62. */
-
-  if (manage_db_version () != 62)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS schedules_trash"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment,"
-       "  first_time, period, period_months, duration);");
-
-  /* The reports table got count cache columns. */
-
-  sql ("ALTER TABLE schedules ADD COLUMN timezone;");
-  sql ("ALTER TABLE schedules ADD COLUMN initial_offset;");
-
-  sql ("UPDATE schedules"
-       " SET timezone = (SELECT users.timezone FROM users"
-       "                 WHERE id = schedules.owner);");
-
-  sql ("UPDATE schedules SET initial_offset = current_offset (timezone);");
-
-  sql ("ALTER TABLE schedules_trash ADD COLUMN timezone;");
-  sql ("ALTER TABLE schedules_trash ADD COLUMN initial_offset;");
-
-  sql ("UPDATE schedules_trash"
-       " SET timezone = (SELECT users.timezone FROM users"
-       "                 WHERE id = schedules_trash.owner);");
-
-  sql ("UPDATE schedules_trash"
-       " SET initial_offset = current_offset (timezone);");
-
-  /* Set the database version to 63. */
-
-  set_db_version (63);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 63 to version 64.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_63_to_64 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 63. */
-
-  if (manage_db_version () != 63)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The results table got a report column. */
-
-  sql ("ALTER TABLE results ADD COLUMN report;");
-
-  sql ("UPDATE results SET report = (SELECT report FROM report_results"
-       "                             WHERE result = results.id);");
-
-  sql ("CREATE INDEX IF NOT EXISTS results_by_report_host"
-       " ON results (report, host);");
-
-  /* Set the database version to 64. */
-
-  set_db_version (64);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 64 to version 65.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_64_to_65 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 64. */
-
-  if (manage_db_version () != 64)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report column on new results was left blank. */
-
-  sql ("UPDATE results SET report = (SELECT report FROM report_results"
-       "                             WHERE result = results.id);");
-
-  sql ("REINDEX results_by_report_host;");
-
-  /* Set the database version to 65. */
-
-  set_db_version (65);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 65 to version 66.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_65_to_66 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 65. */
-
-  if (manage_db_version () != 65)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Schedules got creation and modification times. */
-
-  sql ("ALTER TABLE schedules ADD COLUMN creation_time;");
-  sql ("ALTER TABLE schedules ADD COLUMN modification_time;");
-  sql ("UPDATE schedules SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE schedules_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE schedules_trash ADD COLUMN modification_time;");
-  sql ("UPDATE schedules_trash SET creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 66. */
-
-  set_db_version (66);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 66 to version 67.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_66_to_67 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 66. */
-
-  if (manage_db_version () != 66)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Tasks got creation and modification times. */
-
-  sql ("ALTER TABLE tasks ADD COLUMN creation_time;");
-  sql ("ALTER TABLE tasks ADD COLUMN modification_time;");
-  sql ("UPDATE tasks SET creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 67. */
-
-  set_db_version (67);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 67 to version 68.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_67_to_68 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 67. */
-
-  if (manage_db_version () != 67)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS slaves_trash"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment, host,"
-       "  port, login, password);");
-
-  /* Slaves got creation and modification times. */
-
-  sql ("ALTER TABLE slaves ADD COLUMN creation_time;");
-  sql ("ALTER TABLE slaves ADD COLUMN modification_time;");
-  sql ("UPDATE slaves SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE slaves_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE slaves_trash ADD COLUMN modification_time;");
-  sql ("UPDATE slaves_trash SET creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 68. */
-
-  set_db_version (68);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 68 to version 69.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_68_to_69 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 68. */
-
-  if (manage_db_version () != 68)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS report_formats_trash"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, extension,"
-       "  content_type, summary, description, signature, trust INTEGER,"
-       "  trust_time, flags INTEGER, original_uuid);");
-
-  /* Schedules got creation and modification times. */
-
-  sql ("ALTER TABLE report_formats ADD COLUMN creation_time;");
-  sql ("ALTER TABLE report_formats ADD COLUMN modification_time;");
-  sql ("UPDATE report_formats SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE report_formats_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE report_formats_trash ADD COLUMN modification_time;");
-  sql ("UPDATE report_formats_trash SET"
-       " creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 69. */
-
-  set_db_version (69);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 69 to version 70.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_69_to_70 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 69. */
-
-  if (manage_db_version () != 69)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add creation and modification times to Port Lists. */
-
-  sql ("ALTER TABLE port_lists ADD COLUMN creation_time;");
-  sql ("ALTER TABLE port_lists ADD COLUMN modification_time;");
-  sql ("UPDATE port_lists SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE port_lists_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE port_lists_trash ADD COLUMN modification_time;");
-  sql ("UPDATE port_lists_trash SET"
-       " creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 70. */
-
-  set_db_version (70);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 70 to version 71.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_70_to_71 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 70. */
-
-  if (manage_db_version () != 70)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add creation and modification times to alerts. */
-
-  sql ("ALTER TABLE alerts ADD COLUMN creation_time;");
-  sql ("ALTER TABLE alerts ADD COLUMN modification_time;");
-  sql ("UPDATE alerts SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE alerts_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE alerts_trash ADD COLUMN modification_time;");
-  sql ("UPDATE alerts_trash SET"
-       " creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 71. */
-
-  set_db_version (71);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 71 to version 72.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_71_to_72 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 71. */
-
-  if (manage_db_version () != 71)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS lsc_credentials_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, login,"
-       "  password, comment, public_key TEXT, private_key TEXT, rpm TEXT,"
-       "  deb TEXT, exe TEXT);");
-
-  /* Add creation and modification times to LSC Credentials. */
-
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN creation_time;");
-  sql ("ALTER TABLE lsc_credentials ADD COLUMN modification_time;");
-  sql ("UPDATE lsc_credentials SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE lsc_credentials_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE lsc_credentials_trash ADD COLUMN modification_time;");
-  sql ("UPDATE lsc_credentials_trash SET"
-       " creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 72. */
-
-  set_db_version (72);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 72 to version 73.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_72_to_73 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 72. */
-
-  if (manage_db_version () != 72)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the new tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS configs_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name,"
-       "  nvt_selector, comment, family_count INTEGER, nvt_count INTEGER,"
-       "  families_growing INTEGER, nvts_growing INTEGER);");
-
-  /* Add creation and modification times to Scan Configs. */
-
-  sql ("ALTER TABLE configs ADD COLUMN creation_time;");
-  sql ("ALTER TABLE configs ADD COLUMN modification_time;");
-  sql ("UPDATE configs SET creation_time = 0, modification_time = 0;");
-
-  sql ("ALTER TABLE configs_trash ADD COLUMN creation_time;");
-  sql ("ALTER TABLE configs_trash ADD COLUMN modification_time;");
-  sql ("UPDATE configs_trash SET creation_time = 0, modification_time = 0;");
-
-  /* Set the database version to 73. */
-
-  set_db_version (73);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 73 to version 74.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_73_to_74 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 73. */
-
-  if (manage_db_version () != 73)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add creation and modification times to Scan Configs. */
-
-  sql ("ALTER TABLE nvts ADD COLUMN uuid;");
-  sql ("UPDATE nvts SET uuid = oid;");
-
-  sql ("ALTER TABLE nvts ADD COLUMN comment;");
-  sql ("UPDATE nvts SET comment = '';");
-
-  sql ("ALTER TABLE nvts ADD COLUMN creation_time;");
-  sql ("ALTER TABLE nvts ADD COLUMN modification_time;");
-  sql ("UPDATE nvts SET"
-       " creation_time = parse_time (tag (tag, 'creation_date')),"
-       " modification_time = parse_time (tag (tag, 'last_modification'));");
-
-  /* Set the database version to 74. */
-
-  set_db_version (74);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 74 to version 75.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_74_to_75 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 74. */
-
-  if (manage_db_version () != 74)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the tables exist for the migrator. */
-
-  sql ("CREATE TABLE IF NOT EXISTS permissions"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  resource_type, resource, resource_uuid, resource_location,"
-       "  subject_type, subject, creation_time, modification_time);");
-
-  sql ("CREATE TABLE IF NOT EXISTS task_users"
-       " (id INTEGER PRIMARY KEY, task INTEGER, user INTEGER,"
-       "  actions INTEGER);");
-
-  /* Task observers are now handled by permissions. */
-
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, creation_time,"
-       "  modification_time)"
-       " SELECT make_uuid (),"
-       "        (SELECT owner FROM tasks WHERE id = task),"
-       "        'get', '', 'task', task,"
-       "        (SELECT uuid FROM tasks WHERE id = task),"
-       "        " G_STRINGIFY (LOCATION_TABLE) ", 'user', user, m_now (), m_now ()"
-       " FROM task_users;");
-
-  sql ("DROP TABLE task_users;");
-
-  /* Set the database version to 75. */
-
-  set_db_version (75);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 75 to version 76.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_75_to_76 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 75. */
-
-  if (manage_db_version () != 75)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Delete any nvts_checksum leftovers. */
-  sql ("DELETE FROM %s.meta WHERE name = \"nvts_checksum\";",
-       sql_schema ());
-
-  /* Rename nvts_md5sum into nvts_feed_version */
-  sql ("UPDATE %s.meta SET name = \"nvts_feed_version\""
-       " WHERE name = \"nvts_md5sum\";",
-       sql_schema ());
-
-  /* Set the database version to 76. */
-
-  set_db_version (76);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 76 to version 77.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_76_to_77 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 76. */
-
-  if (manage_db_version () != 76)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Users got standard columns, and columns to mirror info stored on disk. */
-
-  sql ("ALTER TABLE users ADD COLUMN owner;");
-  sql ("ALTER TABLE users ADD COLUMN comment;");
-  sql ("ALTER TABLE users ADD COLUMN creation_time;");
-  sql ("ALTER TABLE users ADD COLUMN modification_time;");
-  sql ("ALTER TABLE users ADD COLUMN role;");
-  sql ("ALTER TABLE users ADD COLUMN hosts;");
-  sql ("ALTER TABLE users ADD COLUMN hosts_allow;");
-  sql ("UPDATE users SET"
-       " owner = NULL,"
-       " comment = '',"
-       " creation_time = 0,"
-       " modification_time = 0,"
-       /* These are temporary, and only used for clone. */
-       " role = 'User',"
-       " hosts = '',"
-       " hosts_allow = 2;");
-
-  /* Set the database version to 77. */
-
-  set_db_version (77);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 77 to version 78.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_77_to_78 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 77. */
-  if (manage_db_version () != 77)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Set schedule durations and periods to 0 if they were -1,
-     which was the old default value of the create_schedule command. */
-  sql ("UPDATE schedules"
-       " SET duration = 0"
-       " WHERE duration = -1;");
-
-  sql ("UPDATE schedules"
-       " SET period = 0"
-       " WHERE period = -1;");
-
-  sql ("UPDATE schedules_trash"
-       " SET duration = 0"
-       " WHERE duration = -1;");
-
-  sql ("UPDATE schedules_trash"
-       " SET period = 0"
-       " WHERE period = -1;");
-
-  /* Set the database version to 78. */
-
-  set_db_version (78);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 78 to version 79.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_78_to_79 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 78. */
-
-  if (manage_db_version () != 78)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Remove tcp timestamps nvt from Discovery Scan Config. */
-
-  sql ("DELETE FROM nvt_selectors WHERE "
-       " name='" MANAGE_NVT_SELECTOR_UUID_DISCOVERY "'"
-       " AND family_or_nvt='1.3.6.1.4.1.25623.1.0.80091';");
-
-  /* Add preferences for "Ping Host" nvt in Discovery Scan Config. */
-  sql ("INSERT INTO config_preferences (config, type, name, value)"
-       " VALUES ((SELECT id FROM configs WHERE uuid = '"
-                  CONFIG_UUID_DISCOVERY "'),"
-       "         'PLUGINS_PREFS',"
-       "         'Ping Host[checkbox]:Mark unrechable Hosts as dead (not scanning)',"
-       " 'yes');");
-  sql ("INSERT INTO config_preferences (config, type, name, value)"
-       " VALUES ((SELECT id FROM configs WHERE uuid = '"
-                  CONFIG_UUID_DISCOVERY "'),"
-       "         'PLUGINS_PREFS',"
-       "         'Ping Host[checkbox]:Report about unrechable Hosts',"
-       "         'yes');");
-
-  /* Add preferences for "Services" nvt in Discovery Scan Config. */
-  sql ("INSERT INTO config_preferences (config, type, name, value)"
-       " VALUES ((SELECT id FROM configs WHERE uuid = '"
-                  CONFIG_UUID_DISCOVERY "'),"
-       "         'PLUGINS_PREFS',"
-       "         'Services[radio]:Test SSL based services',"
-       "         'All;Known SSL ports;None');");
-
-  /* Set the database version to 79. */
-
-  set_db_version (79);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Delete table for migrate_79_to_80.
- */
-#define MIGRATE_79_to_80_DELETE(table)                                \
- sql ("DELETE FROM " table                                            \
-      " WHERE owner IN (SELECT id FROM users WHERE %s);",             \
-      where)
-
-/**
- * @brief Delete users according to a condition.
- *
- * @param[in]  where  Where clause.
- */
-void
-migrate_79_to_80_remove_users (const char *where)
-{
-  /* Remove everything that is owned by the user. */
-  MIGRATE_79_to_80_DELETE ("agents");
-  MIGRATE_79_to_80_DELETE ("agents_trash");
-  sql ("DELETE FROM config_preferences"
-       " WHERE config IN (SELECT id FROM configs"
-       "                  WHERE owner IN (SELECT id FROM users"
-       "                                  WHERE %s));",
-       where);
-  sql ("DELETE FROM config_preferences_trash"
-       " WHERE config IN (SELECT id FROM configs"
-       "                  WHERE owner IN (SELECT id FROM users"
-       "                                  WHERE %s));",
-       where);
-  sql ("DELETE FROM nvt_selectors"
-       " WHERE name IN (SELECT nvt_selector FROM configs"
-       "                WHERE owner IN (SELECT id FROM users"
-       "                                WHERE %s));",
-       where);
-  MIGRATE_79_to_80_DELETE ("configs");
-  MIGRATE_79_to_80_DELETE ("configs_trash");
-  sql ("DELETE FROM alert_condition_data"
-       " WHERE alert IN (SELECT id FROM alerts"
-       "                 WHERE owner IN (SELECT id FROM users"
-       "                                 WHERE %s));",
-       where);
-  sql ("DELETE FROM alert_condition_data_trash"
-       " WHERE alert IN (SELECT id FROM alerts_trash"
-       "                 WHERE owner IN (SELECT id FROM users"
-       "                                 WHERE %s));",
-       where);
-  sql ("DELETE FROM alert_event_data"
-       " WHERE alert IN (SELECT id FROM alerts"
-       "                 WHERE owner IN (SELECT id FROM users"
-       "                                 WHERE %s));",
-       where);
-  sql ("DELETE FROM alert_event_data_trash"
-       " WHERE alert IN (SELECT id FROM alerts_trash"
-       "                 WHERE owner IN (SELECT id FROM users"
-       "                                 WHERE %s));",
-       where);
-  sql ("DELETE FROM alert_method_data"
-       " WHERE alert IN (SELECT id FROM alerts"
-       "                 WHERE owner IN (SELECT id FROM users"
-       "                                 WHERE %s));",
-       where);
-  sql ("DELETE FROM alert_method_data_trash"
-       " WHERE alert IN (SELECT id FROM alerts_trash"
-       "                 WHERE owner IN (SELECT id FROM users"
-       "                                 WHERE %s));",
-       where);
-  MIGRATE_79_to_80_DELETE ("alerts");
-  MIGRATE_79_to_80_DELETE ("alerts_trash");
-  MIGRATE_79_to_80_DELETE ("filters");
-  MIGRATE_79_to_80_DELETE ("filters_trash");
-  sql ("DELETE FROM group_users"
-       " WHERE `group` IN (SELECT id FROM groups"
-       "                   WHERE owner IN (SELECT id FROM users"
-       "                                   WHERE %s));",
-       where);
-  MIGRATE_79_to_80_DELETE ("groups");
-  MIGRATE_79_to_80_DELETE ("lsc_credentials");
-  MIGRATE_79_to_80_DELETE ("lsc_credentials_trash");
-  MIGRATE_79_to_80_DELETE ("notes");
-  MIGRATE_79_to_80_DELETE ("notes_trash");
-  MIGRATE_79_to_80_DELETE ("overrides");
-  MIGRATE_79_to_80_DELETE ("overrides_trash");
-  MIGRATE_79_to_80_DELETE ("permissions");
-  MIGRATE_79_to_80_DELETE ("permissions_trash");
-  MIGRATE_79_to_80_DELETE ("port_lists");
-  MIGRATE_79_to_80_DELETE ("port_lists_trash");
-  sql ("DELETE FROM port_ranges"
-       " WHERE port_list IN (SELECT id FROM port_lists"
-       "                     WHERE owner IN (SELECT id FROM users"
-       "                                     WHERE %s));",
-       where);
-  sql ("DELETE FROM port_ranges_trash"
-       " WHERE port_list IN (SELECT id FROM port_lists_trash"
-       "                     WHERE owner IN (SELECT id FROM users"
-       "                                     WHERE %s));",
-       where);
-  sql ("DELETE FROM report_format_param_options"
-       " WHERE report_format_param"
-       "       IN (SELECT id FROM report_format_params"
-       "           WHERE report_format"
-       "                 IN (SELECT id FROM report_formats"
-       "                     WHERE owner IN (SELECT id FROM users"
-       "                                     WHERE %s)));",
-       where);
-  sql ("DELETE FROM report_format_param_options_trash"
-       " WHERE report_format_param"
-       "       IN (SELECT id FROM report_format_params_trash"
-       "           WHERE report_format"
-       "                 IN (SELECT id FROM report_formats"
-       "                     WHERE owner IN (SELECT id FROM users"
-       "                                     WHERE %s)));",
-       where);
-  sql ("DELETE FROM report_format_params"
-       " WHERE report_format IN (SELECT id FROM report_formats"
-       "                         WHERE owner IN (SELECT id FROM users"
-       "                                         WHERE %s));",
-       where);
-  sql ("DELETE FROM report_format_params_trash"
-       " WHERE report_format IN (SELECT id FROM report_formats"
-       "                         WHERE owner IN (SELECT id FROM users"
-       "                                         WHERE %s));",
-       where);
-  MIGRATE_79_to_80_DELETE ("report_formats");
-  MIGRATE_79_to_80_DELETE ("report_formats_trash");
-  sql ("DELETE FROM report_host_details"
-       " WHERE report_host"
-       "       IN (SELECT id FROM report_hosts"
-       "           WHERE report IN (SELECT id FROM reports"
-       "                            WHERE owner IN (SELECT id FROM users"
-       "                                            WHERE %s)));",
-       where);
-  sql ("DELETE FROM report_results"
-       " WHERE report IN (SELECT id FROM reports"
-       "                  WHERE owner IN (SELECT id FROM users"
-       "                                  WHERE %s));",
-       where);
-  sql ("DELETE FROM results"
-       " WHERE report IN (SELECT id FROM reports"
-       "                  WHERE owner IN (SELECT id FROM users"
-       "                                  WHERE %s));",
-       where);
-  MIGRATE_79_to_80_DELETE ("reports");
-  MIGRATE_79_to_80_DELETE ("schedules");
-  MIGRATE_79_to_80_DELETE ("schedules_trash");
-  MIGRATE_79_to_80_DELETE ("slaves");
-  MIGRATE_79_to_80_DELETE ("slaves_trash");
-  MIGRATE_79_to_80_DELETE ("settings");
-  MIGRATE_79_to_80_DELETE ("tags");
-  MIGRATE_79_to_80_DELETE ("tags_trash");
-  MIGRATE_79_to_80_DELETE ("targets");
-  MIGRATE_79_to_80_DELETE ("targets_trash");
-  sql ("DELETE FROM task_files"
-       " WHERE task IN (SELECT id FROM tasks"
-       "                WHERE owner IN (SELECT id FROM users"
-       "                                WHERE %s));",
-       where);
-  sql ("DELETE FROM task_alerts"
-       " WHERE task IN (SELECT id FROM tasks"
-       "                WHERE owner IN (SELECT id FROM users"
-       "                                WHERE %s));",
-       where);
-  sql ("DELETE FROM task_preferences"
-       " WHERE task IN (SELECT id FROM tasks"
-       "                WHERE owner IN (SELECT id FROM users"
-       "                                WHERE %s));",
-       where);
-  MIGRATE_79_to_80_DELETE ("tasks");
-  sql ("DELETE FROM users WHERE %s;",
-       where);
-}
-
-/**
- * @brief User access rules header for migrate_79_to_80.
- */
-#define RULES_HEADER "# This file is managed by the OpenVAS Administrator.\n# Any modifications must keep to the format that the Administrator expects.\n"
-
-/**
- * @brief Get access information for a user.
- *
- * @param[in]   user_dir     The directory containing the user.
- * @param[out]  hosts        The hosts the user is allowed/forbidden to scan.
- * @param[out]  hosts_allow  0 forbidden, 1 allowed, 2 all allowed, 3 custom.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_79_to_80_user_access (const gchar *user_dir, gchar ** hosts,
-                              int *hosts_allow)
-{
-  gchar *rules_file, *rules;
-  GError *error = NULL;
-
-  assert (hosts != NULL);
-  assert (hosts_allow != NULL);
-
-  rules_file = g_build_filename (user_dir, "auth", "rules", NULL);
-  if (g_file_test (rules_file, G_FILE_TEST_EXISTS) == FALSE)
-    {
-      *hosts = NULL;
-      *hosts_allow = 2;
-      return 0;
-    }
-
-  g_file_get_contents (rules_file, &rules, NULL, &error);
-  if (error)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      g_free (rules_file);
-      return -1;
-    }
-  g_free (rules_file);
-
-  if (strlen (rules))
-    {
-      int count, end = 0;
-
-      /* "# " ("allow " | "deny ") hosts */
-
-      count = sscanf (rules, RULES_HEADER "# allow %*[^\n]%n\n", &end);
-      if (count == 0 && end > 0)
-        {
-          *hosts =
-            g_strndup (rules + strlen (RULES_HEADER "# allow "),
-                       end - strlen (RULES_HEADER "# allow "));
-          *hosts_allow = 1;
-          g_free (rules);
-          return 0;
-        }
-
-      count = sscanf (rules, RULES_HEADER "# deny %*[^\n]%n\n", &end);
-      if (count == 0 && end > 0)
-        {
-          *hosts =
-            g_strndup (rules + strlen (RULES_HEADER "# deny "),
-                       end - strlen (RULES_HEADER "# deny "));
-          *hosts_allow = 0;
-          g_free (rules);
-          return 0;
-        }
-
-      if (strcmp (RULES_HEADER, rules) == 0)
-        {
-          *hosts = NULL;
-          *hosts_allow = 2;
-          g_free (rules);
-          return 0;
-        }
-
-      /* Failed to parse content. */
-      *hosts = NULL;
-      *hosts_allow = 3;
-      g_free (rules);
-      return 0;
-    }
-
-  *hosts = NULL;
-  *hosts_allow = 2;
-  g_free (rules);
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 79 to version 80.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_79_to_80 ()
-{
-  struct dirent **names;
-  int count, index;
-  array_t *dirs;
-  gchar *dir;
-  struct stat state;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 79. */
-
-  if (manage_db_version () != 79)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure that all tables exists. */
-  sql ("CREATE TABLE IF NOT EXISTS alert_condition_data_trash"
-       " (id INTEGER PRIMARY KEY, alert INTEGER, name, data);");
-  sql ("CREATE TABLE IF NOT EXISTS config_preferences_trash"
-       " (id INTEGER PRIMARY KEY, config INTEGER, type, name, value);");
-  sql ("CREATE TABLE IF NOT EXISTS groups"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS group_users"
-       " (id INTEGER PRIMARY KEY, `group` INTEGER, user INTEGER);");
-  sql ("CREATE TABLE IF NOT EXISTS filters"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  type, term, creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS filters_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  type, term, creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS notes_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, threat,"
-       "  task INTEGER, result INTEGER, end_time);");
-  sql ("CREATE TABLE IF NOT EXISTS overrides_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, threat,"
-       "  new_threat, task INTEGER, result INTEGER, end_time);");
-  sql ("CREATE TABLE IF NOT EXISTS permissions"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  resource_type, resource, resource_uuid, resource_location,"
-       "  subject_type, subject, creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS permissions_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  resource_type, resource, resource_uuid, resource_location,"
-       "  subject_type, subject, creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS port_names"
-       " (id INTEGER PRIMARY KEY, number INTEGER, protocol, name,"
-       "  UNIQUE (number, protocol) ON CONFLICT REPLACE);");
-  sql ("CREATE TABLE IF NOT EXISTS report_format_params_trash"
-       " (id INTEGER PRIMARY KEY, report_format, name, type INTEGER, value,"
-       "  type_min, type_max, type_regex, fallback);");
-  sql ("CREATE TABLE IF NOT EXISTS report_format_param_options_trash"
-       " (id INTEGER PRIMARY KEY, report_format_param, value);");
-  sql ("CREATE TABLE IF NOT EXISTS settings"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment, value);");
-  sql ("CREATE TABLE IF NOT EXISTS tags"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  creation_time, modification_time, attach_type, attach_id,"
-       "  active, value);");
-  sql ("CREATE TABLE IF NOT EXISTS tags_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  creation_time, modification_time, attach_type, attach_id,"
-       "  active, value);");
-
-  /* Users got new column "method".  User data moved from disk to database. */
-
-  sql ("ALTER TABLE users ADD COLUMN method;");
-  sql ("UPDATE users SET method = 'file';");
-
-  count = scandir (GVM_STATE_DIR "/users", &names, NULL, alphasort);
-  if (count < 0)
-    {
-      g_warning ("%s: failed to open dir %s/users: %s",
-                 __FUNCTION__,
-                 GVM_STATE_DIR,
-                 strerror (errno));
-      sql_rollback ();
-      return -1;
-    }
-
-  dirs = make_array ();
-
-  /* Set a flag on every user, to see which are left over. */
-
-  sql ("UPDATE users SET password = -1;");
-
-  /* Update db users from classic classic users, checking for ldap_connect at
-   * the same time.  Assume that all ldap_connect users have at least one
-   * classic user of the same name.  Remove all other users, both from disk
-   * and from the db.  Remove special user "om" from the database.  */
-
-  for (index = 0; index < count; index++)
-    {
-      gchar *role, *role_file, *uuid, *uuid_file, *classic_dir, *remote_dir;
-      gchar *hash, *hosts, *quoted_hash, *quoted_hosts, *quoted_method;
-      gchar *quoted_name, *quoted_uuid, *where, *file, *remote_flag_file;
-      auth_method_t method;
-      GError *error;
-      user_t user;
-      int hosts_allow;
-
-      if ((strcmp (names[index]->d_name, ".") == 0)
-          || (strcmp (names[index]->d_name, "..") == 0)
-          || (strcmp (names[index]->d_name, "om") == 0))
-        {
-          free (names[index]);
-          continue;
-        }
-
-      /* Figure out the user dir. */
-
-      remote_dir = g_build_filename (GVM_STATE_DIR,
-                                     "users-remote",
-                                     "ldap_connect",
-                                     names[index]->d_name,
-                                     NULL);
-      classic_dir = g_build_filename (GVM_STATE_DIR, "users",
-                                      names[index]->d_name,
-                                      NULL);
-      remote_flag_file = g_build_filename (classic_dir,
-                                           "auth",
-                                           "methods",
-                                           "ldap_connect",
-                                           NULL);
-      g_debug ("          user: %s", names[index]->d_name);
-      g_debug ("    remote dir: %s", remote_dir);
-      g_debug ("   classic dir: %s", classic_dir);
-      g_debug ("     flag file: %s", remote_flag_file);
-      if (g_file_test (remote_dir, G_FILE_TEST_IS_DIR)
-          && g_file_test (remote_flag_file, G_FILE_TEST_EXISTS))
-        method = AUTHENTICATION_METHOD_LDAP_CONNECT;
-      else
-        {
-          g_free (remote_dir);
-          method = AUTHENTICATION_METHOD_FILE;
-          if (g_file_test (classic_dir, G_FILE_TEST_IS_DIR) == FALSE)
-            {
-              free (names[index]);
-              g_free (classic_dir);
-              g_free (remote_flag_file);
-              continue;
-            }
-          remote_dir = g_strdup (classic_dir);
-        }
-      g_free (remote_flag_file);
-
-      /* Get UUID from file. */
-
-      uuid_file = g_build_filename (remote_dir, "uuid", NULL);
-      error = NULL;
-      g_file_get_contents (uuid_file,
-                           &uuid,
-                           NULL,
-                           &error);
-      if (error)
-        {
-          g_warning ("%s: Failed to read %s: %s",
-                     __FUNCTION__,
-                     uuid_file,
-                     error->message);
-          g_free (classic_dir);
-          g_free (remote_dir);
-          g_free (uuid_file);
-          g_error_free (error);
-          sql_rollback ();
-          return -1;
-        }
-      g_free (uuid_file);
-
-      /* Check UUID. */
-
-      if (uuid == NULL || strlen (g_strchomp (uuid)) != 36)
-        {
-          g_warning ("%s: Error in UUID: %s",
-                     __FUNCTION__,
-                     uuid);
-          g_free (classic_dir);
-          g_free (remote_dir);
-          g_free (uuid);
-          sql_rollback ();
-          return -1;
-        }
-      g_debug ("          uuid: %s", uuid);
-
-      /* Get role. */
-
-      role = "User";
-
-      role_file = g_build_filename (remote_dir, "isobserver", NULL);
-      if (g_file_test (role_file, G_FILE_TEST_EXISTS))
-        role = "Observer";
-      g_free (role_file);
-
-      role_file = g_build_filename (remote_dir, "isadmin", NULL);
-      if (g_file_test (role_file, G_FILE_TEST_EXISTS))
-        role = "Admin";
-      g_free (role_file);
-
-      /* Find user in db. */
-
-      quoted_uuid = sql_quote (uuid);
-      switch (sql_int64 (&user,
-                         "SELECT id FROM users WHERE uuid = '%s';",
-                         quoted_uuid))
-        {
-          case 0:
-            break;
-          case 1:        /* Too few rows in result of query. */
-            quoted_name = sql_quote (names[index]->d_name);
-            sql ("INSERT INTO users"
-                 " (uuid, owner, name, comment, password, timezone, method,"
-                 "  hosts, hosts_allow)"
-                 " VALUES"
-                 " ('%s', NULL, '%s', '', NULL, NULL, 'file', '', 2);",
-                 quoted_uuid,
-                 quoted_name);
-            g_free (quoted_name);
-            user = sql_last_insert_id ();
-            break;
-          default:       /* Programming error. */
-            assert (0);
-          case -1:
-            g_warning ("%s: Error finding user %s",
-                       __FUNCTION__,
-                       uuid);
-            g_free (uuid);
-            g_free (quoted_uuid);
-            g_free (classic_dir);
-            g_free (remote_dir);
-            sql_rollback ();
-            return -1;
-            break;
-        }
-
-      /* Get hash. */
-
-      file = g_build_filename (classic_dir, "auth", "hash", NULL);
-      error = NULL;
-      if (file && g_file_test (file, G_FILE_TEST_EXISTS))
-        {
-          g_file_get_contents (file,
-                               &hash,
-                               NULL,
-                               &error);
-          if (error)
-            {
-              g_warning ("%s: Failed to read %s: %s",
-                         __FUNCTION__,
-                         file,
-                         error->message);
-              g_free (classic_dir);
-              g_free (remote_dir);
-              g_free (quoted_uuid);
-              g_free (file);
-              g_error_free (error);
-              sql_rollback ();
-              return -1;
-            }
-          assert (hash);
-          g_strchomp (hash);
-        }
-      else
-        hash = NULL;
-      g_free (file);
-
-      /* Get host access rules. */
-
-      hosts = NULL;
-      hosts_allow = 2;
-      if (migrate_79_to_80_user_access (classic_dir, &hosts, &hosts_allow))
-        {
-          g_warning ("%s: Failed to get user rules from %s",
-                     __FUNCTION__,
-                     classic_dir);
-          g_free (classic_dir);
-          g_free (remote_dir);
-          g_free (quoted_uuid);
-          g_error_free (error);
-          sql_rollback ();
-          return -1;
-        }
-
-      if (hosts_allow == 3)
-        /* If they were custom rules, just make is allow all. */
-        hosts_allow = 2;
-
-      /* Update db from disk. */
-
-      quoted_method = sql_quote (auth_method_name (method));
-      quoted_hash = sql_quote (hash ? hash : "");
-      quoted_hosts = sql_quote (hosts ? hosts : "");
-      sql ("UPDATE users"
-           " SET role = '%s',"
-           "     uuid = '%s',"
-           "     method = '%s',"
-           "     password = %s%s%s,"
-           "     hosts = '%s',"
-           "     hosts_allow = %i"
-           " WHERE id = %llu;",
-           role,
-           quoted_uuid,
-           quoted_method,
-           hash ? "'" : "",
-           hash ? quoted_hash : "NULL",
-           hash ? "'" : "",
-           quoted_hosts,
-           hosts_allow,
-           user);
-      g_free (quoted_uuid);
-      g_free (quoted_method);
-      g_free (quoted_hash);
-      g_free (quoted_hosts);
-
-      /* Remove all other users with this name from the db. */
-
-      quoted_name = sql_quote (names[index]->d_name);
-      where = g_strdup_printf ("name = '%s' AND id != %llu",
-                               quoted_name,
-                               user);
-      g_free (quoted_name);
-      migrate_79_to_80_remove_users (where);
-      g_free (where);
-
-      /* Store user directory for removal after last possible ROLLBACK. */
-
-      array_add (dirs, classic_dir);
-
-      free (names[index]);
-    }
-  free (names);
-
-  /* TODO To preserve ldap and ads, create db entries here. */
-
-  /* Remove remaining users. */
-
-  migrate_79_to_80_remove_users ("password = -1");
-
-  /* Remove entire user-remote dir. */
-
-  dir = g_build_filename (GVM_STATE_DIR, "users-remote", NULL);
-  if (g_lstat (dir, &state))
-    {
-      if (errno != ENOENT)
-        g_warning ("%s: g_lstat (%s) failed: %s",
-                   __FUNCTION__, dir, g_strerror (errno));
-    }
-  else
-    gvm_file_remove_recurse (dir);
-
-  g_free (dir);
-
-  /* Remove user dirs. */
-
-  for (index = 0; index < dirs->len; index++)
-    gvm_file_remove_recurse (g_ptr_array_index (dirs, index));
-  array_free (dirs);
-
-  /* Set the database version to 80. */
-
-  set_db_version (80);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 80 to version 81.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_80_to_81 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 80. */
-
-  if (manage_db_version () != 80)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure new tables exist. */
-  sql ("CREATE TABLE IF NOT EXISTS roles"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS role_users"
-       " (id INTEGER PRIMARY KEY, role INTEGER, user INTEGER);");
-
-  /* User roles moved to their own table. */
-
-  sql ("INSERT INTO roles"
-       " (uuid, owner, name, comment, creation_time, modification_time)"
-       " VALUES"
-       " ('" ROLE_UUID_ADMIN "', NULL, 'Admin', 'Administrator', m_now (),"
-       "  m_now ());");
-
-  sql ("INSERT INTO roles"
-       " (uuid, owner, name, comment, creation_time, modification_time)"
-       " VALUES"
-       " ('" ROLE_UUID_USER "', NULL, 'User', 'User', m_now (), m_now ());");
-
-  sql ("INSERT INTO roles"
-       " (uuid, owner, name, comment, creation_time, modification_time)"
-       " VALUES"
-       " ('" ROLE_UUID_OBSERVER "', NULL, 'Observer', 'Observer', m_now (),"
-       "  m_now ());");
-
-  sql ("INSERT INTO role_users (role, user)"
-       " SELECT (SELECT id FROM roles WHERE roles.name = users.role),"
-       "        users.id"
-       " FROM users;");
-
-  /* This leaves an extra column in older databases, which is not ideal, for
-   * example when iterating over all columns.  Migrating to Postgres, however,
-   * removes the column. */
-  sql ("UPDATE users SET role = NULL;");
-
-  /* Set the database version to 81. */
-
-  set_db_version (81);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 81 to version 82.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_81_to_82 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 80. */
-
-  if (manage_db_version () != 81)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Changes are already done by init_manage */
-
-  /* Set the database version to 82. */
-
-  set_db_version (82);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 82 to version 83.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_82_to_83 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 82. */
-
-  if (manage_db_version () != 82)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Remove risk_factor from NVTs table. */
-
-  /* Move the table away. */
-
-  sql ("ALTER TABLE nvts RENAME TO nvts_82;");
-
-  /* Create the table in the new format. */
-
-  sql ("CREATE TABLE IF NOT EXISTS nvts"
-       " (id INTEGER PRIMARY KEY, uuid, oid, version, name, comment, summary,"
-       "  description, copyright, cve, bid, xref, tag, sign_key_ids,"
-       "  category INTEGER, family, cvss_base, creation_time,"
-       "  modification_time);");
-
-  /* Copy the data into the new table. */
-
-  sql ("INSERT into nvts"
-       " (id, uuid, oid, version, name, comment, summary, description,"
-       "  copyright, cve, bid, xref, tag, sign_key_ids, category, family,"
-       "  cvss_base, creation_time, modification_time)"
-       " SELECT"
-       "  id, uuid, oid, version, name, comment, summary, description,"
-       "  copyright, cve, bid, xref, tag, sign_key_ids, category, family,"
-       "  cvss_base, creation_time, modification_time"
-       " FROM nvts_82;");
-
-  /* Drop the old table. */
-
-  sql ("DROP TABLE nvts_82;");
-
-  /* Set the database version to 83. */
-
-  set_db_version (83);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 83 to version 84.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_83_to_84 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 83. */
-
-  if (manage_db_version () != 83)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add columns "nvt_revision" and "severity" to results table */
-  sql ("ALTER TABLE results ADD COLUMN nvt_version;");
-  sql ("ALTER TABLE results ADD COLUMN severity REAL;");
-
-  /* Set the database version to 84. */
-
-  set_db_version (84);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 84 to version 85.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_84_to_85 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 84. */
-
-  if (manage_db_version () != 84)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add columns "severity" and "override_severity" to reports table */
-  sql ("ALTER TABLE reports ADD COLUMN severity REAL;");
-  sql ("ALTER TABLE reports ADD COLUMN override_severity REAL;");
-
-  /* Clear counts cache so the severity columns are updated */
-  sql ("UPDATE reports SET highs = -1;");
-  sql ("UPDATE reports SET override_highs = -1;");
-
-  /* Set the database version to 85. */
-
-  set_db_version (85);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 85 to version 86.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_85_to_86 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 85. */
-
-  if (manage_db_version () != 85)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add column "new_severity" to overrides and overrides_trash */
-  sql ("ALTER TABLE overrides ADD COLUMN new_severity REAL;");
-  sql ("ALTER TABLE overrides_trash ADD COLUMN new_severity REAL;");
-
-  /* Clear counts cache so the severity columns are updated */
-  sql ("UPDATE reports SET override_highs = -1;");
-
-  /* Set the database version to 86. */
-
-  set_db_version (86);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 86 to version 87.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_86_to_87 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 86. */
-
-  if (manage_db_version () != 86)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The scanner message types "Security Hole", "Security Warning" and
-   * "Security Note" were merged into a single type, "Alarm".
-   *
-   * Update the severity of old high, medium and low results at the same
-   * time, because the severity of these results can only be determined by
-   * their message type. */
-
-  sql ("UPDATE results"
-       " SET severity = (CASE type"
-       "                 WHEN 'Security Hole' THEN 10.0"
-       "                 WHEN 'Security Warning' THEN 5.0"
-       "                 WHEN 'Security Note' THEN 2.0"
-       "                 WHEN 'Log Message' THEN 0.0"
-       "                 ELSE NULL END)"
-       " WHERE severity IS NULL;");
-
-  sql ("UPDATE results SET type = 'Alarm'"
-       " WHERE type = 'Security Hole'"
-       " OR type = 'Security Warning'"
-       " OR type = 'Security Note';");
-
-  /* Set the database version to 87. */
-
-  set_db_version (87);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 87 to version 88.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_87_to_88 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 87. */
-
-  if (manage_db_version () != 87)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename reports table */
-  sql ("ALTER TABLE reports RENAME TO reports_87;");
-  /* Create a new one without severity and counts. */
-  sql ("CREATE TABLE IF NOT EXISTS reports"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, hidden INTEGER,"
-       "  task INTEGER, date INTEGER, start_time, end_time, nbefile, comment,"
-       "  scan_run_status INTEGER, slave_progress, slave_task_uuid);");
-  /* Create a new dedicated report_counts table. */
-  sql ("CREATE TABLE IF NOT EXISTS report_counts"
-       " (id INTEGER PRIMARY KEY, report INTEGER, user INTEGER,"
-       "  severity, override_severity, highs, mediums, lows, logs, fps,"
-       "  override_highs, override_mediums, override_lows, override_logs,"
-       "  override_fps);");
-  /* Copy old report data to new reports table. */
-  sql ("INSERT INTO reports"
-       " (id, uuid, owner, hidden, task, date, start_time, end_time,"
-       "  nbefile, comment, scan_run_status, slave_progress, slave_task_uuid)"
-       " SELECT id, uuid, owner, hidden, task, date, start_time, end_time,"
-       "  nbefile, comment, scan_run_status, slave_progress, slave_task_uuid"
-       " FROM reports_87;");
-  /* Delete old results table. */
-  sql ("DROP TABLE reports_87;");
-
-  /* Set the database version to 88. */
-
-  set_db_version (88);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 88 to version 89.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_88_to_89 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 87. */
-
-  if (manage_db_version () != 88)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename overrides tables */
-  sql ("ALTER TABLE overrides RENAME TO overrides_88;");
-  sql ("ALTER TABLE overrides_trash RENAME TO overrides_trash_88;");
-
-  /* Create a new one without threat and new_threat. */
-  sql ("CREATE TABLE IF NOT EXISTS overrides"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, severity,"
-       "  new_severity, task INTEGER, result INTEGER, end_time);");
-
-  sql ("CREATE TABLE IF NOT EXISTS overrides_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, severity,"
-       "  new_severity, task INTEGER, result INTEGER, end_time);");
-
-  /* Migrate old override data to new tables. */
-  sql ("INSERT INTO overrides"
-       " (id, uuid, owner, nvt, creation_time, modification_time, text,"
-       "  hosts, port, severity, new_severity, task, result, end_time)"
-       " SELECT id, uuid, owner, nvt, creation_time, modification_time, text,"
-       "   hosts, port,"
-       "   (CASE threat"
-       "    WHEN 'Security Hole' THEN 0.1"
-       "    WHEN 'Security Warning' THEN 0.1"
-       "    WHEN 'Security Note' THEN 0.1"
-       "    WHEN 'Alarm' THEN 0.1"
-       "    WHEN 'Log Message' THEN 0.0"
-       "    WHEN 'False Positive' THEN -1.0"
-       "    WHEN 'Debug Message' THEN -2.0"
-       "    WHEN 'Error Message' THEN -3.0"
-       "    ELSE NULL"
-       "    END),"
-       "   coalesce (new_severity,"
-       "             CASE new_threat"
-       "             WHEN 'Security Hole' THEN 10.0"
-       "             WHEN 'Security Warning' THEN 5.0"
-       "             WHEN 'Security Note' THEN 2.0"
-       "             WHEN 'Log Message' THEN 0.0"
-       "             WHEN 'False Positive' THEN -1.0"
-       "             WHEN 'Debug Message' THEN -2.0"
-       "             WHEN 'Error Message' THEN -3.0"
-       "             END),"
-       "   task, result, end_time"
-       " FROM overrides_88;");
-
-  sql ("INSERT INTO overrides_trash"
-       " (id, uuid, owner, nvt, creation_time, modification_time, text,"
-       "  hosts, port, severity, new_severity, task, result, end_time)"
-       " SELECT id, uuid, owner, nvt, creation_time, modification_time, text,"
-       "   hosts, port,"
-       "   (CASE threat"
-       "    WHEN 'Security Hole' THEN 0.1"
-       "    WHEN 'Security Warning' THEN 0.1"
-       "    WHEN 'Security Note' THEN 0.1"
-       "    WHEN 'Alarm' THEN 0.1"
-       "    WHEN 'Log Message' THEN 0.0"
-       "    WHEN 'False Positive' THEN -1.0"
-       "    WHEN 'Debug Message' THEN -2.0"
-       "    WHEN 'Error Message' THEN -3.0"
-       "    ELSE NULL"
-       "    END),"
-       "   coalesce (new_severity,"
-       "             CASE new_threat"
-       "             WHEN 'Security Hole' THEN 10.0"
-       "             WHEN 'Security Warning' THEN 5.0"
-       "             WHEN 'Security Note' THEN 2.0"
-       "             WHEN 'Log Message' THEN 0.0"
-       "             WHEN 'False Positive' THEN -1.0"
-       "             WHEN 'Debug Message' THEN -2.0"
-       "             WHEN 'Error Message' THEN -3.0"
-       "             END),"
-       "   task, result, end_time"
-       " FROM overrides_trash_88;");
-
-  /* Delete old overrides tables. */
-  sql ("DROP TABLE overrides_88;");
-  sql ("DROP TABLE overrides_trash_88;");
-
-  /* Clear overridden result counts cache */
-  sql ("UPDATE report_counts set override_highs = -1;");
-
-  /* Set the database version to 89. */
-
-  set_db_version (89);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 89 to version 90.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_89_to_90 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 89. */
-
-  if (manage_db_version () != 89)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Groups, roles and users became owned by all admins. */
-
-  sql ("UPDATE groups SET owner = NULL;");
-  sql ("UPDATE roles SET owner = NULL;");
-  sql ("UPDATE users SET owner = NULL;");
-
-  /* Set the database version to 90. */
-
-  set_db_version (90);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 90 to version 91.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_90_to_91 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 90. */
-
-  if (manage_db_version () != 90)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename notes tables */
-  sql ("ALTER TABLE notes RENAME TO notes_90;");
-  sql ("ALTER TABLE notes_trash RENAME TO notes_trash_90;");
-
-  /* Create new ones without threat and new_threat. */
-  sql ("CREATE TABLE IF NOT EXISTS notes"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, severity,"
-       "  task INTEGER, result INTEGER, end_time);");
-  sql ("CREATE TABLE IF NOT EXISTS notes_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, nvt,"
-       "  creation_time, modification_time, text, hosts, port, severity,"
-       "  task INTEGER, result INTEGER, end_time);");
-
-  /* Migrate old notes data to new tables. */
-  sql ("INSERT INTO notes"
-       " (id, uuid, owner , nvt, creation_time, modification_time, text,"
-       "  hosts, port, severity, task, result, end_time)"
-       " SELECT id, uuid, owner, nvt, creation_time, modification_time, text,"
-       "   hosts, port,"
-       "   (CASE threat"
-       "    WHEN 'Security Hole' THEN 0.1"
-       "    WHEN 'Security Warning' THEN 0.1"
-       "    WHEN 'Security Note' THEN 0.1"
-       "    WHEN 'Alarm' THEN 0.1"
-       "    WHEN 'Log Message' THEN 0.0"
-       "    WHEN 'False Positive' THEN -1.0"
-       "    WHEN 'Debug Message' THEN -2.0"
-       "    WHEN 'Error Message' THEN -3.0"
-       "    ELSE NULL"
-       "    END),"
-       "   task, result, end_time"
-       " FROM notes_90;");
-
-  sql ("INSERT INTO notes_trash"
-       " (id, uuid, owner , nvt, creation_time, modification_time, text,"
-       "  hosts, port, severity, task, result, end_time)"
-       " SELECT id, uuid, owner, nvt, creation_time, modification_time, text,"
-       "   hosts, port,"
-       "   (CASE threat"
-       "    WHEN 'Security Hole' THEN 0.1"
-       "    WHEN 'Security Warning' THEN 0.1"
-       "    WHEN 'Security Note' THEN 0.1"
-       "    WHEN 'Alarm' THEN 0.1"
-       "    WHEN 'Log Message' THEN 0.0"
-       "    WHEN 'False Positive' THEN -1.0"
-       "    WHEN 'Debug Message' THEN -2.0"
-       "    WHEN 'Error Message' THEN -3.0"
-       "    ELSE NULL"
-       "    END),"
-       "   task, result, end_time"
-       " FROM notes_trash_90;");
-
-  /* Delete old overrides tables. */
-  sql ("DROP TABLE notes_90;");
-  sql ("DROP TABLE notes_trash_90;");
-
-  /* Set the database version 91. */
-
-  set_db_version (91);
-
-  sql_commit ();
-
-  return 0;
-
-}
-
-/**
- * @brief Migrate the database from version 91 to version 92.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_91_to_92 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 91. */
-
-  if (manage_db_version () != 91)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The default setting Reports Filter was renamed to Results Filter.
-   * Report result filters are now of type "result".  Type "report" filters
-   * are for report filters. */
-
-  sql ("INSERT INTO settings (uuid, owner, name, comment, value)"
-       " SELECT '739ab810-163d-11e3-9af6-406186ea4fc5', owner,"
-       "        'Results Filter', comment, value"
-       " FROM settings"
-       " WHERE name = 'Reports Filter';");
-
-  sql ("DELETE FROM settings WHERE name = 'Reports Filter';");
-
-  sql ("UPDATE filters SET type = 'result' WHERE type = 'report';");
-
-  /* Set the database version 92. */
-
-  set_db_version (92);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 92 to version 93.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_92_to_93 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 92. */
-
-  if (manage_db_version () != 92)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The scanner preference host_expansion was removed. */
-
-  sql ("DELETE FROM config_preferences WHERE name = 'host_expansion';");
-  sql ("DELETE FROM config_preferences_trash WHERE name = 'host_expansion';");
-
-  /* Set the database version 93. */
-
-  set_db_version (93);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 93 to version 94.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_93_to_94 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 93. */
-
-  if (manage_db_version () != 93)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add column "exclude_hosts" to targets and targets_trash */
-  sql ("ALTER TABLE targets ADD COLUMN exclude_hosts;");
-  sql ("ALTER TABLE targets_trash ADD COLUMN exclude_hosts;");
-
-  /* Set the database version to 94. */
-
-  set_db_version (94);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 94 to version 95.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_94_to_95 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 94. */
-
-  if (manage_db_version () != 94)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Drop and replace the report_counts table */
-  sql ("DROP TABLE report_counts;");
-  sql ("CREATE TABLE IF NOT EXISTS report_counts"
-       " (id INTEGER PRIMARY KEY, report INTEGER, user INTEGER,"
-       "  severity, count, override);");
-
-  /* Set the database version to 95. */
-
-  set_db_version (95);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 95 to version 96.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_95_to_96 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 95. */
-
-  if (manage_db_version () != 95)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add column reverse lookup columns to targets and targets_trash */
-  sql ("ALTER TABLE targets ADD COLUMN reverse_lookup_only;");
-  sql ("ALTER TABLE targets ADD COLUMN reverse_lookup_unify;");
-  sql ("UPDATE targets SET reverse_lookup_only = 0, reverse_lookup_unify = 0;");
-
-  sql ("ALTER TABLE targets_trash ADD COLUMN reverse_lookup_only;");
-  sql ("ALTER TABLE targets_trash ADD COLUMN reverse_lookup_unify;");
-  sql ("UPDATE targets_trash SET reverse_lookup_only = 0, "
-       "                         reverse_lookup_unify = 0;");
-
-  /* Set the database version to 96. */
-
-  set_db_version (96);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 96 to version 97.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_96_to_97 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 96. */
-
-  if (manage_db_version () != 96)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add column hosts_ordering to tasks */
-  sql ("ALTER TABLE tasks ADD COLUMN hosts_ordering;");
-  sql ("UPDATE tasks SET hosts_ordering = 'sequential';");
-
-  /* Set the database version to 97. */
-
-  set_db_version (97);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 97 to version 98.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_97_to_98 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 97. */
-
-  if (manage_db_version () != 97)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Set default value for Dynamic Severity to 0 (disabled) */
-  sql ("UPDATE settings SET value = 0"
-       " WHERE name = 'Dynamic Severity'"
-       " AND owner IS NULL;");
-
-  /* Set the database version to 98. */
-
-  set_db_version (98);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 98 to version 99.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_98_to_99 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 98. */
-
-  if (manage_db_version () != 98)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Remove reverse_lookup and slice_network_addresses scanner preferences. */
-
-  sql ("DELETE FROM config_preferences WHERE name = 'reverse_lookup';");
-  sql ("DELETE FROM config_preferences"
-       " WHERE name = 'slice_network_addresses';");
-  sql ("DELETE FROM config_preferences_trash WHERE name = 'reverse_lookup';");
-  sql ("DELETE FROM config_preferences_trash"
-       " WHERE name = 'slice_network_addresses';");
-
-  /* Set the database version to 99. */
-
-  set_db_version (99);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 99 to version 100.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_99_to_100 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 99. */
-
-  if (manage_db_version () != 99)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename results tables */
-  sql ("ALTER TABLE results RENAME TO results_99;");
-
-  /* Create new one without subnet. */
-  sql ("CREATE TABLE IF NOT EXISTS results"
-       " (id INTEGER PRIMARY KEY, uuid, task INTEGER, host, port, nvt,"
-       "  type, description, report, nvt_version, severity REAL)");
-
-  /* Migrate old results data to new table. */
-  sql ("INSERT INTO results"
-       " (id, uuid, task, host, port, nvt, type,"
-       "  description, report, nvt_version, severity)"
-       " SELECT id, uuid, task, host, port, nvt, type, description, report,"
-       "  nvt_version, severity FROM results_99");
-
-  /* Delete old results table. */
-  sql ("DROP TABLE results_99;");
-
-  /* Set the database version to 100. */
-
-  set_db_version (100);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 100 to version 101.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_100_to_101 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 100. */
-
-  if (manage_db_version () != 100)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Migrate level alert condition data to severity */
-  sql ("UPDATE alert_condition_data SET"
-       " name = 'severity',"
-       " data = CASE data"
-       "        WHEN 'High' THEN 5.1"
-       "        WHEN 'Medium' THEN 2.1"
-       "        WHEN 'Meduim' THEN 2.1" // Fix for typo in GSA
-       "        WHEN 'Low' THEN 0.1"
-       "        WHEN 'Log' THEN 0.0"
-       "        WHEN 'False Positive' THEN -1.0"
-       "        ELSE data END"
-       " WHERE name = 'level';");
-
-  sql ("UPDATE alert_condition_data_trash SET"
-       " name = 'severity',"
-       " data = CASE data"
-       "        WHEN 'High' THEN 5.1"
-       "        WHEN 'Medium' THEN 2.1"
-       "        WHEN 'Meduim' THEN 2.1" // Fix for typo in GSA
-       "        WHEN 'Low' THEN 0.1"
-       "        WHEN 'Log' THEN 0.0"
-       "        WHEN 'False Positive' THEN -1.0"
-       "        ELSE data END"
-       " WHERE name = 'level';");
-
-  /* Set the database version to 101. */
-
-  set_db_version (101);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 101 to version 102.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_101_to_102 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 101. */
-
-  if (manage_db_version () != 101)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename nvts tables. */
-  sql ("ALTER TABLE nvts RENAME TO nvts_101;");
-
-  /* Create new one without description column. */
-  sql ("CREATE TABLE IF NOT EXISTS nvts"
-       " (id INTEGER PRIMARY KEY, uuid, oid, version, name, comment, summary,"
-       "  copyright, cve, bid, xref, tag, sign_key_ids,"
-       "  category INTEGER, family, cvss_base, creation_time,"
-       "  modification_time);");
-
-  /* Migrate old nvts data to new table. */
-  sql ("INSERT INTO nvts"
-       " (id, uuid, oid, version, name, comment, summary,"
-       "  copyright, cve, bid, xref, tag, sign_key_ids,"
-       "  category, family, cvss_base, creation_time, modification_time)"
-       " SELECT id, uuid, oid, version, name, comment, summary,"
-       "  copyright, cve, bid, xref, tag, sign_key_ids,"
-       "  category, family, cvss_base, creation_time, modification_time"
-       "  FROM nvts_101;");
-
-  /* Delete old nvts table. */
-  sql ("DROP TABLE nvts_101;");
-
-  /* Set the database version to 102. */
-
-  set_db_version (102);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 102 to version 103.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_102_to_103 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 102. */
-
-  if (manage_db_version () != 102)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Clear cache for affected reports */
-  sql ("DELETE FROM report_counts WHERE report IN"
-       " (SELECT report FROM results"
-       "  WHERE severity = 'NULL' OR severity = '' OR severity IS NULL);");
-
-  /* Add missing severity values */
-  sql ("UPDATE results SET"
-       " severity = CASE type"
-       "            WHEN 'Error Message' THEN -3.0"
-       "            WHEN 'Debug Message' THEN -2.0"
-       "            WHEN 'False Positive' THEN -1.0"
-       "            WHEN 'Log Message' THEN 0.0"
-       "            ELSE NULL END"
-       " WHERE severity = 'NULL' OR severity = '' OR severity IS NULL;");
-
-  /* Set the database version to 103. */
-
-  set_db_version (103);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 103 to version 104.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_103_to_104 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 103. */
-
-  if (manage_db_version () != 103)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Tasks got an alterable flag. */
-  sql ("ALTER TABLE tasks ADD column alterable;");
-  sql ("UPDATE tasks SET alterable = 0;");
-
-  /* Set the database version to 104. */
-
-  set_db_version (104);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 104 to version 105.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_104_to_105 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 104. */
-
-  if (manage_db_version () != 104)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add expiration date column to reports cache. */
-  sql ("ALTER TABLE report_counts ADD COLUMN end_time INTEGER;");
-
-  /* Update cache to set expiration dates. */
-  sql ("UPDATE report_counts"
-       " SET end_time = (SELECT coalesce(min(end_time), 0)"
-       "                 FROM overrides, results"
-       "                 WHERE overrides.nvt = results.nvt"
-       "                 AND results.report = report_counts.report"
-       "                 AND overrides.end_time > 1)"
-       " WHERE report_counts.override = 1;");
-
-  sql ("UPDATE report_counts"
-       " SET end_time = 0"
-       " WHERE report_counts.override = 0;");
-
-  /* Clear cache for reports with already expired overrides */
-  sql ("DELETE FROM report_counts"
-       " WHERE end_time != 0 AND end_time <= m_now ()");
-
-  /* Set the database version to 105. */
-
-  set_db_version (105);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 105 to version 106.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_105_to_106 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 105. */
-
-  if (manage_db_version () != 105)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  sql ("ALTER TABLE users ADD COLUMN ifaces;");
-  sql ("ALTER TABLE users ADD COLUMN ifaces_allow;");
-  sql ("UPDATE users SET ifaces = '', ifaces_allow = 2");
-
-  /* Set the database version to 106. */
-
-  set_db_version (106);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 106 to version 107.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_106_to_107 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 106. */
-
-  if (manage_db_version () != 106)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Results in container tasks were being given a task of 0. */
-  sql ("UPDATE results"
-       " SET task = (SELECT task FROM reports WHERE reports.id = report);");
-
-  /* Set the database version to 107. */
-
-  set_db_version (107);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 107 to version 108.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_107_to_108 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 107. */
-
-  if (manage_db_version () != 107)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Change hosts and interfaces Access "Allow All" to "Deny none". */
-  sql ("UPDATE users"
-       " SET hosts = '', hosts_allow = 0 WHERE hosts_allow = 2;");
-  sql ("UPDATE users"
-       " SET ifaces = '', ifaces_allow = 0 WHERE ifaces_allow = 2;");
-
-  /* Set the database version to 108. */
-
-  set_db_version (108);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 108 to version 109.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_108_to_109 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 108. */
-
-  if (manage_db_version () != 108)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Permission names changed to full command names. */
-
-  sql ("UPDATE permissions SET name = 'create_' || resource_type"
-       " WHERE name = 'create';");
-  sql ("DELETE FROM permissions WHERE name = 'create_';");
-
-  sql ("UPDATE permissions SET name = 'delete_' || resource_type"
-       " WHERE name = 'delete';");
-  sql ("DELETE FROM permissions WHERE name = 'delete_';");
-
-  sql ("UPDATE permissions SET name = 'get_' || resource_type || 's'"
-       " WHERE name = 'get';");
-  sql ("DELETE FROM permissions WHERE name = 'get_';");
-
-  sql ("UPDATE permissions SET name = 'modify_' || resource_type"
-       " WHERE name = 'modify';");
-  sql ("DELETE FROM permissions WHERE name = 'modify_';");
-
-  /* Set the database version to 109. */
-
-  set_db_version (109);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 109 to version 110.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_109_to_110 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 109. */
-
-  if (manage_db_version () != 109)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The permissions tables got subject_location fields. */
-
-  sql ("ALTER TABLE permissions ADD COLUMN subject_location;");
-  sql ("UPDATE permissions SET subject_location = 0;");
-
-  sql ("ALTER TABLE permissions_trash ADD COLUMN subject_location;");
-  sql ("UPDATE permissions_trash SET subject_location = 0;");
-
-  /* Set the database version to 110. */
-
-  set_db_version (110);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 110 to version 111.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_110_to_111 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 110. */
-
-  if (manage_db_version () != 110)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The targets tables got an alive_test field. */
-
-  sql ("ALTER TABLE targets ADD COLUMN alive_test;");
-  sql ("UPDATE targets SET alive_test = 0;");
-
-  sql ("ALTER TABLE targets_trash ADD COLUMN alive_test;");
-  sql ("UPDATE targets_trash SET alive_test = 0;");
-
-  /* Set the database version to 111. */
-
-  set_db_version (111);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 111 to version 112.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_111_to_112 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 111. */
-
-  if (manage_db_version () != 111)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Some prefs were removed from config Host Discovery so that the NVT
-   * defaults will be used instead. */
-
-  sql ("DELETE FROM config_preferences"
-       " WHERE config = (SELECT id FROM configs"
-       "                 WHERE uuid = '" CONFIG_UUID_HOST_DISCOVERY "')"
-       " AND (name = 'Ping Host[checkbox]:Do a TCP ping'"
-       "      OR name = 'Ping Host[checkbox]:Do an ICMP ping'"
-       "      OR name = 'Ping Host[checkbox]:Use ARP'"
-       "      OR name = 'Ping Host[checkbox]:Use nmap'"
-       "      OR name = 'Ping Host[checkbox]:nmap: try also with only -sP'"
-       "      OR name = 'Ping Host[entry]:nmap additional ports for -PA');");
-
-  /* Set the database version to 112. */
-
-  set_db_version (112);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 112 to version 113.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_112_to_113 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 112. */
-
-  if (manage_db_version () != 112)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Certain levels may have been missing from the result counts cache due
-   * to floating point approximation. */
-
-  sql ("DELETE FROM report_counts;");
-
-  /* Set the database version to 113. */
-
-  set_db_version (113);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 113 to version 114.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_113_to_114 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 113. */
-
-  if (manage_db_version () != 113)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Reports got information from scan time. */
-
-  sql ("ALTER TABLE reports ADD COLUMN slave_uuid;");
-  sql ("ALTER TABLE reports ADD COLUMN slave_name;");
-  sql ("ALTER TABLE reports ADD COLUMN slave_host;");
-  sql ("ALTER TABLE reports ADD COLUMN slave_port;");
-  sql ("ALTER TABLE reports ADD COLUMN source_iface;");
-
-  /* Set the database version to 114. */
-
-  set_db_version (114);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 114 to version 115.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_114_to_115 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 114. */
-
-  if (manage_db_version () != 114)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Rename nvts tables. */
-  sql ("ALTER TABLE nvts RENAME TO nvts_114;");
-
-  /* Create new one without sign_key_ids column. */
-  sql ("CREATE TABLE IF NOT EXISTS nvts"
-       " (id INTEGER PRIMARY KEY, uuid, oid, version, name, comment, summary,"
-       "  copyright, cve, bid, xref, tag, category INTEGER, family, cvss_base,"
-       "  creation_time, modification_time);");
-
-  /* Migrate old nvts data to new table. */
-  sql ("INSERT INTO nvts"
-       " (id, uuid, oid, version, name, comment, summary,"
-       "  copyright, cve, bid, xref, tag,"
-       "  category, family, cvss_base, creation_time, modification_time)"
-       " SELECT id, uuid, oid, version, name, comment, summary,"
-       "  copyright, cve, bid, xref, tag,"
-       "  category, family, cvss_base, creation_time, modification_time"
-       "  FROM nvts_114;");
-
-  /* Delete old nvts table. */
-  sql ("DROP TABLE nvts_114;");
-
-  /* Set the database version to 115. */
-
-  set_db_version (115);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 115 to version 116.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_115_to_116 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 115. */
-
-  if (manage_db_version () != 115)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* NVT "CPE Inventory" was removed from config "Discovery". */
-
-  sql ("DELETE FROM nvt_selectors"
-       " WHERE name = '" MANAGE_NVT_SELECTOR_UUID_DISCOVERY "'"
-       " AND type = " G_STRINGIFY (NVT_SELECTOR_TYPE_NVT)
-       " AND family_or_nvt = '1.3.6.1.4.1.25623.1.0.810002'");
-
-  /* Set the database version to 116. */
-
-  set_db_version (116);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief ID SQL for migrate_116_to_117.
- */
-#define ID_WHEN_WITH_TRASH(type)                                 \
- " WHEN '" G_STRINGIFY (type) "' THEN"                           \
- "   COALESCE ((SELECT id FROM " G_STRINGIFY (type) "s"          \
- "               WHERE uuid = attach_id),"                       \
- "             (SELECT id FROM " G_STRINGIFY (type) "s_trash"    \
- "               WHERE uuid = attach_id),"                       \
- "             0)"
-
-/**
- * @brief ID SQL for migrate_116_to_117.
- */
-#define ID_WHEN_WITHOUT_TRASH(type)                              \
- " WHEN '" G_STRINGIFY (type) "' THEN"                           \
- "   COALESCE ((SELECT id FROM " G_STRINGIFY (type) "s"          \
- "                WHERE uuid = attach_id),"                      \
- "             0)"
-
-/**
- * @brief Trash SQL for migrate_116_to_117.
- */
-#define RESOURCE_TRASH(type)                                     \
- " WHEN '" G_STRINGIFY (type) "' THEN"                           \
- "  (SELECT CASE WHEN "                                          \
- "    (EXISTS (SELECT * FROM " G_STRINGIFY (type) "s_trash"      \
- "             WHERE uuid = attach_id))"                         \
- "     THEN " G_STRINGIFY (LOCATION_TRASH)                       \
- "     ELSE " G_STRINGIFY (LOCATION_TABLE) " END)"
-
-/**
- * @brief Migrate the database from version 116 to version 117.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_116_to_117 ()
-{
-  int scap_loaded = manage_scap_loaded ();
-  int cert_loaded = manage_cert_loaded ();
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 116. */
-
-  if (manage_db_version () != 116)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename attach_[...] columns in tags to resource_[...], reference
-   * resources by id and add new column for resource UUID. */
-
-  sql ("ALTER TABLE tags RENAME TO tags_117;");
-  sql ("ALTER TABLE tags_trash RENAME TO tags_trash_117;");
-
-  sql ("CREATE TABLE IF NOT EXISTS tags"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  creation_time, modification_time, resource_type, resource,"
-       "  resource_uuid, resource_location, active, value);");
-
-  sql ("CREATE TABLE IF NOT EXISTS groups_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  type, term, creation_time, modification_time);");
-
-  sql ("CREATE TABLE IF NOT EXISTS roles_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, comment,"
-       "  creation_time, modification_time);");
-
-  sql ("INSERT INTO tags"
-       " (id, uuid, owner, name, comment,"
-       "  creation_time, modification_time, resource_type, resource,"
-       "  resource_uuid, resource_location, active, value)"
-       " SELECT"
-       "  id, uuid, owner, name, comment, creation_time, modification_time,"
-       "  attach_type,"
-       "  (SELECT CASE attach_type"
-       ID_WHEN_WITH_TRASH (agent)
-       ID_WHEN_WITH_TRASH (alert)
-       "%s" // CPE and CVE
-       ID_WHEN_WITH_TRASH (config)
-       "%s" // DFN_CERT_ADV
-       ID_WHEN_WITH_TRASH (filter)
-       ID_WHEN_WITH_TRASH (group)
-       ID_WHEN_WITH_TRASH (lsc_credential)
-       ID_WHEN_WITH_TRASH (note)
-       ID_WHEN_WITHOUT_TRASH (nvt)
-       ID_WHEN_WITH_TRASH (override)
-       "%s" // OVALDEF
-       ID_WHEN_WITH_TRASH (permission)
-       ID_WHEN_WITH_TRASH (port_list)
-       ID_WHEN_WITH_TRASH (report_format)
-       ID_WHEN_WITHOUT_TRASH (report)
-       ID_WHEN_WITHOUT_TRASH (result)
-       ID_WHEN_WITHOUT_TRASH (role)
-       ID_WHEN_WITH_TRASH (schedule)
-       ID_WHEN_WITH_TRASH (slave)
-       ID_WHEN_WITH_TRASH (target)
-       ID_WHEN_WITHOUT_TRASH (task) // uses attribute "hidden" for trash
-       ID_WHEN_WITHOUT_TRASH (user)
-       "   ELSE 0 END),"
-       " attach_id,"
-       " (SELECT CASE attach_type"
-       RESOURCE_TRASH (alert)
-       RESOURCE_TRASH (config)
-       RESOURCE_TRASH (filter)
-       RESOURCE_TRASH (group)
-       RESOURCE_TRASH (lsc_credential)
-       RESOURCE_TRASH (note)
-       RESOURCE_TRASH (override)
-       RESOURCE_TRASH (permission)
-       RESOURCE_TRASH (port_list)
-       RESOURCE_TRASH (report_format)
-       RESOURCE_TRASH (schedule)
-       RESOURCE_TRASH (slave)
-       RESOURCE_TRASH (target)
-       "  WHEN 'task' THEN"
-       "    COALESCE ((SELECT CASE WHEN hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM tasks WHERE uuid = attach_id),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'report' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM reports"
-       "                     WHERE reports.uuid = attach_id) AS report_task"
-       "               JOIN tasks ON tasks.id = report_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'result' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM results"
-       "                     WHERE results.uuid = attach_id) AS result_task"
-       "               JOIN tasks ON tasks.id = result_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  ELSE " G_STRINGIFY (LOCATION_TABLE) " END),"
-       " active, value"
-       " FROM tags_117;",
-       scap_loaded ? ID_WHEN_WITHOUT_TRASH (cpe)
-                     ID_WHEN_WITHOUT_TRASH (cve)
-                   : "",
-       cert_loaded ? ID_WHEN_WITHOUT_TRASH (dfn_cert_adv)
-                   : "",
-       scap_loaded ? ID_WHEN_WITHOUT_TRASH (ovaldef)
-                   : "");
-
-  sql ("DROP TABLE tags_117;");
-
-  /* Rename attach_[...] columns in tags_trash to resource_[...], reference
-   * resources by id and add new column for resource UUID. */
-  sql ("CREATE TABLE IF NOT EXISTS tags_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner, name, comment,"
-       "  creation_time, modification_time, resource_type, resource,"
-       "  resource_uuid, resource_location, active, value);");
-
-  sql ("INSERT INTO tags_trash"
-       " (id, uuid, owner, name, comment,"
-       "  creation_time, modification_time, resource_type, resource,"
-       "  resource_uuid, resource_location, active, value)"
-       " SELECT"
-       "  id, uuid, owner, name, comment, creation_time, modification_time,"
-       "  attach_type,"
-       "  (SELECT CASE attach_type"
-       ID_WHEN_WITH_TRASH (agent)
-       ID_WHEN_WITH_TRASH (alert)
-       "%s" // CPE and CVE
-       ID_WHEN_WITH_TRASH (config)
-       "%s" // DFN_CERT_ADV
-       ID_WHEN_WITH_TRASH (filter)
-       ID_WHEN_WITH_TRASH (group)
-       ID_WHEN_WITH_TRASH (lsc_credential)
-       ID_WHEN_WITH_TRASH (note)
-       ID_WHEN_WITHOUT_TRASH (nvt)
-       ID_WHEN_WITH_TRASH (override)
-       "%s" // OVALDEF
-       ID_WHEN_WITH_TRASH (permission)
-       ID_WHEN_WITH_TRASH (port_list)
-       ID_WHEN_WITH_TRASH (report_format)
-       ID_WHEN_WITHOUT_TRASH (report)
-       ID_WHEN_WITHOUT_TRASH (result)
-       ID_WHEN_WITHOUT_TRASH (role)
-       ID_WHEN_WITH_TRASH (schedule)
-       ID_WHEN_WITH_TRASH (slave)
-       ID_WHEN_WITH_TRASH (target)
-       ID_WHEN_WITHOUT_TRASH (task) // uses attribute "hidden" for trash
-       ID_WHEN_WITHOUT_TRASH (user)
-       "   ELSE 0 END),"
-       " attach_id,"
-       " (SELECT CASE attach_type"
-       RESOURCE_TRASH (alert)
-       RESOURCE_TRASH (config)
-       RESOURCE_TRASH (filter)
-       RESOURCE_TRASH (group)
-       RESOURCE_TRASH (lsc_credential)
-       RESOURCE_TRASH (note)
-       RESOURCE_TRASH (override)
-       RESOURCE_TRASH (permission)
-       RESOURCE_TRASH (port_list)
-       RESOURCE_TRASH (report_format)
-       RESOURCE_TRASH (schedule)
-       RESOURCE_TRASH (slave)
-       RESOURCE_TRASH (target)
-       "  WHEN 'task' THEN"
-       "    COALESCE ((SELECT CASE WHEN hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM tasks WHERE uuid = attach_id),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'report' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM reports"
-       "                     WHERE reports.uuid = attach_id) AS report_task"
-       "               JOIN tasks ON tasks.id = report_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'result' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM results"
-       "                     WHERE results.uuid = attach_id) AS result_task"
-       "               JOIN tasks ON tasks.id = result_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  ELSE " G_STRINGIFY (LOCATION_TABLE) " END),"
-       " active, value"
-       " FROM tags_trash_117;",
-       scap_loaded ? ID_WHEN_WITHOUT_TRASH (cpe)
-                     ID_WHEN_WITHOUT_TRASH (cve)
-                   : "",
-       cert_loaded ? ID_WHEN_WITHOUT_TRASH (dfn_cert_adv)
-                   : "",
-       scap_loaded ? ID_WHEN_WITHOUT_TRASH (ovaldef)
-                   : "");
-
-  sql ("DROP TABLE tags_trash_117;");
-
-  /* Set the database version to 117. */
-
-  set_db_version (117);
-
-  sql_commit ();
-
-  return 0;
-}
-#undef ID_WHEN_WITH_TRASH
-#undef ID_WHEN_WITHOUT_TRASH
-#undef RESOURCE_TRASH
-
-
-#define RESOURCE_TRASH(type)                                     \
- " WHEN '" G_STRINGIFY (type) "' THEN"                           \
- "  (SELECT CASE WHEN "                                          \
- "    (EXISTS (SELECT * FROM " G_STRINGIFY (type) "s_trash"      \
- "             WHERE uuid = resource_uuid))"                     \
- "     THEN " G_STRINGIFY (LOCATION_TRASH)                       \
- "     ELSE " G_STRINGIFY (LOCATION_TABLE) " END)"
-
-/**
- * @brief Migrate the database from version 117 to version 118.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_117_to_118 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 117. */
-
-  if (manage_db_version () != 117)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rebuild the resource_location column in tags and tags_trash */
-  sql ("UPDATE tags SET resource_location = "
-       " (SELECT CASE resource_type"
-       RESOURCE_TRASH (alert)
-       RESOURCE_TRASH (config)
-       RESOURCE_TRASH (filter)
-       RESOURCE_TRASH (group)
-       RESOURCE_TRASH (lsc_credential)
-       RESOURCE_TRASH (note)
-       RESOURCE_TRASH (override)
-       RESOURCE_TRASH (permission)
-       RESOURCE_TRASH (port_list)
-       RESOURCE_TRASH (report_format)
-       RESOURCE_TRASH (schedule)
-       RESOURCE_TRASH (slave)
-       RESOURCE_TRASH (target)
-       "  WHEN 'task' THEN"
-       "    COALESCE ((SELECT CASE WHEN hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM tasks WHERE uuid = resource_uuid),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'report' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM reports"
-       "                     WHERE reports.uuid = resource_uuid) AS report_task"
-       "               JOIN tasks ON tasks.id = report_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'result' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM results"
-       "                     WHERE results.uuid = resource_uuid) AS result_task"
-       "               JOIN tasks ON tasks.id = result_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  ELSE " G_STRINGIFY (LOCATION_TABLE) " END);");
-
-  sql ("UPDATE tags_trash SET resource_location = "
-       " (SELECT CASE resource_type"
-       RESOURCE_TRASH (alert)
-       RESOURCE_TRASH (config)
-       RESOURCE_TRASH (filter)
-       RESOURCE_TRASH (group)
-       RESOURCE_TRASH (lsc_credential)
-       RESOURCE_TRASH (note)
-       RESOURCE_TRASH (override)
-       RESOURCE_TRASH (permission)
-       RESOURCE_TRASH (port_list)
-       RESOURCE_TRASH (report_format)
-       RESOURCE_TRASH (schedule)
-       RESOURCE_TRASH (slave)
-       RESOURCE_TRASH (target)
-       "  WHEN 'task' THEN"
-       "    COALESCE ((SELECT CASE WHEN hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM tasks WHERE uuid = resource_uuid),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'report' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM reports"
-       "                     WHERE reports.uuid = resource_uuid) AS report_task"
-       "               JOIN tasks ON tasks.id = report_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  WHEN 'result' THEN"
-       "    COALESCE ((SELECT CASE WHEN tasks.hidden = 2 THEN "
-                       G_STRINGIFY (LOCATION_TRASH)
-       "               ELSE "
-                       G_STRINGIFY (LOCATION_TABLE)
-       "               END"
-       "               FROM (SELECT task FROM results"
-       "                     WHERE results.uuid = resource_uuid) AS result_task"
-       "               JOIN tasks ON tasks.id = result_task.task),"
-                       G_STRINGIFY (LOCATION_TABLE) ")"
-       "  ELSE " G_STRINGIFY (LOCATION_TABLE) " END);");
-
-  /* Set the database version to 118. */
-
-  set_db_version (118);
-
-  sql_commit ();
-
-  return 0;
-}
-#undef RESOURCE_TRASH
-
-/**
- * @brief Migrate the database from version 118 to version 119.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_118_to_119 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 118. */
-
-  if (manage_db_version () != 118)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Cleaning up of orphaned results was removed from startup. */
-
-  sql ("DELETE FROM results"
-       " WHERE NOT EXISTS (SELECT * FROM report_results"
-       "                   WHERE report_results.result = results.id);");
-  if (sql_changes () > 0)
-    {
-      g_debug ("%s: Removed %d orphaned result(s).",
-               __FUNCTION__, sql_changes ());
-      sql ("DELETE FROM report_counts WHERE override = 0;");
-      sql ("DELETE FROM report_counts WHERE override = 1;");
-    }
-
-  /* Set the database version to 119. */
-
-  set_db_version (119);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 119 to version 120.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_119_to_120 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 119. */
-
-  if (manage_db_version () != 119)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* An omission in manage_empty_trashcan was leaving permissions referring to
-   * removed resources. */
-
-  sql ("DELETE FROM permissions"
-       " WHERE resource_location = " G_STRINGIFY (LOCATION_TRASH)
-       " AND resource > 0"
-       " AND resource_exists (resource_type, resource, resource_location) == 0;");
-
-  sql ("DELETE FROM permissions"
-       " WHERE subject_location = " G_STRINGIFY (LOCATION_TRASH)
-       " AND subject > 0"
-       " AND resource_exists (subject_type, subject, subject_location) == 0;");
-
-  /* Set the database version to 120. */
-
-  set_db_version (120);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 120 to version 121.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_120_to_121 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 120. */
-
-  if (manage_db_version () != 120)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Observer role was missing the AUTHENTICATE permission. Simply delete all
-   * its permissions and they will be recreated (along with AUTHENTICATE
-   * permission) on start-up. */
-  sql ("DELETE FROM permissions WHERE subject_type = 'role'"
-       " AND subject = (SELECT id FROM roles"
-       "                WHERE uuid = '" ROLE_UUID_OBSERVER "');");
-
-  /* Set the database version to 121. */
-
-  set_db_version (121);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 121 to version 122.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_121_to_122 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 121. */
-
-  if (manage_db_version () != 121)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* HELP now has a permission check, so delete User and Info roles' permissions
-   * and they will be recreated (along with HELP permission) on start-up. */
-  sql ("DELETE FROM permissions"
-       " WHERE subject_type = 'role' AND subject IN"
-       "   (SELECT id FROM roles WHERE uuid = '" ROLE_UUID_USER "'"
-       "    OR uuid = '" ROLE_UUID_INFO"');");
-
-  /* Set the database version to 122. */
-
-  set_db_version (122);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 122 to version 123.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_122_to_123 ()
-{
-  int column_found = 0;
-  iterator_t column_data;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 122. */
-
-  if (manage_db_version () != 122)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Check if targets_trash has alive_test column, which was added in the
-   * migration to version 111 but previously missing in create_tables. */
-  init_iterator (&column_data, "PRAGMA table_info (targets_trash);");
-  while (next (&column_data) && column_found == 0)
-    {
-      const char* column_name;
-
-      column_name = iterator_string (&column_data, 1);
-      column_found = (strcmp (column_name, "alive_test") == 0);
-    }
-  cleanup_iterator (&column_data);
-
-  if (column_found == 0)
-    {
-      sql ("ALTER TABLE targets_trash ADD COLUMN alive_test;");
-      sql ("UPDATE targets_trash SET alive_test = 0;");
-    }
-
-  /* Set the database version to 123. */
-
-  set_db_version (123);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 123 to version 124.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_123_to_124 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 123. */
-
-  if (manage_db_version () != 123)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Rename lsc_credentials tables. */
-  sql ("ALTER TABLE lsc_credentials RENAME TO lsc_credentials_123;");
-  sql ("ALTER TABLE lsc_credentials_trash RENAME TO lsc_credentials_trash_123;");
-
-  /* Create new ones without public_key. */
-  sql ("CREATE TABLE IF NOT EXISTS lsc_credentials"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name,"
-       "  login, password, comment, private_key, rpm, deb, exe,"
-       "  creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS lsc_credentials_trash"
-       " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name,"
-       "  login, password, comment, private_key, rpm, deb, exe,"
-       "  creation_time, modification_time);");
-
-  /* Migrate old data to new tables. */
-  sql ("INSERT INTO lsc_credentials"
-       " (id, uuid, owner , name, login, password, comment, private_key, rpm,"
-       "  deb, exe, creation_time, modification_time)"
-       " SELECT id, uuid, owner, name, login, password, comment, private_key,"
-       "  rpm, deb, exe, creation_time, modification_time"
-       " FROM lsc_credentials_123;");
-
-  sql ("INSERT INTO lsc_credentials_trash"
-       " (id, uuid, owner , name, login, password, comment, private_key, rpm,"
-       "  deb, exe, creation_time, modification_time)"
-       " SELECT id, uuid, owner, name, login, password, comment, private_key,"
-       "  rpm, deb, exe, creation_time, modification_time"
-       " FROM lsc_credentials_123;");
-
-  /* Delete old tables. */
-  sql ("DROP TABLE lsc_credentials_123;");
-  sql ("DROP TABLE lsc_credentials_trash_123;");
-
-  /* Set the database version 124. */
-
-  set_db_version (124);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 124 to version 125.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_124_to_125 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 124. */
-
-  if (manage_db_version () != 124)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add tasks scanner and configs type. */
-  sql ("ALTER TABLE tasks ADD COLUMN scanner;");
-  sql ("ALTER TABLE configs ADD COLUMN type;");
-  sql ("ALTER TABLE configs_trash ADD COLUMN type;");
-  sql ("UPDATE tasks SET scanner = 0;");
-  sql ("UPDATE configs SET type = 0;");
-  sql ("UPDATE configs_trash SET type = 0;");
-
-  /* Set the database version 125. */
-
-  set_db_version (125);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 125 to version 126.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_125_to_126 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 125. */
-
-  if (manage_db_version () != 125)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The description column was removed from table tasks. */
-
-  /* Move the table away. */
-
-  sql ("ALTER TABLE tasks RENAME TO tasks_125;");
-
-  /* Create the table in the new format. */
-
-  sql ("CREATE TABLE IF NOT EXISTS tasks"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, hidden INTEGER,"
-       "  time, comment, run_status INTEGER, start_time, end_time,"
-       "  config INTEGER, target INTEGER, schedule INTEGER, schedule_next_time,"
-       "  slave INTEGER, config_location INTEGER, target_location INTEGER,"
-       "  schedule_location INTEGER, slave_location INTEGER,"
-       "  upload_result_count INTEGER, hosts_ordering, scanner, alterable,"
-       "  creation_time, modification_time);");
-
-  /* Copy the data into the new table. */
-
-  sql ("INSERT into tasks"
-       " (id, uuid, owner, name, hidden,"
-       "  time, comment, run_status, start_time, end_time,"
-       "  config, target, schedule, schedule_next_time,"
-       "  slave, config_location, target_location,"
-       "  schedule_location, slave_location,"
-       "  upload_result_count, hosts_ordering, scanner, alterable,"
-       "  creation_time, modification_time)"
-       " SELECT"
-       "  id, uuid, owner, name, hidden,"
-       "  time, comment, run_status, start_time, end_time,"
-       "  config, target, schedule, schedule_next_time,"
-       "  slave, config_location, target_location,"
-       "  schedule_location, slave_location,"
-       "  upload_result_count, hosts_ordering, scanner, alterable,"
-       "  creation_time, modification_time"
-       " FROM tasks_125;");
-
-  /* Drop the old table. */
-
-  sql ("DROP TABLE tasks_125;");
-
-  /* Set the database version to 126. */
-
-  set_db_version (126);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 126 to version 127.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_126_to_127 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 126. */
-
-  if (manage_db_version () != 126)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* An error in copy_task gave some permissions wrong resource_uuid values. */
-
-  /* Copy the data into the new table. */
-
-  sql ("UPDATE permissions"
-       " SET resource_uuid = (SELECT uuid FROM tasks WHERE tasks.id = resource)"
-       " WHERE resource_type = 'task'"
-       " AND resource != 0;");
-
-  /* Set the database version to 127. */
-
-  set_db_version (127);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 127 to version 128.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_127_to_128 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 127. */
-
-  if (manage_db_version () != 127)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Results got a Quality of Detection column. */
-
-  sql ("ALTER TABLE results ADD COLUMN qod INTEGER;");
-  sql ("UPDATE results SET qod = -1;");
-
-  /* Set the database version to 128. */
-
-  set_db_version (128);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 128 to version 129.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_128_to_129 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 128. */
-
-  if (manage_db_version () != 128)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure new tables exists. */
-  sql ("CREATE TABLE IF NOT EXISTS scanners"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment,"
-       "  host, port, type, creation_time, modification_time);");
-  sql ("CREATE TABLE IF NOT EXISTS scanners_trash"
-       " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment,"
-       "  host, port, type, creation_time, modification_time);");
-
-
-  /* Insert the default OpenVAS Scanner, if not present. */
-  if (sql_int ("SELECT count(*) FROM scanners WHERE uuid = '%s';",
-               SCANNER_UUID_DEFAULT) == 0)
-    sql ("INSERT INTO scanners"
-         " (uuid, owner, name, host, port, type,"
-         "  creation_time, modification_time)"
-         " VALUES ('" SCANNER_UUID_DEFAULT "', NULL, 'OpenVAS Default',"
-         " 'localhost', 9391, %d, m_now (), m_now ());", SCANNER_TYPE_OPENVAS);
-
-  /* Tasks with no Scanner should use the default one. */
-  sql ("UPDATE tasks SET scanner ="
-       " (SELECT id FROM scanners WHERE uuid = '" SCANNER_UUID_DEFAULT "')"
-       " WHERE scanner = 0 OR scanner IS NULL;");
-
-  /* Set the database version to 129. */
-
-  set_db_version (129);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 129 to version 130.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_129_to_130 ()
-{
-  char *ca_pub, *key_pub, *key_priv;
-  char *quoted_ca_pub, *quoted_key_pub, *quoted_key_priv;
-  GError *error = NULL;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 129. */
-
-  if (manage_db_version () != 129)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add columns for per-scanner certificates. */
-
-  sql ("ALTER TABLE scanners ADD COLUMN ca_pub;");
-  sql ("ALTER TABLE scanners ADD COLUMN key_pub;");
-  sql ("ALTER TABLE scanners ADD COLUMN key_priv;");
-  sql ("ALTER TABLE scanners_trash ADD COLUMN ca_pub;");
-  sql ("ALTER TABLE scanners_trash ADD COLUMN key_pub;");
-  sql ("ALTER TABLE scanners_trash ADD COLUMN key_priv;");
-
-  /* Fetch default certificates content. */
-  if (!g_file_get_contents (CACERT, &ca_pub, NULL, &error))
-    {
-      g_warning ("%s: %s", __FUNCTION__, error->message);
-      g_error_free (error);
-      return -1;
-    }
-  if (!g_file_get_contents (CLIENTCERT, &key_pub, NULL, &error))
-    {
-      g_warning ("%s: %s", __FUNCTION__, error->message);
-      g_error_free (error);
-      g_free (ca_pub);
-      return -1;
-    }
-  if (!g_file_get_contents (CLIENTKEY, &key_priv, NULL, &error))
-    {
-      g_warning ("%s: %s", __FUNCTION__, error->message);
-      g_error_free (error);
-      g_free (ca_pub);
-      g_free (key_pub);
-      return -1;
-    }
-
-  /* Update current scanners to store default certificates in DB. */
-  quoted_ca_pub = sql_quote (ca_pub);
-  quoted_key_pub = sql_quote (key_pub);
-  quoted_key_priv = sql_quote (key_priv);
-  g_free (ca_pub);
-  g_free (key_pub);
-  g_free (key_priv);
-  sql ("UPDATE scanners SET ca_pub = '%s', key_pub = '%s', key_priv = '%s';",
-       quoted_ca_pub, quoted_key_pub, quoted_key_priv);
-  sql ("UPDATE scanners_trash SET ca_pub = '%s', key_pub = '%s',"
-       "       key_priv = '%s';",
-       quoted_ca_pub, quoted_key_pub, quoted_key_priv);
-  g_free (quoted_ca_pub);
-  g_free (quoted_key_pub);
-  g_free (quoted_key_priv);
-
-  /* Set the database version to 130. */
-  set_db_version (130);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 130 to version 131.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_130_to_131 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 130. */
-
-  if (manage_db_version () != 130)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Three commands were removed. */
-
-  sql ("DELETE FROM permissions"
-       " WHERE name = 'get_target_locators'"
-       " OR name = 'pause_task'"
-       " OR name = 'resume_paused_task';");
-
-  sql ("DELETE FROM permissions_trash"
-       " WHERE name = 'get_target_locators'"
-       " OR name = 'pause_task'"
-       " OR name = 'resume_paused_task';");
-
-  /* Set the database version to 131. */
-
-  set_db_version (131);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 131 to version 132.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_131_to_132 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 131. */
-
-  if (manage_db_version () != 131)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* rpm, deb and exe columns were removed from lsc_credentials and
-   * lsc_credentials_trash table. */
-
-  /* Move the tables away. */
-
-  sql ("ALTER TABLE lsc_credentials RENAME TO lsc_credentials_131;");
-  sql ("ALTER TABLE lsc_credentials_trash RENAME TO lsc_credentials_trash_131;");
-
-  /* Create the tables in the new format. */
-
-  if (sql_is_sqlite3 ())
-    {
-      sql ("CREATE TABLE IF NOT EXISTS lsc_credentials"
-           " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, login,"
-           "  password, comment, private_key TEXT,"
-           "  creation_time, modification_time);");
-      sql ("CREATE TABLE IF NOT EXISTS lsc_credentials_trash"
-           " (id INTEGER PRIMARY KEY, uuid UNIQUE, owner INTEGER, name, login,"
-           "  password, comment, private_key TEXT,"
-           "  creation_time, modification_time);");
-    }
-  else
-    {
-      sql ("CREATE TABLE IF NOT EXISTS lsc_credentials"
-           " (id SERIAL PRIMARY KEY,"
-           "  uuid text UNIQUE NOT NULL,"
-           "  owner integer REFERENCES users (id) ON DELETE RESTRICT,"
-           "  name text NOT NULL,"
-           "  login text,"
-           "  password text,"
-           "  comment text,"
-           "  private_key text,"
-           "  creation_time integer,"
-           "  modification_time integer);");
-
-      sql ("CREATE TABLE IF NOT EXISTS lsc_credentials_trash"
-           " (id SERIAL PRIMARY KEY,"
-           "  uuid text UNIQUE NOT NULL,"
-           "  owner integer REFERENCES users (id) ON DELETE RESTRICT,"
-           "  name text NOT NULL,"
-           "  login text,"
-           "  password text,"
-           "  comment text,"
-           "  private_key text,"
-           "  creation_time integer,"
-           "  modification_time integer);");
-    }
-
-  /* Copy the data into the new table. */
-
-  sql ("INSERT into lsc_credentials"
-       " (id, uuid, owner, name, comment, login, password, private_key,"
-       "  creation_time, modification_time)"
-       " SELECT"
-       "  id, uuid, owner, name, comment, login, password, private_key,"
-       "  creation_time, modification_time"
-       " FROM lsc_credentials_131;");
-  sql ("INSERT into lsc_credentials_trash"
-       " (id, uuid, owner, name, comment, login, password, private_key,"
-       "  creation_time, modification_time)"
-       " SELECT"
-       "  id, uuid, owner, name, comment, login, password, private_key,"
-       "  creation_time, modification_time"
-       " FROM lsc_credentials_trash_131;");
-
-  /* Drop the old tables. */
-
-  sql ("DROP TABLE lsc_credentials_131;");
-  sql ("DROP TABLE lsc_credentials_trash_131;");
-
-  /* Set the database version to 132. */
-
-  set_db_version (132);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 132 to version 133.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_132_to_133 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 132. */
-
-  if (manage_db_version () != 132)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add two new columns to results table. */
-  if (sql_is_sqlite3 ())
-    sql ("ALTER TABLE results ADD COLUMN owner INTEGER;");
-  else
-    sql ("ALTER TABLE results ADD COLUMN owner integer"
-        " REFERENCES users (id) ON DELETE RESTRICT;");
-
-  sql ("ALTER TABLE results ADD COLUMN date integer;");
-
-  /* Set values for added columns */
-  sql ("UPDATE results"
-       " SET owner = (SELECT owner FROM reports"
-       "              WHERE reports.id = results.report),"
-       "     date = (SELECT date FROM reports"
-       "             WHERE reports.id = results.report);");
-
-  /* Set the database version to 133. */
-
-  set_db_version (133);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 133 to version 134.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_133_to_134 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 133. */
-
-  if (manage_db_version () != 133)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add a new columns for ESXi credentials to targets & targets_trash table. */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE targets ADD COLUMN esxi_lsc_credential;");
-      sql ("ALTER TABLE targets_trash ADD COLUMN esxi_lsc_credential;");
-      sql ("ALTER TABLE targets_trash ADD COLUMN esxi_location INTEGER;");
-    }
-  else
-    {
-      sql ("ALTER TABLE targets ADD COLUMN esxi_lsc_credential integer;");
-           // REFERENCES lsc_credentials (id) ON DELETE RESTRICT
-      sql ("ALTER TABLE targets_trash ADD COLUMN esxi_lsc_credential integer;");
-           // REFERENCES lsc_credentials (id) ON DELETE RESTRICT
-      sql ("ALTER TABLE targets_trash ADD COLUMN esxi_location integer;");
-    }
-
-  /* Set the database version to 134. */
-
-  set_db_version (134);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 134 to version 135.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_134_to_135 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 134. */
-
-  if (manage_db_version () != 134)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The table report_results was removed. */
-
-  sql ("DROP TABLE report_results;");
-
-  /* Set the database version to 135. */
-
-  set_db_version (135);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 135 to version 136.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_135_to_136 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 135. */
-
-  if (manage_db_version () != 135)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* In the past the task end time was sometimes stored as a string instead
-   * of as an integer.  Update the end times from the reports, clearing the
-   * end time when the task has no reports. */
-
-  sql ("UPDATE tasks"
-       " SET end_time = (SELECT reports.end_time FROM reports"
-       "                 WHERE task = tasks.id ORDER BY id DESC LIMIT 1)"
-       " WHERE EXISTS (SELECT id FROM reports WHERE task = tasks.id);");
-
-  sql ("UPDATE tasks"
-       " SET end_time = NULL"
-       " WHERE NOT EXISTS (SELECT id FROM reports WHERE task = tasks.id);");
-
-  /* Set the database version to 136. */
-
-  set_db_version (136);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 136 to version 137.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_136_to_137 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 136. */
-
-  if (manage_db_version () != 136)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Commands like get_scanners have a permission check, delete the roles'
-   * permissions and they will be recreated (along with the new permissions) on
-   * start-up. */
-  sql ("DELETE FROM permissions"
-       " WHERE subject_type = 'role' AND subject IN"
-       "   (SELECT id FROM roles WHERE uuid = '" ROLE_UUID_USER "'"
-       "    OR uuid = '" ROLE_UUID_OBSERVER "');");
-
-  /* Set the database version to 137. */
-
-  set_db_version (137);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 137 to version 138.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_137_to_138 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 137. */
-
-  if (manage_db_version () != 137)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add get_aggregates permissions to all predefined roles except Monitor. */
-
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, subject_location,"
-       "  creation_time, modification_time)"
-       " VALUES"
-       " (make_uuid (), NULL, 'get_aggregates', '', '',"
-       "  0, '', " G_STRINGIFY (LOCATION_TABLE) ", 'role',"
-       "  (SELECT id FROM roles WHERE uuid = '%s'),"
-       "  " G_STRINGIFY (LOCATION_TABLE) ", m_now (), m_now ());",
-       ROLE_UUID_GUEST);
-
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, subject_location,"
-       "  creation_time, modification_time)"
-       " VALUES"
-       " (make_uuid (), NULL, 'get_aggregates', '', '',"
-       "  0, '', " G_STRINGIFY (LOCATION_TABLE) ", 'role',"
-       "  (SELECT id FROM roles WHERE uuid = '%s'),"
-       "  " G_STRINGIFY (LOCATION_TABLE) ", m_now (), m_now ());",
-       ROLE_UUID_INFO);
-
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, subject_location,"
-       "  creation_time, modification_time)"
-       " VALUES"
-       " (make_uuid (), NULL, 'get_aggregates', '', '',"
-       "  0, '', " G_STRINGIFY (LOCATION_TABLE) ", 'role',"
-       "  (SELECT id FROM roles WHERE uuid = '%s'),"
-       "  " G_STRINGIFY (LOCATION_TABLE) ", m_now (), m_now ());",
-       ROLE_UUID_OBSERVER);
-
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, subject_location,"
-       "  creation_time, modification_time)"
-       " VALUES"
-       " (make_uuid (), NULL, 'get_aggregates', '', '',"
-       "  0, '', " G_STRINGIFY (LOCATION_TABLE) ", 'role',"
-       "  (SELECT id FROM roles WHERE uuid = '%s'),"
-       "  " G_STRINGIFY (LOCATION_TABLE) ", m_now (), m_now ());",
-       ROLE_UUID_USER);
-
-  /* Set the database version to 138. */
-
-  set_db_version (138);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 138 to version 139.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_138_to_139 ()
-{
-  iterator_t nvts;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 138. */
-
-  if (manage_db_version () != 138)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  /* Add new solution_type column */
-  sql ("ALTER TABLE nvts ADD COLUMN solution_type text;");
-
-  init_iterator (&nvts, "SELECT id, tag FROM nvts;");
-
-  while (next (&nvts))
-    {
-      nvt_t nvt = iterator_int64 (&nvts, 0);
-      const gchar* tags = iterator_string (&nvts, 1);
-      gchar *solution_type = tag_value (tags, "solution_type");
-      gchar *quoted_solution_type = sql_quote (solution_type);
-
-      sql ("UPDATE nvts SET"
-           " solution_type = '%s'"
-           " WHERE id = %llu;",
-           quoted_solution_type,
-           nvt);
-
-      g_free (solution_type);
-      g_free (quoted_solution_type);
-    }
-
-  /* Set the database version to 139. */
-
-  set_db_version (139);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 139 to version 140.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_139_to_140 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 139. */
-
-  if (manage_db_version () != 139)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  sql ("UPDATE permissions SET"
-       " name = 'resume_task'"
-       " WHERE name = 'resume_stopped_task';");
-
-  sql ("UPDATE permissions_trash SET"
-       " name = 'resume_task'"
-       " WHERE name = 'resume_stopped_task';");
-
-  /* Set the database version to 140. */
-
-  set_db_version (140);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 140 to version 141.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_140_to_141 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 140. */
-
-  if (manage_db_version () != 140)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-  sql ("ALTER TABLE config_preferences ADD COLUMN default_value text;");
-  sql ("ALTER TABLE config_preferences_trash ADD COLUMN default_value text;");
-
-  /* Set the database version to 141. */
-
-  set_db_version (141);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 141 to version 142.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_141_to_142 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 141. */
-
-  if (manage_db_version () != 141)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* GMP command RESUME_OR_START_TASK was removed. */
-
-  sql ("DELETE FROM permissions WHERE name = 'resume_or_start_task';");
-
-  sql ("DELETE FROM permissions_trash WHERE name = 'resume_or_start_task';");
-
-  /* Set the database version to 142. */
-
-  set_db_version (142);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 142 to version 143.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_142_to_143 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 142. */
-
-  if (manage_db_version () != 142)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Set QoD of results to default value for various cases where
-   * no QoD was specified during the creation of the result. */
-
-  sql ("UPDATE results SET qod = " G_STRINGIFY (QOD_DEFAULT)
-       " WHERE (qod IS NULL) OR (qod <= 0);");
-
-  /* Set the database version to 143. */
-
-  set_db_version (143);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 143 to version 144.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_143_to_144 ()
-{
-  iterator_t nvts;
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 143. */
-
-  if (manage_db_version () != 143)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add new QoD columns */
-  sql ("ALTER TABLE nvts ADD COLUMN qod INTEGER;");
-  sql ("ALTER TABLE nvts ADD COLUMN qod_type TEXT;");
-  sql ("ALTER TABLE results ADD COLUMN qod_type TEXT;");
-
-  /* Set default values */
-  sql ("UPDATE nvts SET qod=%d, qod_type='';", QOD_DEFAULT);
-  sql ("UPDATE results SET qod_type='';");
-  /* Assign QoD values from NVT tags */
-  init_iterator (&nvts, "SELECT id, tag FROM nvts WHERE tag LIKE '%%|qod%%';");
-  while (next (&nvts))
-    {
-      gchar *qod_str, *qod_type, *quoted_qod_type;
-      int qod;
-
-      qod_str = tag_value (iterator_string (&nvts, 1), "qod");
-      qod_type = tag_value (iterator_string (&nvts, 1), "qod_type");
-      quoted_qod_type = sql_quote (qod_type);
-
-      if (qod_str == NULL || sscanf (qod_str, "%d", &qod) != 1)
-        qod = qod_from_type (qod_type);
-
-      sql ("UPDATE nvts SET qod=%d, qod_type='%s' WHERE id=%llu;",
-           qod, quoted_qod_type, iterator_int64 (&nvts, 0));
-
-      g_free (qod_str);
-      g_free (qod_type);
-      g_free (quoted_qod_type);
-    }
-  cleanup_iterator (&nvts);
-
-  /* Set the database version to 144. */
-
-  set_db_version (144);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 144 to version 145.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_144_to_145 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 144. */
-
-  if (manage_db_version () != 144)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Tasks got a new column schedule_periods. */
-  sql ("ALTER TABLE tasks ADD COLUMN schedule_periods INTEGER;");
-  sql ("UPDATE tasks SET schedule_periods=0;");
-
-  /* Set the database version to 145. */
-
-  set_db_version (145);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 145 to version 146.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_145_to_146 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 145. */
-
-  if (manage_db_version () != 145)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The view result_overrides changed. */
-  sql ("DROP VIEW IF EXISTS result_new_severities;");
-  sql ("DROP VIEW IF EXISTS result_overrides;");
-  sql ("DELETE FROM report_counts;");
-
-  /* Set the database version to 146. */
-
-  set_db_version (146);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 146 to version 147.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_146_to_147 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 146. */
-
-  if (manage_db_version () != 146)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report_counts table got a min_qod column. */
-  sql ("ALTER TABLE report_counts ADD COLUMN min_qod INTEGER;");
-  sql ("UPDATE report_counts SET min_qod = %d;", MIN_QOD_DEFAULT);
-
-  /* Set the database version to 147. */
-
-  set_db_version (147);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 147 to version 148.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_147_to_148 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 147. */
-
-  if (manage_db_version () != 147)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The "generate" scripts of all report formats must now be executable. */
-
-  check_generate_scripts ();
-
-  /* Set the database version to 148. */
-
-  set_db_version (148);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 148 to version 149.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_148_to_149 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 148. */
-
-  if (manage_db_version () != 148)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The tasks table got a scanner_location column. */
-  sql ("ALTER TABLE tasks ADD COLUMN scanner_location INTEGER;");
-  sql ("UPDATE tasks SET scanner_location = " G_STRINGIFY (LOCATION_TABLE));
-
-  /* Set the database version to 149. */
-
-  set_db_version (149);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 149 to version 150.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_149_to_150 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 149. */
-
-  if (manage_db_version () != 149)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The view result_new_severities changed. */
-  sql ("DROP VIEW IF EXISTS result_new_severities;");
-
-  /* Set the database version to 150. */
-
-  set_db_version (150);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Permission SQL for migrate_150_to_151.
- *
- * @param[in]  name  Name.
- * @param[in]  role  Role.
- */
-#define INSERT_PERMISSION(name, role)                                          \
-  sql ("INSERT INTO permissions"                                               \
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid," \
-       "  resource_location, subject_type, subject, subject_location,"         \
-       "  creation_time, modification_time)"                                   \
-       " VALUES"                                                               \
-       " (make_uuid (), NULL, '" G_STRINGIFY (name) "', '', '',"               \
-       "  0, '', " G_STRINGIFY (LOCATION_TABLE) ", 'role',"                    \
-       "  (SELECT id FROM roles WHERE uuid = '%s'),"                           \
-       "  " G_STRINGIFY (LOCATION_TABLE) ", m_now (), m_now ());",             \
-       role)
-
-/**
- * @brief Migrate the database from version 150 to version 151.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_150_to_151 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 150. */
-
-  if (manage_db_version () != 150)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Commands GET_ASSETS and DELETE_ASSET were added. */
-
-  INSERT_PERMISSION (get_assets, ROLE_UUID_ADMIN);
-  INSERT_PERMISSION (get_assets, ROLE_UUID_OBSERVER);
-  INSERT_PERMISSION (get_assets, ROLE_UUID_SUPER_ADMIN);
-  INSERT_PERMISSION (get_assets, ROLE_UUID_USER);
-
-  INSERT_PERMISSION (delete_asset, ROLE_UUID_ADMIN);
-  INSERT_PERMISSION (delete_asset, ROLE_UUID_SUPER_ADMIN);
-  INSERT_PERMISSION (delete_asset, ROLE_UUID_USER);
-
-  /* Set the database version to 151. */
-
-  set_db_version (151);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 151 to version 152.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_151_to_152 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 151. */
-
-  if (manage_db_version () != 151)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Command CREATE_ASSET was added. */
-
-  INSERT_PERMISSION (create_asset, ROLE_UUID_ADMIN);
-  INSERT_PERMISSION (create_asset, ROLE_UUID_SUPER_ADMIN);
-  INSERT_PERMISSION (create_asset, ROLE_UUID_USER);
-
-  /* Set the database version to 152. */
-
-  set_db_version (152);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Permission SQL for migrate_152_to_153.
- *
- * @param[in]  name  Name.
- * @param[in]  role  Role.
- */
-#define DELETE_PERMISSION(name, role)                                          \
-  sql ("DELETE FROM permissions"                                               \
-       " WHERE subject_type = 'role'"                                          \
-       " AND subject_location = " G_STRINGIFY (LOCATION_TABLE)                 \
-       " AND subject = (SELECT id FROM roles WHERE uuid = '%s')"               \
-       " AND name = '" G_STRINGIFY (name) "';",                                \
-       role)
-
-/**
- * @brief Migrate the database from version 152 to version 153.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_152_to_153 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 152. */
-
-  if (manage_db_version () != 152)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Command MODIFY_ASSET was added.  Also remove permissions added in previous
-   * two migrators on roles that have "Everything". */
-
-  INSERT_PERMISSION (modify_asset, ROLE_UUID_USER);
-
-  DELETE_PERMISSION (create_asset, ROLE_UUID_ADMIN);
-  DELETE_PERMISSION (create_asset, ROLE_UUID_SUPER_ADMIN);
-  DELETE_PERMISSION (get_assets, ROLE_UUID_ADMIN);
-  DELETE_PERMISSION (get_assets, ROLE_UUID_SUPER_ADMIN);
-  DELETE_PERMISSION (delete_asset, ROLE_UUID_ADMIN);
-  DELETE_PERMISSION (delete_asset, ROLE_UUID_SUPER_ADMIN);
-
-  /* Set the database version to 153. */
-
-  set_db_version (153);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 152 to version 153.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_153_to_154 ()
-{
-  const char *primary_key_type = sql_is_sqlite3 () ? "INTEGER" : "SERIAL";
-  iterator_t credentials;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 153. */
-
-  if (manage_db_version () != 153)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Create new credentials tables */
-  sql ("CREATE TABLE credentials"
-       " (id %s PRIMARY KEY,"
-       "  uuid text UNIQUE NOT NULL,"
-       "  owner integer%s,"
-       "  name text NOT NULL,"
-       "  comment text,"
-       "  creation_time integer,"
-       "  modification_time integer,"
-       "  type text);",
-       primary_key_type,
-       sql_is_sqlite3() ? "" : " REFERENCES users (id) ON DELETE RESTRICT");
-
-  sql ("CREATE TABLE credentials_trash"
-       " (id %s PRIMARY KEY,"
-       "  uuid text UNIQUE NOT NULL,"
-       "  owner integer%s,"
-       "  name text NOT NULL,"
-       "  comment text,"
-       "  creation_time integer,"
-       "  modification_time integer,"
-       "  type text);",
-       primary_key_type,
-       sql_is_sqlite3() ? "" : " REFERENCES users (id) ON DELETE RESTRICT");
-
-  sql ("CREATE TABLE credentials_data"
-       " (id %s PRIMARY KEY,"
-       "  credential INTEGER%s,"
-       "  type TEXT,"
-       "  value TEXT);",
-       primary_key_type,
-       sql_is_sqlite3()
-        ? ""
-        : " REFERENCES credentials (id) ON DELETE RESTRICT");
-
-  sql ("CREATE TABLE credentials_trash_data"
-       " (id %s PRIMARY KEY,"
-       "  credential INTEGER%s,"
-       "  type TEXT,"
-       "  value TEXT);",
-       primary_key_type,
-       sql_is_sqlite3()
-        ? ""
-        : " REFERENCES credentials_trash (id) ON DELETE RESTRICT");
-
-  /* Copy basic data from old tables */
-  sql ("INSERT INTO credentials"
-       " (id, uuid, owner, name, comment, creation_time, modification_time)"
-       " SELECT"
-       "   id, uuid, owner, name, comment, creation_time, modification_time"
-       " FROM lsc_credentials;");
-
-  sql ("INSERT INTO credentials_trash"
-       " (id, uuid, owner, name, comment, creation_time, modification_time)"
-       " SELECT"
-       "   id, uuid, owner, name, comment, creation_time, modification_time"
-       " FROM lsc_credentials_trash;");
-
-  /* Copy credentials data */
-  sql ("INSERT INTO credentials_data (credential, type, value)"
-       " SELECT id, 'username', login FROM lsc_credentials"
-       "  WHERE login IS NOT NULL;");
-
-  sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-       " SELECT id, 'username', login FROM lsc_credentials_trash"
-       "  WHERE login IS NOT NULL;");
-
-  sql ("INSERT INTO credentials_data (credential, type, value)"
-       " SELECT id, 'password', password FROM lsc_credentials"
-       "  WHERE password IS NOT NULL AND private_key != ';;encrypted;;';");
-
-  sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-       " SELECT id, 'password', password FROM lsc_credentials_trash"
-       "  WHERE password IS NOT NULL AND private_key != ';;encrypted;;';");
-
-  sql ("INSERT INTO credentials_data (credential, type, value)"
-       " SELECT id, 'private_key', private_key FROM lsc_credentials"
-       "  WHERE password IS NOT NULL AND private_key != ';;encrypted;;';");
-
-  sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-       " SELECT id, 'private_key', private_key FROM lsc_credentials_trash"
-       "  WHERE password IS NOT NULL AND private_key != ';;encrypted;;';");
-
-  sql ("INSERT INTO credentials_data (credential, type, value)"
-       " SELECT id, 'secret', password FROM lsc_credentials"
-       "  WHERE password IS NOT NULL AND private_key = ';;encrypted;;';");
-
-  sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-       " SELECT id, 'secret', password FROM lsc_credentials_trash"
-       "  WHERE password IS NOT NULL AND private_key = ';;encrypted;;';");
-
-  /* For Postgres, reset sequences because we messed with SERIAL column "id". */
-
-  if (sql_is_sqlite3 () == 0)
-    {
-      sql ("SELECT setval ('credentials_id_seq',"
-           "               (SELECT max (id) + 1 FROM credentials));");
-
-      sql ("SELECT setval ('credentials_trash_id_seq',"
-           "               (SELECT max (id) + 1 FROM credentials_trash));");
-
-      sql ("SELECT setval ('credentials_data_id_seq',"
-           "               (SELECT max (id) + 1 FROM credentials_data));");
-
-      sql ("SELECT setval ('credentials_trash_data_id_seq',"
-           "               (SELECT max (id) + 1"
-           "                FROM credentials_trash_data));");
-    }
-
-  /* Set type for existing credentials */
-  init_iterator (&credentials,
-                 "SELECT id, password, private_key, 0"
-                 " FROM lsc_credentials"
-                 " UNION ALL"
-                 " SELECT id, password, private_key, 1"
-                 " FROM lsc_credentials_trash;");
-
-  while (next (&credentials))
-    {
-      credential_t credential;
-      int is_trash;
-      const char *password, *privkey;
-      const char *type;
-
-      credential = iterator_int64 (&credentials, 0);
-      password = iterator_string (&credentials, 1);
-      privkey = iterator_string (&credentials, 2);
-      is_trash = iterator_int (&credentials, 3);
-
-      if (privkey == NULL)
-        type = "up";
-      else if (strcmp (privkey, ";;encrypted;;"))
-        type = "usk";
-      else
-        {
-          if (!credentials.crypt_ctx)
-            credentials.crypt_ctx = lsc_crypt_new ();
-
-          if (lsc_crypt_get_private_key (credentials.crypt_ctx, password))
-            type = "usk";
-          else
-            type = "up";
-        }
-
-      sql ("UPDATE %s SET type = '%s' WHERE id = %llu;",
-           is_trash ? "credentials_trash" : "credentials",
-           type, credential);
-    }
-  cleanup_iterator (&credentials);
-
-  /* Remove the old tables */
-  sql ("DROP TABLE lsc_credentials;");
-  sql ("DROP TABLE lsc_credentials_trash;");
-
-  /* Update Tags */
-  sql ("UPDATE tags SET resource_type = 'credential'"
-       " WHERE resource_type = 'lsc_credential';");
-  sql ("UPDATE tags_trash SET resource_type = 'credential'"
-       " WHERE resource_type = 'lsc_credential';");
-
-  /* Update permissions */
-  sql ("UPDATE permissions SET name = 'create_credential'"
-       " WHERE name = 'create_lsc_credential';");
-  sql ("UPDATE permissions SET name = 'delete_credential'"
-       " WHERE name = 'delete_lsc_credential';");
-  sql ("UPDATE permissions SET name = 'get_credentials'"
-       " WHERE name = 'get_lsc_credentials';");
-  sql ("UPDATE permissions SET name = 'modify_credential'"
-       " WHERE name = 'modify_lsc_credential';");
-
-  /* This should have also done the renaming in column resource_type.  Done
-   * in migrate_185_to_186. */
-
-  sql ("UPDATE permissions_trash SET name = 'create_credential'"
-       " WHERE name = 'create_lsc_credential';");
-  sql ("UPDATE permissions_trash SET name = 'delete_credential'"
-       " WHERE name = 'delete_lsc_credential';");
-  sql ("UPDATE permissions_trash SET name = 'get_credentials'"
-       " WHERE name = 'get_lsc_credentials';");
-  sql ("UPDATE permissions_trash SET name = 'modify_credential'"
-       " WHERE name = 'modify_lsc_credential';");
-
-  /* Set the database version to 154. */
-
-  set_db_version (154);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 154 to version 155.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_154_to_155 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 154. */
-
-  if (manage_db_version () != 154)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* r23581 added ALERT_METHOD_START_TASK in the middle of alert_method_t,
-   * instead of at the end.  Adjust alerts accordingly.  r23581 was released
-   * first with 6.1+beta2 which had db version 155, so it's safe to do this
-   * adjustment to any database that is older than 155. */
-  sql ("UPDATE alerts SET method = method + 1 WHERE method >= 4;");
-
-  /* Reports got a new column "flags". */
-  sql ("ALTER TABLE reports ADD COLUMN flags INTEGER;");
-  sql ("UPDATE reports SET flags = 0;");
-
-  /* Set the database version to 155. */
-
-  set_db_version (155);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 155 to version 156.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_155_to_156 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 155. */
-
-  if (manage_db_version () != 155)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  if (sql_is_sqlite3 ())
-    {
-      /* Remove and rename columns by copying tables in SQLite */
-      /* Rename old targets tables. */
-      sql ("ALTER TABLE targets RENAME TO targets_155;");
-      sql ("ALTER TABLE targets_trash RENAME TO targets_trash_155;");
-
-      /* Create new targets tables */
-      sql ("CREATE TABLE IF NOT EXISTS targets"
-           " (id INTEGER PRIMARY KEY,"
-           "  uuid text UNIQUE NOT NULL,"
-           "  owner integer,"
-           "  name text NOT NULL,"
-           "  hosts text,"
-           "  exclude_hosts text,"
-           "  reverse_lookup_only integer,"
-           "  reverse_lookup_unify integer,"
-           "  comment text,"
-           "  port_list integer,"
-           "  alive_test integer,"
-           "  creation_time integer,"
-           "  modification_time integer);");
-
-      sql ("CREATE TABLE IF NOT EXISTS targets_trash"
-           " (id INTEGER PRIMARY KEY,"
-           "  uuid text UNIQUE NOT NULL,"
-           "  owner integer,"
-           "  name text NOT NULL,"
-           "  hosts text,"
-           "  exclude_hosts text,"
-           "  reverse_lookup_only integer,"
-           "  reverse_lookup_unify integer,"
-           "  comment text,"
-           "  port_list integer,"
-           "  port_list_location integer,"
-           "  alive_test integer,"
-           "  creation_time integer,"
-           "  modification_time integer);");
-
-      sql ("CREATE TABLE IF NOT EXISTS targets_login_data"
-           " (id INTEGER PRIMARY KEY,"
-           "  target INTEGER,"
-           "  type TEXT,"
-           "  credential INTEGER,"
-           "  port INTEGER);");
-
-      sql ("CREATE TABLE IF NOT EXISTS targets_trash_login_data"
-           " (id INTEGER PRIMARY KEY,"
-           "  target INTEGER,"
-           "  type TEXT,"
-           "  credential INTEGER,"
-           "  port INTEGER,"
-           "  credential_location INTEGER);");
-
-      /* Copy existing basic data */
-      sql ("INSERT INTO targets"
-          " (id, uuid, owner, name, hosts, exclude_hosts,"
-          "  reverse_lookup_only, reverse_lookup_unify, comment,"
-          "  port_list, alive_test, creation_time, modification_time)"
-          " SELECT id, uuid, owner, name, hosts, exclude_hosts,"
-          "  reverse_lookup_only, reverse_lookup_unify, comment,"
-          "  port_range, alive_test, creation_time, modification_time"
-          " FROM targets_155;");
-
-      sql ("INSERT INTO targets_trash"
-          " (id, uuid, owner, name, hosts, exclude_hosts,"
-          "  reverse_lookup_only, reverse_lookup_unify, comment,"
-          "  port_list, alive_test, creation_time, modification_time)"
-          " SELECT id, uuid, owner, name, hosts, exclude_hosts,"
-          "  reverse_lookup_only, reverse_lookup_unify, comment,"
-          "  port_range, alive_test, creation_time, modification_time"
-          " FROM targets_trash_155;");
-
-      /* Copy existing credentials data */
-      sql ("INSERT INTO targets_login_data"
-          " (target, type, credential, port)"
-          " SELECT id, 'ssh', lsc_credential, CAST (ssh_port AS integer)"
-          " FROM targets_155 WHERE lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_login_data"
-          " (target, type, credential, port)"
-          " SELECT id, 'smb', smb_lsc_credential, 0"
-          " FROM targets_155 WHERE smb_lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_login_data"
-          " (target, type, credential, port)"
-          " SELECT id, 'esxi', esxi_lsc_credential, 0"
-          " FROM targets_155 WHERE esxi_lsc_credential != 0;");
-
-      /* Copy existing trash credentials data */
-      sql ("INSERT INTO targets_trash_login_data"
-          " (target, type, credential, port, credential_location)"
-          " SELECT id, 'ssh', lsc_credential, CAST (ssh_port AS integer),"
-          "        ssh_location"
-          " FROM targets_trash_155 WHERE lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_trash_login_data"
-          " (target, type, credential, port, credential_location)"
-          " SELECT id, 'smb', smb_lsc_credential, 0, smb_location"
-          " FROM targets_trash_155 WHERE smb_lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_trash_login_data"
-          " (target, type, credential, port, credential_location)"
-          " SELECT id, 'esxi', esxi_lsc_credential, 0, esxi_location"
-          " FROM targets_trash_155 WHERE esxi_lsc_credential != 0;");
-
-      /* Remove old tables */
-      sql ("DROP TABLE targets_155;");
-      sql ("DROP TABLE targets_trash_155;");
-    }
-  else
-    {
-      /* Use ALTER TABLE to remove and rename columns in Postgres */
-      /* Create login data tables */
-      sql ("CREATE TABLE IF NOT EXISTS targets_login_data"
-           " (id SERIAL PRIMARY KEY,"
-           "  target INTEGER REFERENCES targets (id),"
-           "  type TEXT,"
-           "  credential INTEGER REFERENCES credentials (id),"
-           "  port INTEGER);");
-
-      sql ("CREATE TABLE IF NOT EXISTS targets_trash_login_data"
-           " (id SERIAL PRIMARY KEY,"
-           "  target INTEGER REFERENCES targets_trash (id),"
-           "  type TEXT,"
-           "  credential INTEGER,"
-           "  port INTEGER,"
-           "  credential_location INTEGER);");
-
-      /* Copy existing credentials data */
-      sql ("INSERT INTO targets_login_data"
-           " (target, type, credential, port)"
-           " SELECT id, 'ssh', lsc_credential, CAST (ssh_port AS integer)"
-           " FROM targets WHERE lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_login_data"
-           " (target, type, credential, port)"
-           " SELECT id, 'smb', smb_lsc_credential, 0"
-           " FROM targets WHERE smb_lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_login_data"
-           " (target, type, credential, port)"
-           " SELECT id, 'esxi', esxi_lsc_credential, 0"
-           " FROM targets WHERE esxi_lsc_credential != 0;");
-
-      /* Copy existing trash credentials data */
-      sql ("INSERT INTO targets_trash_login_data"
-           " (target, type, credential, port, credential_location)"
-           " SELECT id, 'ssh', lsc_credential, CAST (ssh_port AS integer),"
-           "        ssh_location"
-           " FROM targets_trash WHERE lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_trash_login_data"
-           " (target, type, credential, port, credential_location)"
-           " SELECT id, 'smb', smb_lsc_credential, 0, smb_location"
-           " FROM targets_trash WHERE smb_lsc_credential != 0;");
-
-      sql ("INSERT INTO targets_trash_login_data"
-           " (target, type, credential, port, credential_location)"
-           " SELECT id, 'esxi', esxi_lsc_credential, 0, esxi_location"
-           " FROM targets_trash WHERE esxi_lsc_credential != 0;");
-
-      /* Drop and remove now unused columns */
-      sql ("ALTER TABLE targets DROP COLUMN lsc_credential;");
-      sql ("ALTER TABLE targets DROP COLUMN ssh_port;");
-      sql ("ALTER TABLE targets DROP COLUMN smb_lsc_credential;");
-      sql ("ALTER TABLE targets DROP COLUMN esxi_lsc_credential;");
-      sql ("ALTER TABLE targets RENAME COLUMN port_range TO port_list;");
-
-      sql ("ALTER TABLE targets_trash DROP COLUMN lsc_credential;");
-      sql ("ALTER TABLE targets_trash DROP COLUMN ssh_location;");
-      sql ("ALTER TABLE targets_trash DROP COLUMN ssh_port;");
-      sql ("ALTER TABLE targets_trash DROP COLUMN smb_lsc_credential;");
-      sql ("ALTER TABLE targets_trash DROP COLUMN smb_location;");
-      sql ("ALTER TABLE targets_trash DROP COLUMN esxi_lsc_credential;");
-      sql ("ALTER TABLE targets_trash DROP COLUMN esxi_location;");
-      sql ("ALTER TABLE targets_trash RENAME COLUMN port_range TO port_list;");
-    }
-
-  /* Set the database version to 156. */
-
-  set_db_version (156);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 156 to version 157.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_156_to_157 ()
-{
-  iterator_t slaves;
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 156. */
-
-  if (manage_db_version () != 156)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add new columns to slaves tables. */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE slaves ADD COLUMN credential INTEGER;");
-    }
-  else
-    {
-      sql ("ALTER TABLE slaves ADD COLUMN credential INTEGER"
-           " REFERENCES credentials (id) ON DELETE RESTRICT;");
-    }
-  sql ("ALTER TABLE slaves_trash ADD COLUMN credential INTEGER;");
-  sql ("ALTER TABLE slaves_trash ADD COLUMN credential_location INTEGER;");
-
-  /* Create new credentials. */
-  init_iterator (&slaves,
-                 "SELECT id, name, login, password, owner FROM slaves;");
-
-  while (next (&slaves))
-    {
-      resource_t slave;
-      const char *name, *login, *password;
-      user_t owner;
-      credential_t new_credential;
-      gchar *quoted_name, *quoted_login;
-
-      slave = iterator_int64 (&slaves, 0);
-      name = iterator_string (&slaves, 1);
-      login = iterator_string (&slaves, 2);
-      password = iterator_string (&slaves, 3);
-      owner = iterator_int64 (&slaves, 4);
-
-      quoted_name = sql_quote (name);
-      quoted_login = sql_quote (login);
-
-      if (sql_int ("SELECT count(*) FROM credentials"
-                   " WHERE name = 'Credential for Slave %s'"
-                   "   AND owner = %llu;",
-                   quoted_name, owner))
-        sql ("INSERT INTO credentials"
-             " (uuid, name, owner, comment, type,"
-             "  creation_time, modification_time)"
-             " VALUES"
-             " (make_uuid (),"
-             "  uniquify ('credential', 'Credential for Slave %s', %llu, ''),"
-             "  %llu, 'Autogenerated by migration', 'up',"
-             "  m_now (), m_now ());",
-             quoted_name, owner, owner);
-      else
-        sql ("INSERT INTO credentials"
-             " (uuid, name, owner, comment, type,"
-             "  creation_time, modification_time)"
-             " VALUES"
-             " (make_uuid (), 'Credential for Slave %s',"
-             "  %llu, 'Autogenerated by migration', 'up',"
-             "  m_now (), m_now ());",
-             quoted_name, owner);
-
-      new_credential = sql_last_insert_id ();
-
-      sql ("UPDATE slaves SET credential = %llu WHERE id = %llu;",
-           new_credential, slave);
-
-      sql ("INSERT INTO credentials_data (credential, type, value)"
-           " VALUES (%llu, 'username', '%s');",
-           new_credential, quoted_login);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_password;
-          quoted_password = sql_quote (password);
-          sql ("INSERT INTO credentials_data (credential, type, value)"
-               " VALUES (%llu, 'password', '%s');",
-               new_credential, quoted_password);
-          g_free (quoted_password);
-        }
-      else
-        {
-          char *secret;
-          gchar *quoted_secret;
-
-          if (!slaves.crypt_ctx)
-            slaves.crypt_ctx = lsc_crypt_new ();
-
-          secret = lsc_crypt_encrypt (slaves.crypt_ctx,
-                                      "password", password, NULL);
-          if (!secret)
-            {
-              g_free (quoted_name);
-              g_free (quoted_login);
-              cleanup_iterator (&slaves);
-              sql_rollback ();
-              return -1;
-            }
-          quoted_secret = sql_quote (secret);
-          sql ("INSERT INTO credentials_data (credential, type, value)"
-               " VALUES (%llu, 'secret', '%s');",
-              new_credential, quoted_secret);
-          g_free (quoted_secret);
-        }
-
-      sql ("INSERT INTO"
-           " permissions (uuid, owner, name,"
-           "              comment, resource_type, resource,"
-           "              resource_uuid,"
-           "              resource_location, subject_type, subject,"
-           "              subject_location, creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Slave migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TABLE) ", subject_type, subject,"
-           "         subject_location, m_now (), m_now ()"
-           " FROM permissions"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'slave'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TABLE)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, slave);
-
-      sql ("INSERT INTO"
-           " permissions_trash (uuid, owner, name,"
-           "                    comment, resource_type, resource,"
-           "                    resource_uuid,"
-           "                    resource_location, subject_type, subject,"
-           "                    subject_location,"
-           "                    creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Slave migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TABLE) ", subject_type, subject,"
-           "         subject_location, m_now (), m_now ()"
-           " FROM permissions_trash"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'slave'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TABLE)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, slave);
-
-      g_free (quoted_name);
-      g_free (quoted_login);
-    }
-  cleanup_iterator (&slaves);
-
-  /* Create new credentials for trashcan. */
-  init_iterator (&slaves,
-                 "SELECT id, name, login, password, owner"
-                 " FROM slaves_trash;");
-
-  while (next (&slaves))
-    {
-      resource_t slave;
-      const char *name, *login, *password;
-      user_t owner;
-      credential_t new_credential;
-      gchar *quoted_name, *quoted_login;
-
-      slave = iterator_int64 (&slaves, 0);
-      name = iterator_string (&slaves, 1);
-      login = iterator_string (&slaves, 2);
-      password = iterator_string (&slaves, 3);
-      owner = iterator_int64 (&slaves, 4);
-
-      quoted_name = sql_quote (name);
-      quoted_login = sql_quote (login);
-
-      sql ("INSERT INTO credentials_trash"
-           " (uuid, name, owner, comment, type,"
-           "  creation_time, modification_time)"
-           " VALUES"
-           " (make_uuid (), 'Credential for Slave %s',"
-           "  %llu, 'Autogenerated by migration', 'up',"
-           "  m_now (), m_now ());",
-           quoted_name, owner);
-
-      new_credential = sql_last_insert_id ();
-
-      sql ("UPDATE slaves_trash SET credential = %llu,"
-           " credential_location = " G_STRINGIFY (LOCATION_TRASH)
-           " WHERE id = %llu;",
-           new_credential, slave);
-
-      sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-           " VALUES (%llu, 'username', '%s');",
-           new_credential, quoted_login);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_password;
-          quoted_password = sql_quote (password);
-          sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-               " VALUES (%llu, 'password', '%s');",
-               new_credential, quoted_password);
-          g_free (quoted_password);
-        }
-      else
-        {
-          char *secret;
-          gchar *quoted_secret;
-
-          if (!slaves.crypt_ctx)
-            slaves.crypt_ctx = lsc_crypt_new ();
-
-          secret = lsc_crypt_encrypt (slaves.crypt_ctx,
-                                      "password", password, NULL);
-          if (!secret)
-            {
-              g_free (quoted_name);
-              g_free (quoted_login);
-              cleanup_iterator (&slaves);
-              sql_rollback ();
-              return -1;
-            }
-          quoted_secret = sql_quote (secret);
-          sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-               " VALUES (%llu, 'secret', '%s');",
-               new_credential, quoted_secret);
-          g_free (quoted_secret);
-        }
-
-      sql ("INSERT INTO"
-           " permissions (uuid, owner, name,"
-           "              comment, resource_type, resource,"
-           "              resource_uuid,"
-           "              resource_location, subject_type, subject,"
-           "              subject_location,"
-           "              creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Slave migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials_trash WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TRASH) ", subject_type, subject,"
-           "         subject_location,"
-           "         m_now (), m_now ()"
-           " FROM permissions"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'slave'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TRASH)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, slave);
-
-      sql ("INSERT INTO"
-           " permissions_trash (uuid, owner, name,"
-           "                    comment, resource_type, resource,"
-           "                    resource_uuid,"
-           "                    resource_location, subject_type, subject,"
-           "                    subject_location,"
-           "                    creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Slave migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials_trash WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TRASH) ", subject_type, subject,"
-           "         subject_location,"
-           "         m_now (), m_now ()"
-           " FROM permissions_trash"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'slave'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TRASH)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, slave);
-
-      g_free (quoted_name);
-      g_free (quoted_login);
-    }
-  cleanup_iterator (&slaves);
-
-  /* Remove unused columns */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE slaves RENAME TO slaves_156;");
-      sql ("ALTER TABLE slaves_trash RENAME TO slaves_trash_156;");
-
-      sql ("CREATE TABLE IF NOT EXISTS slaves"
-           " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment, host,"
-           "  port, creation_time, modification_time, credential INTEGER);");
-      sql ("CREATE TABLE IF NOT EXISTS slaves_trash"
-           " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment, host,"
-           "  port, creation_time, modification_time, credential INTEGER,"
-           "  credential_location INTEGER);");
-
-      sql ("INSERT INTO slaves"
-           " (id, uuid, owner, name, comment, host, port,"
-           "  creation_time, modification_time, credential)"
-           " SELECT id, uuid, owner, name, comment, host, port,"
-           "  creation_time, modification_time, credential"
-           " FROM slaves_156;");
-      sql ("INSERT INTO slaves_trash"
-           " (id, uuid, owner, name, comment, host, port,"
-           "  creation_time, modification_time, credential,"
-           "  credential_location)"
-           " SELECT id, uuid, owner, name, comment, host, port,"
-           "  creation_time, modification_time, credential,"
-           "  credential_location"
-           " FROM slaves_trash_156;");
-
-      sql ("DROP TABLE slaves_156;");
-      sql ("DROP TABLE slaves_trash_156;");
-    }
-  else
-    {
-      sql ("ALTER TABLE slaves DROP COLUMN login;");
-      sql ("ALTER TABLE slaves DROP COLUMN password;");
-      sql ("ALTER TABLE slaves_trash DROP COLUMN login;");
-      sql ("ALTER TABLE slaves_trash DROP COLUMN password;");
-    }
-
-  /* Set the database version to 157. */
-
-  set_db_version (157);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 157 to version 158.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_157_to_158 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 157. */
-
-  if (manage_db_version () != 157)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add new column to configs tables. */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE configs ADD COLUMN scanner INTEGER;");
-      sql ("ALTER TABLE configs_trash ADD COLUMN scanner INTEGER;");
-    }
-  else
-    {
-      sql ("ALTER TABLE configs ADD COLUMN scanner INTEGER"
-           " REFERENCES scanners (id) ON DELETE RESTRICT;");
-      sql ("ALTER TABLE configs_trash ADD COLUMN scanner INTEGER"
-           " REFERENCES scanners (id) ON DELETE RESTRICT;");
-    }
-
-  /* Add first OSP scanner in scanners table, as scanner of OSP configs. */
-  sql ("UPDATE configs"
-       " SET scanner = (SELECT id FROM scanners WHERE type = %d LIMIT 1)"
-       " WHERE type = 1;", SCANNER_TYPE_OSP);
-
-  /* Set the database version to 158. */
-
-  set_db_version (158);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 158 to version 159.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_158_to_159 ()
-{
-  iterator_t scanners;
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 158. */
-
-  if (manage_db_version () != 158)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add new columns to scanners tables. */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE scanners ADD COLUMN credential INTEGER;");
-    }
-  else
-    {
-      sql ("ALTER TABLE scanners ADD COLUMN credential INTEGER"
-           " REFERENCES credentials (id) ON DELETE RESTRICT;");
-    }
-  sql ("ALTER TABLE scanners_trash ADD COLUMN credential INTEGER;");
-  sql ("ALTER TABLE scanners_trash ADD COLUMN credential_location INTEGER;");
-
-  /* Create new credentials */
-  init_iterator (&scanners,
-                 "SELECT id, name, key_pub, key_priv, owner FROM scanners;");
-
-  while (next (&scanners))
-    {
-      scanner_t scanner;
-      const char *name, *key_pub, *key_priv;
-      user_t owner;
-      credential_t new_credential;
-      gchar *quoted_name, *quoted_key_pub;
-
-      scanner = iterator_int64 (&scanners, 0);
-      name = iterator_string (&scanners, 1);
-      key_pub = iterator_string (&scanners, 2);
-      key_priv = iterator_string (&scanners, 3);
-      owner = iterator_int64 (&scanners, 4);
-
-      // Skip if scanner has no key (internal CVE scanner)
-      if (key_pub == NULL || key_priv == NULL)
-        continue;
-
-      quoted_name = sql_quote (name);
-      quoted_key_pub = sql_quote (key_pub);
-
-      if (owner)
-        {
-          if (sql_int ("SELECT count(*) FROM credentials"
-                      " WHERE name = 'Credential for Scanner %s'"
-                      "   AND owner = %llu;",
-                      quoted_name, owner))
-            sql ("INSERT INTO credentials"
-                 " (uuid, name, owner, comment, type,"
-                 "  creation_time, modification_time)"
-                 " VALUES"
-                 " (make_uuid (),"
-                 "  uniquify ('credential',"
-                 "            'Credential for Scanner %s', %llu, ''),"
-                 "  %llu, 'Autogenerated by migration', 'cc',"
-                 "  m_now (), m_now ());",
-                 quoted_name, owner, owner);
-          else
-            sql ("INSERT INTO credentials"
-                 " (uuid, name, owner, comment, type,"
-                 "  creation_time, modification_time)"
-                 " VALUES"
-                 " (make_uuid (), 'Credential for Scanner %s',"
-                 "  %llu, 'Autogenerated by migration', 'cc',"
-                 "  m_now (), m_now ());",
-                 quoted_name, owner);
-        }
-      else
-        {
-          if (sql_int ("SELECT count(*) FROM credentials"
-                      " WHERE name = 'Credential for Scanner %s'"
-                      "   AND owner = NULL;",
-                      quoted_name, owner))
-            sql ("INSERT INTO credentials"
-                 " (uuid, name, owner, comment, type,"
-                 "  creation_time, modification_time)"
-                 " VALUES"
-                 " (make_uuid (),"
-                 "  uniquify ('credential',"
-                 "            'Credential for Scanner %s', NULL, ''),"
-                 "  NULL, 'Autogenerated by migration', 'cc',"
-                 "  m_now (), m_now ());",
-                 quoted_name);
-          else
-            sql ("INSERT INTO credentials"
-                 " (uuid, name, owner, comment, type,"
-                 "  creation_time, modification_time)"
-                 " VALUES"
-                 " (make_uuid (), 'Credential for Scanner %s',"
-                 "  NULL, 'Autogenerated by migration', 'cc',"
-                 "  m_now (), m_now ());",
-                 quoted_name);
-        }
-
-      new_credential = sql_last_insert_id ();
-
-      sql ("UPDATE scanners SET credential = %llu WHERE id = %llu;",
-           new_credential, scanner);
-
-      sql ("INSERT INTO credentials_data (credential, type, value)"
-           " VALUES (%llu, 'certificate', '%s');",
-           new_credential, quoted_key_pub);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_key_priv;
-          quoted_key_priv = sql_quote (key_priv);
-          sql ("INSERT INTO credentials_data (credential, type, value)"
-               " VALUES (%llu, 'private_key', '%s');",
-               new_credential, quoted_key_priv);
-          g_free (quoted_key_priv);
-        }
-      else
-        {
-          char *secret;
-          gchar *quoted_secret;
-
-          if (!scanners.crypt_ctx)
-            scanners.crypt_ctx = lsc_crypt_new ();
-
-          secret = lsc_crypt_encrypt (scanners.crypt_ctx,
-                                      "private_key", key_priv, NULL);
-          if (!secret)
-            {
-              g_free (quoted_name);
-              g_free (quoted_key_pub);
-              cleanup_iterator (&scanners);
-              sql_rollback ();
-              return -1;
-            }
-          quoted_secret = sql_quote (secret);
-          sql ("INSERT INTO credentials_data (credential, type, value)"
-               " VALUES (%llu, 'secret', '%s');",
-              new_credential, quoted_secret);
-          g_free (quoted_secret);
-        }
-
-      sql ("INSERT INTO"
-           " permissions (uuid, owner, name,"
-           "              comment, resource_type, resource,"
-           "              resource_uuid,"
-           "              resource_location, subject_type, subject,"
-           "              subject_location, creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Scanner migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TABLE) ", subject_type, subject,"
-           "         subject_location, m_now (), m_now ()"
-           " FROM permissions"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'scanner'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TABLE)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, scanner);
-
-      sql ("INSERT INTO"
-           " permissions_trash (uuid, owner, name,"
-           "                    comment, resource_type, resource,"
-           "                    resource_uuid,"
-           "                    resource_location, subject_type, subject,"
-           "                    subject_location,"
-           "                    creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Scanner migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TABLE) ", subject_type, subject,"
-           "         subject_location, m_now (), m_now ()"
-           " FROM permissions_trash"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'scanner'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TABLE)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, scanner);
-
-      g_free (quoted_name);
-      g_free (quoted_key_pub);
-    }
-  cleanup_iterator (&scanners);
-
-  /* Create new credentials for trashcan. */
-  init_iterator (&scanners,
-                 "SELECT id, name, key_pub, key_priv, owner"
-                 " FROM scanners_trash;");
-
-  while (next (&scanners))
-    {
-      scanner_t scanner;
-      const char *name, *key_pub, *key_priv;
-      user_t owner;
-      credential_t new_credential;
-      gchar *quoted_name, *quoted_key_pub;
-
-      scanner = iterator_int64 (&scanners, 0);
-      name = iterator_string (&scanners, 1);
-      key_pub = iterator_string (&scanners, 2);
-      key_priv = iterator_string (&scanners, 3);
-      owner = iterator_int64 (&scanners, 4);
-
-      /* Skip if scanner has no key (internal CVE scanner). */
-      if (key_pub == NULL || key_priv == NULL)
-        continue;
-
-      quoted_name = sql_quote (name);
-      quoted_key_pub = sql_quote (key_pub);
-
-      if (owner)
-        sql ("INSERT INTO credentials_trash"
-             " (uuid, name, owner, comment, type,"
-             "  creation_time, modification_time)"
-             " VALUES"
-             " (make_uuid (), 'Credential for Scanner %s',"
-             "  %llu, 'Autogenerated by migration', 'cc',"
-             "  m_now (), m_now ());",
-             quoted_name, owner);
-      else
-        sql ("INSERT INTO credentials_trash"
-             " (uuid, name, owner, comment, type,"
-             "  creation_time, modification_time)"
-             " VALUES"
-             " (make_uuid (), 'Credential for Scanner %s',"
-             "  NULL, 'Autogenerated by migration', 'cc',"
-             "  m_now (), m_now ());",
-             quoted_name);
-
-      new_credential = sql_last_insert_id ();
-
-      sql ("UPDATE scanners_trash SET credential = %llu,"
-           " credential_location = " G_STRINGIFY (LOCATION_TRASH)
-           " WHERE id = %llu;",
-           new_credential, scanner);
-
-      sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-           " VALUES (%llu, 'certificate', '%s');",
-           new_credential, quoted_key_pub);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_key_priv;
-          quoted_key_priv = sql_quote (key_priv);
-          sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-               " VALUES (%llu, 'private_key', '%s');",
-               new_credential, quoted_key_priv);
-          g_free (quoted_key_priv);
-        }
-      else
-        {
-          char *secret;
-          gchar *quoted_secret;
-
-          if (!scanners.crypt_ctx)
-            scanners.crypt_ctx = lsc_crypt_new ();
-
-          secret = lsc_crypt_encrypt (scanners.crypt_ctx,
-                                      "private_key", key_priv, NULL);
-          if (!secret)
-            {
-              g_free (quoted_name);
-              g_free (quoted_key_pub);
-              cleanup_iterator (&scanners);
-              sql_rollback ();
-              return -1;
-            }
-          quoted_secret = sql_quote (secret);
-          sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-               " VALUES (%llu, 'secret', '%s');",
-               new_credential, quoted_secret);
-          g_free (quoted_secret);
-        }
-
-      sql ("INSERT INTO"
-           " permissions (uuid, owner, name,"
-           "              comment, resource_type, resource,"
-           "              resource_uuid,"
-           "              resource_location, subject_type, subject,"
-           "              subject_location,"
-           "              creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Scanner migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials_trash WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TRASH) ", subject_type, subject,"
-           "         subject_location,"
-           "         m_now (), m_now ()"
-           " FROM permissions"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'scanner'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TRASH)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, scanner);
-
-      sql ("INSERT INTO"
-           " permissions_trash (uuid, owner, name,"
-           "                    comment, resource_type, resource,"
-           "                    resource_uuid,"
-           "                    resource_location, subject_type, subject,"
-           "                    subject_location,"
-           "                    creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Scanner migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials_trash WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TRASH) ", subject_type, subject,"
-           "         subject_location,"
-           "         m_now (), m_now ()"
-           " FROM permissions_trash"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'scanner'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TRASH)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, scanner);
-
-      g_free (quoted_name);
-      g_free (quoted_key_pub);
-    }
-  cleanup_iterator (&scanners);
-
-  /* Remove unused columns. */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE scanners RENAME TO scanners_158;");
-      sql ("ALTER TABLE scanners_trash RENAME TO scanners_trash_158;");
-
-      sql ("CREATE TABLE IF NOT EXISTS scanners"
-          " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment,"
-          "  host, port, type, ca_pub, credential INTEGER,"
-          "  creation_time, modification_time);");
-      sql ("CREATE TABLE IF NOT EXISTS scanners_trash"
-          " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, comment,"
-          "  host, port, type, ca_pub, credential INTEGER,"
-          "  credential_location INTEGER, creation_time, modification_time);");
-
-      sql ("INSERT INTO scanners"
-           " (id, uuid, owner, name, comment, host, port, type,"
-           "  ca_pub, credential, creation_time, modification_time)"
-           " SELECT id, uuid, owner, name, comment, host, port, type,"
-           "  ca_pub, credential, creation_time, modification_time"
-           " FROM scanners_158;");
-      sql ("INSERT INTO scanners_trash"
-           " (id, uuid, owner, name, comment, host, port, type,"
-           "  ca_pub, credential, credential_location, creation_time,"
-           "  modification_time)"
-           " SELECT id, uuid, owner, name, comment, host, port, type,"
-           "  ca_pub, credential, credential_location, creation_time,"
-           "  modification_time"
-           " FROM scanners_trash_158;");
-
-      sql ("DROP TABLE scanners_158;");
-      sql ("DROP TABLE scanners_trash_158;");
-    }
-  else
-    {
-      sql ("ALTER TABLE scanners DROP COLUMN key_pub;");
-      sql ("ALTER TABLE scanners DROP COLUMN key_priv;");
-      sql ("ALTER TABLE scanners_trash DROP COLUMN key_pub;");
-      sql ("ALTER TABLE scanners_trash DROP COLUMN key_priv;");
-    }
-
-  /* Set the database version to 159. */
-
-  set_db_version (159);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 159 to version 160.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_159_to_160 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 159. */
-
-  if (manage_db_version () != 159)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Report format "Verinice ISM" was missing a param. */
-
-  sql ("INSERT INTO report_format_params (report_format, name, type, value,"
-       " type_min, type_max, type_regex, fallback)"
-       " VALUES ((SELECT id FROM report_formats"
-       "          WHERE uuid = 'c15ad349-bd8d-457a-880a-c7056532ee15'),"
-       "         'Attach HTML report', %i, 1, 0, 1, '', 1);",
-       REPORT_FORMAT_PARAM_TYPE_BOOLEAN);
-
-  /* Set the database version to 160. */
-
-  set_db_version (160);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 160 to version 161.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_160_to_161 ()
-{
-  iterator_t iter;
-  iter.crypt_ctx = NULL;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 160. */
-
-  if (manage_db_version () != 160)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Create copies of SSH key credentials that are used in place of
-   * username + password ones. */
-  init_iterator (&iter,
-                 "SELECT 0, id, name, owner,"
-                 " (SELECT value FROM credentials_data"
-                 "  WHERE credential = credentials.id"
-                 "    AND type = 'secret'),"
-                 " (SELECT value FROM credentials_data"
-                 "  WHERE credential = credentials.id"
-                 "    AND type = 'password')"
-                 " FROM credentials"
-                 " WHERE type = 'usk'"
-                 "   AND (id IN (SELECT credential"
-                 "               FROM targets_login_data"
-                 "               WHERE type='smb' OR type='esxi')"
-                 "        OR id IN (SELECT credential"
-                 "                  FROM targets_trash_login_data"
-                 "                  WHERE (type='smb' OR type='esxi')"
-                 "                    AND credential_location"
-                 "                        = " G_STRINGIFY (LOCATION_TABLE) "))"
-                 " UNION ALL"
-                 " SELECT 1, id, name, owner,"
-                 " (SELECT value FROM credentials_trash_data"
-                 "  WHERE credential = credentials_trash.id"
-                 "    AND type = 'secret'),"
-                 " (SELECT value FROM credentials_trash_data"
-                 "  WHERE credential = credentials_trash.id"
-                 "    AND type = 'password')"
-                 " FROM credentials_trash"
-                 "  WHERE type = 'usk'"
-                 "    AND id IN (SELECT credential"
-                 "               FROM targets_trash_login_data"
-                 "               WHERE (type='smb' OR type='esxi')"
-                 "                 AND credential_location"
-                 "                     = " G_STRINGIFY (LOCATION_TRASH) ");");
-
-  while (next (&iter))
-    {
-      int trash;
-      credential_t credential, new_credential;
-      const char *name, *old_secret, *old_password;
-      gchar* quoted_name;
-      user_t owner;
-
-      trash = iterator_int (&iter, 0);
-      credential = iterator_int64 (&iter, 1);
-      name = iterator_string (&iter, 2);
-      quoted_name = sql_quote (name);
-      owner = iterator_int64 (&iter, 3);
-      old_secret = iterator_string (&iter, 4);
-
-      // Copy credential base
-      if (trash)
-        {
-          sql ("INSERT INTO credentials_trash"
-               " (uuid, name, owner, comment, type,"
-               "  creation_time, modification_time)"
-               " VALUES"
-               " (make_uuid (), '%s - user and password',"
-               "  %llu, 'Autogenerated by migration', 'up',"
-               "  m_now (), m_now ());",
-               quoted_name, owner);
-        }
-      else
-        {
-          if (sql_int ("SELECT count(*) FROM credentials"
-                      " WHERE name = '%s - user and password'"
-                      "   AND owner = %llu;",
-                      quoted_name, owner))
-            sql ("INSERT INTO credentials"
-                " (uuid, name, owner, comment, type,"
-                "  creation_time, modification_time)"
-                " VALUES"
-                " (make_uuid (),"
-                "  uniquify ('credential', '%s - user and password', %llu, ''),"
-                "  %llu, 'Autogenerated by migration', 'up',"
-                "  m_now (), m_now ());",
-                quoted_name, owner, owner);
-          else
-            sql ("INSERT INTO credentials"
-                " (uuid, name, owner, comment, type,"
-                "  creation_time, modification_time)"
-                " VALUES"
-                " (make_uuid (), '%s - user and password',"
-                "  %llu, 'Autogenerated by migration', 'up',"
-                "  m_now (), m_now ());",
-                quoted_name, owner);
-        }
-
-      new_credential = sql_last_insert_id ();
-
-      // Copy username
-      sql ("INSERT INTO %s (credential, type, value)"
-           " SELECT %llu, 'username', value FROM %s"
-           "  WHERE credential = %llu AND type = 'username'",
-           trash ? "credentials_trash_data" : "credentials_data",
-           new_credential,
-           trash ? "credentials_trash_data" : "credentials_data",
-           credential);
-
-      // Copy password
-      if (iter.crypt_ctx == NULL)
-        iter.crypt_ctx = lsc_crypt_new ();
-
-      if (old_secret)
-        old_password = lsc_crypt_get_password (iter.crypt_ctx, old_secret);
-      else
-        old_password = iterator_string (&iter, 5);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_password = sql_quote (old_password ? old_password : "");
-          sql ("INSERT INTO %s (credential, type, value)"
-               " VALUES (%llu, 'password', '%s');",
-               trash ? "credentials_trash_data" : "credentials_data",
-               new_credential,
-               quoted_password);
-          g_free (quoted_password);
-        }
-      else
-        {
-          lsc_crypt_ctx_t encrypt_ctx = lsc_crypt_new ();
-          gchar *new_secret = lsc_crypt_encrypt (encrypt_ctx,
-                                                 "password", old_password,
-                                                 NULL);
-          sql ("INSERT INTO %s (credential, type, value)"
-               " VALUES (%llu, 'password', '%s');",
-               trash ? "credentials_trash_data" : "credentials_data",
-               new_credential,
-               new_secret);
-          lsc_crypt_release (encrypt_ctx);
-          g_free (new_secret);
-        }
-
-      // Update targets
-      if (trash)
-        {
-          sql ("UPDATE targets_trash_login_data SET credential = %llu"
-               " WHERE credential = %llu"
-               " AND (type = 'smb' OR type = 'esxi')"
-               " AND credential_location = " G_STRINGIFY (LOCATION_TRASH) ";",
-               new_credential, credential);
-        }
-      else
-        {
-          sql ("UPDATE targets_login_data SET credential = %llu"
-               " WHERE credential = %llu"
-               "   AND (type = 'smb' OR type = 'esxi');",
-               new_credential, credential);
-          sql ("UPDATE targets_trash_login_data SET credential = %llu"
-               " WHERE credential = %llu"
-               " AND (type = 'smb' OR type = 'esxi')"
-               " AND credential_location = " G_STRINGIFY (LOCATION_TABLE) ";",
-               new_credential, credential);
-        }
-
-    }
-  cleanup_iterator(&iter);
-
-  /* Set the database version to 161. */
-
-  set_db_version (161);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 161 to version 162.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_161_to_162 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 161. */
-
-  if (manage_db_version () != 161)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Add allow_insecure column to credentials and credentials_trash */
-  sql ("ALTER TABLE credentials ADD COLUMN allow_insecure INTEGER;");
-  sql ("ALTER TABLE credentials_trash ADD COLUMN allow_insecure INTEGER;");
-
-  /* Set the value of the new column */
-  sql ("UPDATE credentials SET allow_insecure = 0;");
-  sql ("UPDATE credentials_trash SET allow_insecure = 0;");
-
-  /* Set the database version to 162. */
-
-  set_db_version (162);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Description for Verinice ISM report format.
- */
-#define MIGRATE_162_TO_163_CONTROL_DESCRIPTION                                  \
- "Dear IS Coordinator,\n"                                                       \
- "\n"                                                                           \
- "A new scan has been carried out and the results are now available in Verinice.\n"        \
- "If responsible persons are linked to the asset groups, the tasks are already created.\n" \
- "\n"                                                                           \
- "Please check the results in a timely manner.\n"                               \
- "\n"                                                                           \
- "Best regards\n"                                                               \
- "CIS"
-
-/**
- * @brief Migrate the database from version 158 to version 162.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_162_to_163 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 162. */
-
-  if (manage_db_version () != 162)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Report format "Verinice ISM" got a new param. */
-
-  sql ("INSERT INTO report_format_params (report_format, name, type, value,"
-       " type_min, type_max, type_regex, fallback)"
-       " VALUES ((SELECT id FROM report_formats"
-       "          WHERE uuid = 'c15ad349-bd8d-457a-880a-c7056532ee15'),"
-       "         'ISM Control Description', %i, '%s', 0, 100000, '', '%s');",
-       REPORT_FORMAT_PARAM_TYPE_TEXT,
-       MIGRATE_162_TO_163_CONTROL_DESCRIPTION,
-       MIGRATE_162_TO_163_CONTROL_DESCRIPTION);
-
-  /* Set the database version to 163. */
-
-  set_db_version (163);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Chart SQL for migrate_163_to_164.
- *
- * @param[in]  type        Type.
- * @param[in]  default     Default
- * @param[in]  left_uuid   Left UUID.
- * @param[in]  right_uuid  Left UUID.
- */
-#define UPDATE_CHART_SETTINGS(type, default, left_uuid, right_uuid)          \
-  sql ("INSERT INTO settings (owner, uuid, name, value)"                     \
-       " SELECT owner, '%s', 'Dummy', 'left-' || '%s' FROM settings"         \
-       " WHERE uuid = '%s'"                                                  \
-       " AND NOT EXISTS (SELECT * FROM settings AS old_settings"             \
-       "                 WHERE old_settings.uuid = '%s'"                     \
-       "                   AND old_settings.owner = settings.owner);",       \
-       left_uuid, default, right_uuid, left_uuid);                           \
-  sql ("UPDATE settings"                                                     \
-       " SET name = '%s Top Dashboard Components',"                          \
-       "     value = coalesce ((SELECT substr (old_settings.value, 6)"       \
-       "                        FROM settings AS old_settings"               \
-       "                        WHERE old_settings.uuid = '%s'"              \
-       "                          AND old_settings.owner = settings.owner)," \
-       "                       '" default "')"                               \
-       "             || '|'"                                                 \
-       "             || coalesce ((SELECT substr (old_settings.value, 7)"    \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '" default "')"                            \
-       " WHERE uuid = '%s';",                                                \
-       type, left_uuid, right_uuid, left_uuid);                              \
-  sql ("DELETE FROM settings"                                                \
-       " WHERE uuid = '%s';",                                                \
-       right_uuid);
-
-/**
- * @brief Dashboard SQL for migrate_163_to_164.
- */
-#define UPDATE_DASHBOARD_SETTINGS(type, default,                             \
-                                  uuid_1, uuid_2, uuid_3, uuid_4,            \
-                                  filter_1, filter_2, filter_3, filter_4)    \
-  sql ("INSERT INTO settings (owner, uuid, name, value)"                     \
-       " SELECT DISTINCT owner, '%s', 'dummy', '%s' FROM settings"           \
-       " WHERE uuid IN ('%s', '%s', '%s')"                                   \
-       " AND NOT EXISTS (SELECT * FROM settings AS old_settings"             \
-       "                 WHERE uuid = '%s'"                                  \
-       "                   AND old_settings.owner = settings.owner);",       \
-       uuid_1, default, uuid_2, uuid_3, uuid_4, uuid_1);                     \
-  sql ("UPDATE settings"                                                     \
-       " SET name = '%s Dashboard Components',"                              \
-       "     value = coalesce ((SELECT substr (old_settings.value,"          \
-       "                                      length ('" type "') + 4)"      \
-       "                       FROM settings AS old_settings"                \
-       "                       WHERE old_settings.uuid = '%s'"               \
-       "                       AND old_settings.owner = settings.owner),"    \
-       "                       '" default "')"                               \
-       "             || '|'"                                                 \
-       "             || coalesce ((SELECT substr (old_settings.value,"       \
-       "                                          length ('" type "') + 4)"  \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '" default "')"                            \
-       "             || '#'"                                                 \
-       "             || coalesce ((SELECT substr (old_settings.value,"       \
-       "                                          length ('" type "') + 4)"  \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '" default "')"                            \
-       "             || '|'"                                                 \
-       "             || coalesce ((SELECT substr (old_settings.value,"       \
-       "                                          length ('" type "') + 4)"  \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '" default "')"                            \
-       " WHERE uuid = '%s';",                                                \
-       type, uuid_1, uuid_2, uuid_3, uuid_4, uuid_1);                        \
-  sql ("INSERT INTO settings (owner, uuid, name, value)"                     \
-       " SELECT DISTINCT owner, '%s', 'dummy', '' FROM settings"             \
-       " WHERE uuid IN ('%s', '%s', '%s')"                                   \
-       " AND NOT EXISTS (SELECT * FROM settings AS old_settings"             \
-       "                 WHERE uuid = '%s'"                                  \
-       "                   AND old_settings.owner = settings.owner);",       \
-       filter_1, filter_2, filter_3, filter_4, filter_1);                    \
-  sql ("UPDATE settings"                                                     \
-       " SET name = '%s Dashboard Filters',"                                 \
-       "     value = coalesce ((SELECT old_settings.value"                   \
-       "                        FROM settings AS old_settings"               \
-       "                        WHERE old_settings.uuid = '%s'"              \
-       "                        AND old_settings.owner = settings.owner),"   \
-       "                       '')"                                          \
-       "             || '|'"                                                 \
-       "             || coalesce ((SELECT old_settings.value"                \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '')"                                       \
-       "             || '#'"                                                 \
-       "             || coalesce ((SELECT old_settings.value"                \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '')"                                       \
-       "             || '|'"                                                 \
-       "             || coalesce ((SELECT old_settings.value"                \
-       "                           FROM settings AS old_settings"            \
-       "                           WHERE old_settings.uuid = '%s'"           \
-       "                           AND old_settings.owner = settings.owner),"\
-       "                          '')"                                       \
-       " WHERE uuid = '%s';",                                                \
-       type, filter_1, filter_2, filter_3, filter_4, filter_1);              \
-  sql ("DELETE FROM settings"                                                \
-       " WHERE uuid IN ('%s', '%s', '%s', '%s', '%s', '%s');",               \
-       uuid_2, uuid_3, uuid_4, filter_2, filter_3, filter_4);
-
-/**
- * @brief Migrate the database from version 163 to version 164.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_163_to_164 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 163. */
-
-  if (manage_db_version () != 163)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Remove duplicate settings */
-  sql ("DELETE FROM settings"
-       " WHERE id NOT IN (SELECT min(id) FROM settings"
-       "                   GROUP BY uuid, owner);");
-
-  /* Change top chart settings to new format */
-  UPDATE_CHART_SETTINGS ("Tasks", "by-cvss",
-                         "3d5db3c7-5208-4b47-8c28-48efc621b1e0",
-                         "ce8608af-7e66-45a8-aa8a-76def4f9f838")
-  UPDATE_CHART_SETTINGS ("Reports", "by-cvss",
-                         "e599bb6b-b95a-4bb2-a6bb-fe8ac69bc071",
-                         "fc875cd4-16bf-42d1-98ed-c0c9bd6015cd")
-  UPDATE_CHART_SETTINGS ("Results", "by-cvss",
-                         "0b8ae70d-d8fc-4418-8a72-e65ac8d2828e",
-                         "cb7db2fe-3fe4-4704-9fa1-efd4b9e522a8")
-
-  UPDATE_CHART_SETTINGS ("NVTs", "by-cvss",
-                         "f68d9369-1945-477b-968f-121c6029971b",
-                         "af89a84a-d3ec-43a8-97a8-aa688bf093bc")
-  UPDATE_CHART_SETTINGS ("CVEs", "by-cvss",
-                         "815ddd2e-8654-46c7-a05b-d73224102240",
-                         "418a5746-d68a-4a2d-864a-0da993b32220")
-  UPDATE_CHART_SETTINGS ("CPEs", "by-cvss",
-                         "9cff9b4d-b164-43ce-8687-f2360afc7500",
-                         "629fdb73-35fa-4247-9018-338c202f7c03")
-  UPDATE_CHART_SETTINGS ("OVAL Definitions", "by-cvss",
-                         "9563efc0-9f4e-4d1f-8f8d-0205e32b90a4",
-                         "fe1610a3-4e87-4b0d-9b7a-f0f66fef586b")
-  UPDATE_CHART_SETTINGS ("CERT Bund Advisories", "by-cvss",
-                         "a6946f44-480f-4f37-8a73-28a4cd5310c4",
-                         "469d50da-880a-4bfc-88ed-22e53764c683")
-  UPDATE_CHART_SETTINGS ("DFN CERT Advisories", "by-cvss",
-                         "9812ea49-682d-4f99-b3cc-eca051d1ce59",
-                         "72014b52-4389-435d-9438-8c13601ecbd2")
-  UPDATE_CHART_SETTINGS ("All SecInfo", "by-cvss",
-                         "4c7b1ea7-b7e6-4d12-9791-eb9f72b6f864",
-                         "985f38eb-1a30-4a35-abb6-3eec05b5d54a")
-
-  /* Update standalone dashboard */
-  UPDATE_DASHBOARD_SETTINGS ("SecInfo", "nvts-by-cvss",
-                             "84ab32da-fe69-44d8-8a8f-70034cf28d4e",
-                             "42d48049-3153-43bf-b30d-72ca5ab1eb49",
-                             "76f34fe0-254a-4481-97aa-c6f1da2f842b",
-                             "71106ed7-b677-414e-bf67-2e7716441db3",
-                             "517d0efe-426e-49a9-baa7-eda2832c93e8",
-                             "3c693fb2-4f87-4b1f-a09e-cb9aa66440f4",
-                             "bffa72a5-8110-49f9-aa5e-f431ce834826",
-                             "268079c6-f353-414f-9b7c-43f5419edf2d")
-
-  /* Set the database version to 164. */
-
-  set_db_version (164);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 163 to version 164.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_164_to_165 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 164. */
-
-  if (manage_db_version () != 164)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update database */
-
-  /* Add hr_name column to config_preferences table
-   * and initialize it with name for OSP results. */
-  sql ("ALTER TABLE config_preferences ADD COLUMN hr_name TEXT;");
-  sql ("UPDATE config_preferences"
-       " SET hr_name = name"
-       " WHERE type != 'SERVER_PREFS' AND type != 'PLUGINS_PREFS';");
-
-  /* Add hr_name column to config_preferences_trash table
-   * and initialize it with name for OSP results. */
-  sql ("ALTER TABLE config_preferences_trash ADD COLUMN hr_name TEXT;");
-  sql ("UPDATE config_preferences_trash"
-       " SET hr_name = name"
-       " WHERE type != 'SERVER_PREFS' AND type != 'PLUGINS_PREFS';");
-
-  /* Set the database version to 165. */
-
-  set_db_version (165);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 165 to version 166.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_165_to_166 ()
-{
-  iterator_t alert_data;
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 165. */
-
-  if (manage_db_version () != 165)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Create new credentials. */
-  init_iterator (&alert_data,
-                 "SELECT id, name,"
-                 "       (SELECT data FROM alert_method_data"
-                 "        WHERE alert = alerts.id"
-                 "          AND (name='scp_username'"
-                 "               OR name='verinice_server_username')),"
-                 "       (SELECT data FROM alert_method_data"
-                 "        WHERE alert = alerts.id"
-                 "          AND (name='scp_password'"
-                 "               OR name='verinice_server_password')),"
-                 "       owner, method"
-                 " FROM alerts WHERE method = 8 OR method = 6;");
-
-  while (next (&alert_data))
-    {
-      alert_t alert;
-      const char *name, *login, *password;
-      user_t owner;
-      credential_t new_credential;
-      gchar *new_credential_id, *quoted_name, *quoted_login;
-      int method;
-
-      alert = iterator_int64 (&alert_data, 0);
-      name = iterator_string (&alert_data, 1);
-      login = iterator_string (&alert_data, 2);
-      password = iterator_string (&alert_data, 3);
-      owner = iterator_int64 (&alert_data, 4);
-      method = iterator_int (&alert_data, 5);
-
-      /* Skip the alert if it is missing login info. */
-      if (name == NULL || password == NULL)
-        continue;
-
-      quoted_name = sql_quote (name);
-      quoted_login = sql_quote (login);
-
-      /* Create basic credential. */
-      if (sql_int ("SELECT count(*) FROM credentials"
-                   " WHERE name = 'Credential for Alert %s'"
-                   "   AND owner = %llu;",
-                   quoted_name, owner))
-        sql ("INSERT INTO credentials"
-             " (uuid, name, owner, comment, type,"
-             "  creation_time, modification_time)"
-             " VALUES"
-             " (make_uuid (),"
-             "  uniquify ('credential', 'Credential for Alert %s', %llu, ''),"
-             "  %llu, 'Autogenerated by migration', 'up',"
-             "  m_now (), m_now ());",
-             quoted_name, owner, owner);
-      else
-        sql ("INSERT INTO credentials"
-             " (uuid, name, owner, comment, type,"
-             "  creation_time, modification_time)"
-             " VALUES"
-             " (make_uuid (), 'Credential for Alert %s',"
-             "  %llu, 'Autogenerated by migration', 'up',"
-             "  m_now (), m_now ());",
-             quoted_name, owner);
-
-      /* Add credential data. */
-      new_credential = sql_last_insert_id ();
-      new_credential_id = sql_string ("SELECT uuid FROM credentials"
-                                      " WHERE id = %llu;",
-                                      new_credential);
-
-      sql ("INSERT INTO credentials_data (credential, type, value)"
-           " VALUES (%llu, 'username', '%s');",
-           new_credential,
-           quoted_login);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_password;
-          quoted_password = sql_quote (password);
-          sql ("INSERT INTO credentials_data (credential, type, value)"
-               " VALUES (%llu, 'password', '%s');",
-               new_credential, quoted_password);
-          g_free (quoted_password);
-        }
-      else
-        {
-          char *secret;
-          gchar *quoted_secret;
-
-          if (!alert_data.crypt_ctx)
-            alert_data.crypt_ctx = lsc_crypt_new ();
-
-          secret = lsc_crypt_encrypt (alert_data.crypt_ctx,
-                                      "password", password, NULL);
-          if (!secret)
-            {
-              g_free (quoted_name);
-              g_free (quoted_login);
-              cleanup_iterator (&alert_data);
-              sql_rollback ();
-              return -1;
-            }
-          quoted_secret = sql_quote (secret);
-          sql ("INSERT INTO credentials_data (credential, type, value)"
-               " VALUES (%llu, 'secret', '%s');",
-              new_credential, quoted_secret);
-          g_free (quoted_secret);
-        }
-
-      /* Update alert_method_data. */
-      sql ("INSERT INTO alert_method_data (alert, name, data)"
-           " VALUES (%llu, '%s_credential', '%s');",
-           alert,
-           method == 8 ? "scp" : "verinice_server",
-           new_credential_id);
-
-      /* Create permissions. */
-      sql ("INSERT INTO"
-           " permissions (uuid, owner, name,"
-           "              comment, resource_type, resource,"
-           "              resource_uuid,"
-           "              resource_location, subject_type, subject,"
-           "              subject_location, creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Alert migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TABLE) ", subject_type, subject,"
-           "         subject_location, m_now (), m_now ()"
-           " FROM permissions"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'alert'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TABLE)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, alert);
-
-      sql ("INSERT INTO"
-           " permissions_trash (uuid, owner, name,"
-           "                    comment, resource_type, resource,"
-           "                    resource_uuid,"
-           "                    resource_location, subject_type, subject,"
-           "                    subject_location,"
-           "                    creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Alert migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TABLE) ", subject_type, subject,"
-           "         subject_location, m_now (), m_now ()"
-           " FROM permissions_trash"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'alert'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TABLE)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, alert);
-
-      g_free (new_credential_id);
-      g_free (quoted_name);
-      g_free (quoted_login);
-    }
-  cleanup_iterator (&alert_data);
-
-  /* Create new trash credentials. */
-  init_iterator (&alert_data,
-                 "SELECT id, name,"
-                 "       (SELECT data FROM alert_method_data_trash"
-                 "        WHERE alert = alerts_trash.id"
-                 "          AND (name='scp_username'"
-                 "               OR name='verinice_server_username')),"
-                 "       (SELECT data FROM alert_method_data_trash"
-                 "        WHERE alert = alerts_trash.id"
-                 "          AND (name='scp_password'"
-                 "               OR name='verinice_server_password')),"
-                 "       owner, method"
-                 " FROM alerts_trash WHERE method = 8 OR method = 6;");
-
-  while (next (&alert_data))
-    {
-      alert_t alert;
-      const char *name, *login, *password;
-      user_t owner;
-      credential_t new_credential;
-      gchar *new_credential_id, *quoted_name, *quoted_login;
-      int method;
-
-      alert = iterator_int64 (&alert_data, 0);
-      name = iterator_string (&alert_data, 1);
-      login = iterator_string (&alert_data, 2);
-      password = iterator_string (&alert_data, 3);
-      owner = iterator_int64 (&alert_data, 4);
-      method = iterator_int (&alert_data, 5);
-
-      /* Skip the alert if it is missing login info. */
-      if (name == NULL || password == NULL)
-        continue;
-
-      quoted_name = sql_quote (name);
-      quoted_login = sql_quote (login);
-
-      /* Create basic credential. */
-
-      sql ("INSERT INTO credentials_trash"
-           " (uuid, name, owner, comment, type,"
-           "  creation_time, modification_time)"
-           " VALUES"
-           " (make_uuid (), 'Credential for Alert %s',"
-           "  %llu, 'Autogenerated by migration', 'up',"
-           "  m_now (), m_now ());",
-           quoted_name, owner);
-
-      new_credential = sql_last_insert_id ();
-      new_credential_id = sql_string ("SELECT uuid FROM credentials_trash"
-                                      " WHERE id = %llu;",
-                                      new_credential);
-
-      /* Add credential data. */
-      sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-           " VALUES (%llu, 'username', '%s');",
-           new_credential, quoted_login);
-
-      if (disable_encrypted_credentials)
-        {
-          gchar *quoted_password;
-          quoted_password = sql_quote (password);
-          sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-               " VALUES (%llu, 'password', '%s');",
-               new_credential, quoted_password);
-          g_free (quoted_password);
-        }
-      else
-        {
-          char *secret;
-          gchar *quoted_secret;
-
-          if (!alert_data.crypt_ctx)
-            alert_data.crypt_ctx = lsc_crypt_new ();
-
-          secret = lsc_crypt_encrypt (alert_data.crypt_ctx,
-                                      "password", password, NULL);
-          if (!secret)
-            {
-              g_free (quoted_name);
-              g_free (quoted_login);
-              cleanup_iterator (&alert_data);
-              sql_rollback ();
-              return -1;
-            }
-          quoted_secret = sql_quote (secret);
-          sql ("INSERT INTO credentials_trash_data (credential, type, value)"
-               " VALUES (%llu, 'secret', '%s');",
-               new_credential, quoted_secret);
-          g_free (quoted_secret);
-        }
-
-      /* Update alert_method_data. */
-      sql ("INSERT INTO alert_method_data_trash (alert, name, data)"
-           " VALUES (%llu, '%s_credential', '%s');",
-           alert,
-           method == 8 ? "scp" : "verinice_server",
-           new_credential_id);
-
-      sql ("INSERT INTO alert_method_data_trash (alert, name, data)"
-           " VALUES (%llu, '%s_credential_location', %d);",
-           alert,
-           method == 8 ? "scp" : "verinice_server",
-           LOCATION_TRASH);
-
-      /* Create permissions. */
-      sql ("INSERT INTO"
-           " permissions (uuid, owner, name,"
-           "              comment, resource_type, resource,"
-           "              resource_uuid,"
-           "              resource_location, subject_type, subject,"
-           "              subject_location,"
-           "              creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Alert migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials_trash WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TRASH) ", subject_type, subject,"
-           "         subject_location,"
-           "         m_now (), m_now ()"
-           " FROM permissions"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'alert'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TRASH)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, alert);
-
-      sql ("INSERT INTO"
-           " permissions_trash (uuid, owner, name,"
-           "                    comment, resource_type, resource,"
-           "                    resource_uuid,"
-           "                    resource_location, subject_type, subject,"
-           "                    subject_location,"
-           "                    creation_time, modification_time)"
-           " SELECT make_uuid(), owner, 'get_credentials',"
-           "         'Autogenerated by Alert migration', 'credential', %llu,"
-           "         (SELECT uuid FROM credentials_trash WHERE id=%llu),"
-           "         " G_STRINGIFY (LOCATION_TRASH) ", subject_type, subject,"
-           "         subject_location,"
-           "         m_now (), m_now ()"
-           " FROM permissions_trash"
-           " WHERE resource = %llu"
-           "   AND resource_type = 'alert'"
-           "   AND resource_location = " G_STRINGIFY (LOCATION_TRASH)
-           " GROUP BY owner, subject_type, subject, subject_location;",
-           new_credential, new_credential, alert);
-
-      g_free (new_credential_id);
-      g_free (quoted_name);
-      g_free (quoted_login);
-    }
-  cleanup_iterator (&alert_data);
-
-  /* Remove now obsolete rows from alert_method_data and ..._trash. */
-  sql ("DELETE FROM alert_method_data"
-       " WHERE name='scp_username'"
-       "   OR name='verinice_server_username'"
-       "   OR name='scp_password'"
-       "   OR name='verinice_server_password';");
-
-  sql ("DELETE FROM alert_method_data_trash"
-       " WHERE name='scp_username'"
-       "   OR name='verinice_server_username'"
-       "   OR name='scp_password'"
-       "   OR name='verinice_server_password';");
-
-  /* Set the database version to 166. */
-
-  set_db_version (166);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Mark a report format predefined.
- *
- * @param[in]  uuid  UUID of report format.
- */
-static void
-insert_predefined (const gchar *uuid)
-{
-  if (sql_int ("SELECT EXISTS (SELECT * FROM report_formats"
-               "               WHERE uuid = '%s');",
-               uuid))
-    sql ("INSERT INTO resources_predefined (resource_type, resource)"
-         " VALUES ('report_format',"
-         "         (SELECT id FROM report_formats WHERE uuid = '%s'));",
-         uuid);
-}
-
-/**
- * @brief Migrate the database from version 166 to version 167.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_166_to_167 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 166. */
-
-  if (manage_db_version () != 166)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Ensure the tables exist for the migrator. */
-
-  if (sql_is_sqlite3 ())
-    sql ("CREATE TABLE IF NOT EXISTS resources_predefined"
-         " (id INTEGER PRIMARY KEY, resource_type, resource INTEGER)");
-  else
-    sql ("CREATE TABLE IF NOT EXISTS resources_predefined"
-         " (id SERIAL PRIMARY KEY, resource_type text, resource INTEGER)");
-
-  /* Mark predefined report formats. */
-
-  insert_predefined ("5057e5cc-b825-11e4-9d0e-28d24461215b");
-  insert_predefined ("910200ca-dc05-11e1-954f-406186ea4fc5");
-  insert_predefined ("5ceff8ba-1f62-11e1-ab9f-406186ea4fc5");
-  insert_predefined ("c1645568-627a-11e3-a660-406186ea4fc5");
-  insert_predefined ("9087b18c-626c-11e3-8892-406186ea4fc5");
-  insert_predefined ("6c248850-1f62-11e1-b082-406186ea4fc5");
-  insert_predefined ("77bd6c4a-1f62-11e1-abf0-406186ea4fc5");
-  insert_predefined ("a684c02c-b531-11e1-bdc2-406186ea4fc5");
-  insert_predefined ("9ca6fe72-1f62-11e1-9e7c-406186ea4fc5");
-  insert_predefined ("c402cc3e-b531-11e1-9163-406186ea4fc5");
-  insert_predefined ("a3810a62-1f62-11e1-9219-406186ea4fc5");
-  insert_predefined ("a994b278-1f62-11e1-96ac-406186ea4fc5");
-  insert_predefined ("9e5e5deb-879e-4ecc-8be6-a71cd0875cdd");
-  insert_predefined ("c15ad349-bd8d-457a-880a-c7056532ee15");
-  insert_predefined ("50c9950a-f326-11e4-800c-28d24461215b");
-
-  /* Set the database version to 167. */
-
-  set_db_version (167);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 167 to version 168.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_167_to_168 ()
-{
-  const char *uuid;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 167. */
-
-  if (manage_db_version () != 167)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The example task was removed. */
-
-  uuid = "343435d6-91b0-11de-9478-ffd71f4c6f29";
-
-  sql ("DELETE FROM report_counts"
-       " WHERE report IN (SELECT id FROM reports"
-       "                  WHERE task = (SELECT id FROM tasks"
-       "                                WHERE uuid = '%s'));",
-       uuid);
-
-  sql ("DELETE FROM report_hosts"
-       " WHERE report IN (SELECT id FROM reports"
-       "                  WHERE task = (SELECT id FROM tasks"
-       "                                WHERE uuid = '%s'));",
-       uuid);
-
-  sql ("DELETE FROM results"
-       " WHERE task = (SELECT id FROM tasks"
-       "               WHERE uuid = '%s');",
-       uuid);
-
-  sql ("DELETE FROM reports"
-       " WHERE task = (SELECT id FROM tasks"
-       "               WHERE uuid = '%s');",
-       uuid);
-
-  sql ("DELETE FROM task_preferences"
-       " WHERE task = (SELECT id FROM tasks"
-       "               WHERE uuid = '%s');",
-       uuid);
-
-  sql ("DELETE FROM tasks WHERE uuid = '%s';",
-       uuid);
-
-  /* Set the database version to 168. */
-
-  set_db_version (168);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 168 to version 169.
- *
- * @param[in]  owner  Target owner.
- * @param[in]  uuid   Target UUID.
- * @param[out] new    New target.
- *
- * @return 0 success, -1 error.
- */
-static void
-migrate_168_to_169_copy_target (user_t owner, const gchar *uuid, target_t *new)
-{
-  assert (new);
-
-  sql ("INSERT INTO targets"
-       " (uuid, owner, name, comment, creation_time, modification_time,"
-       "  hosts, exclude_hosts, port_list, reverse_lookup_only,"
-       "  reverse_lookup_unify)"
-       " SELECT make_uuid (), %llu, name, comment, m_now (), m_now (),"
-       "        hosts, exclude_hosts, port_list, reverse_lookup_only,"
-       "        reverse_lookup_unify"
-       " FROM targets"
-       " WHERE uuid = '%s';",
-       owner,
-       uuid);
-
-  *new = sql_last_insert_id ();
-
-  sql ("INSERT INTO tags"
-       " (uuid, owner, name, comment, creation_time, modification_time,"
-       "  resource_type, resource, resource_uuid, resource_location,"
-       "  active, value)"
-       " SELECT make_uuid (), %llu, name, comment, m_now (), m_now (),"
-       "        resource_type, %llu,"
-       "        (SELECT uuid FROM targets WHERE id = %llu),"
-       "        resource_location, active, value"
-       " FROM tags WHERE resource_type = 'target'"
-       "           AND resource = (SELECT id FROM targets WHERE uuid = '%s')"
-       "           AND resource_location = " G_STRINGIFY (LOCATION_TABLE) ";",
-       owner,
-       *new,
-       *new,
-       uuid);
-}
-
-/**
- * @brief Migrate the database from version 168 to version 169.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_168_to_169 ()
-{
-  const char *uuid;
-  iterator_t users;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 168. */
-
-  if (manage_db_version () != 168)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The predefined target Localhost was removed. */
-
-  uuid = "b493b7a8-7489-11df-a3ec-002264764cea";
-
-  init_iterator (&users, "SELECT id FROM users;");
-  while (next (&users))
-    {
-      user_t owner;
-
-      owner = iterator_int64 (&users, 0);
-
-      if (sql_int ("SELECT count (*) FROM tasks"
-                   " WHERE owner = %llu"
-                   " AND target = (SELECT id FROM targets"
-                   "               WHERE uuid = '%s');",
-                   owner,
-                   uuid))
-        {
-          target_t new;
-
-          /* This user is using Localhost.  Create a copy owned by the user. */
-
-          current_credentials.username = sql_string ("SELECT name FROM users"
-                                                     " WHERE owner = %llu;",
-                                                     owner);
-          current_credentials.uuid = sql_string ("SELECT uuid FROM users"
-                                                 " WHERE owner = %llu;",
-                                                 owner);
-
-          migrate_168_to_169_copy_target (owner, uuid, &new);
-
-          free (current_credentials.username);
-          free (current_credentials.uuid);
-
-          /* Assign the copy to the user's tasks. */
-
-          sql ("UPDATE tasks SET target = %llu"
-               " WHERE owner = %llu"
-               " AND target = (SELECT id FROM targets WHERE uuid = '%s');",
-               new,
-               owner,
-               uuid);
-        }
-    }
-  cleanup_iterator (&users);
-
-  /* Delete the old Localhost. */
-
-  sql ("DELETE FROM targets WHERE uuid = '%s';",
-       uuid);
-
-  /* Set the database version to 169. */
-
-  set_db_version (169);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Add permission to role.
- *
- * Caller must ensure args are SQL escaped.
- *
- * @param[in]  role        Role.
- * @param[in]  permission  Permission.
- */
-static void
-migrate_169_to_170_add_permission (const gchar *role, const gchar *permission)
-{
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, subject_location,"
-       "  creation_time, modification_time)"
-       " VALUES"
-       " (make_uuid (), NULL, lower ('%s'), '', '',"
-       "  0, '', " G_STRINGIFY (LOCATION_TABLE) ", 'role',"
-       "  (SELECT id FROM roles WHERE uuid = '%s'),"
-       "  " G_STRINGIFY (LOCATION_TABLE) ", m_now (), m_now ());",
-       permission,
-       role);
-}
-
-/**
- * @brief Migrate the database from version 169 to version 170.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_169_to_170 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 169. */
-
-  if (manage_db_version () != 169)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Role "User" got more DESCRIBE permissions. */
-
-  migrate_169_to_170_add_permission ("8d453140-b74d-11e2-b0be-406186ea4fc5",
-                                     "DESCRIBE_CERT");
-  migrate_169_to_170_add_permission ("8d453140-b74d-11e2-b0be-406186ea4fc5",
-                                     "DESCRIBE_FEED");
-  migrate_169_to_170_add_permission ("8d453140-b74d-11e2-b0be-406186ea4fc5",
-                                     "DESCRIBE_SCAP");
-
-  /* Set the database version to 170. */
-
-  set_db_version (170);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 170 to version 171.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_170_to_171 ()
-{
-  gchar *old_dir, *new_dir;
-  struct stat state;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 170. */
-
-  if (manage_db_version () != 170)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The report formats trash moved to an FHS compliant location. */
-
-  new_dir = g_build_filename (GVMD_STATE_DIR,
-                              NULL);
-
-  if (g_mkdir_with_parents (new_dir, 0755 /* "rwxr-xr-x" */))
-    {
-      g_warning ("%s: failed to create dir %s", __FUNCTION__, new_dir);
-      g_free (new_dir);
-      sql_rollback ();
-      return -1;
-    }
-
-  old_dir = g_build_filename (GVMD_DATA_DIR,
-                              "report_formats_trash",
-                              NULL);
-
-  if (g_lstat (old_dir, &state))
-    {
-      /* The old dir is missing.  Assume there are no trash report formats.
-       * This helps when the database has been restored without the trash
-       * directory. */
-
-      if (errno != ENOENT)
-        g_warning ("%s: g_lstat (%s) failed: %s",
-                   __FUNCTION__, old_dir, g_strerror (errno));
-      else
-        g_warning ("%s: trash report formats directory missing (%s)",
-                   __FUNCTION__, old_dir);
-      g_warning ("%s: any trash report formats will be removed on startup",
-                 __FUNCTION__);
-    }
-  else
-    {
-      gchar **cmd;
-      gchar *standard_out = NULL;
-      gchar *standard_err = NULL;
-      gint exit_status;
-
-      /* Move the directory. */
-
-      g_mkdir_with_parents (old_dir, 0755 /* "rwxr-xr-x" */);
-
-      cmd = (gchar **) g_malloc (4 * sizeof (gchar *));
-      cmd[0] = g_strdup ("mv");
-      cmd[1] = old_dir;
-      cmd[2] = new_dir;
-      cmd[3] = NULL;
-      g_debug ("%s: Spawning in .: %s %s %s",
-               __FUNCTION__, cmd[0], cmd[1], cmd[2]);
-      if ((g_spawn_sync (".",
-                         cmd,
-                         NULL,                  /* Environment. */
-                         G_SPAWN_SEARCH_PATH,
-                         NULL,                  /* Setup function. */
-                         NULL,
-                         &standard_out,
-                         &standard_err,
-                         &exit_status,
-                         NULL)
-           == FALSE)
-          || (WIFEXITED (exit_status) == 0)
-          || WEXITSTATUS (exit_status))
-        {
-          g_warning ("%s: failed rename: %d (WIF %i, WEX %i)",
-                     __FUNCTION__,
-                     exit_status,
-                     WIFEXITED (exit_status),
-                   WEXITSTATUS (exit_status));
-          g_debug ("%s: stdout: %s", __FUNCTION__, standard_out);
-          g_debug ("%s: stderr: %s", __FUNCTION__, standard_err);
-          g_free (old_dir);
-          g_free (new_dir);
-          g_free (cmd[0]);
-          g_free (cmd);
-          sql_rollback ();
-          return -1;
-        }
-
-      g_free (cmd[0]);
-      g_free (cmd);
-    }
-
-  g_free (old_dir);
-  g_free (new_dir);
-
-  /* Set the database version to 171. */
-
-  set_db_version (171);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 171 to version 172.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_171_to_172 ()
-{
-  GError *error;
-  gchar *old_dir_path, *new_dir_path;
-  const gchar *subdir_name;
-  struct stat state;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 171. */
-
-  if (manage_db_version () != 171)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The global report formats moved to an FHS compliant location. */
-
-  new_dir_path = g_build_filename (GVMD_STATE_DIR,
-                                   NULL);
-
-  if (g_mkdir_with_parents (new_dir_path, 0755 /* "rwxr-xr-x" */))
-    {
-      g_warning ("%s: failed to create dir %s", __FUNCTION__, new_dir_path);
-      g_free (new_dir_path);
-      sql_rollback ();
-      return -1;
-    }
-
-  old_dir_path = g_build_filename (GVMD_DATA_DIR,
-                                   "global_report_formats",
-                                   NULL);
-
-  if (g_lstat (old_dir_path, &state))
-    {
-      /* The old dir is missing.  Probably we are on a fresh install with an
-       * old db, so skip the moves.  There are no report formats files around
-       * to move anyway, and the Manager install should have put the actual
-       * files in the right place. */
-      if (errno != ENOENT)
-        g_warning ("%s: g_lstat (%s) failed: %s",
-                   __FUNCTION__, old_dir_path, g_strerror (errno));
-      else
-        g_info ("%s: old global report formats directory missing (%s)",
-                __FUNCTION__, old_dir_path);
-    }
-  else
-    {
-      GDir *old_dir;
-      int move_failed;
-
-      /* Iterate over subdirectories of old dir */
-
-      error = NULL;
-      old_dir = g_dir_open (old_dir_path, 0, &error);
-      if (old_dir == NULL)
-        {
-          g_warning ("%s: Failed to open directory '%s': %s",
-                     __FUNCTION__, old_dir_path, error->message);
-          g_error_free (error);
-          g_free (old_dir_path);
-          g_free (new_dir_path);
-          sql_rollback ();
-          return -1;
-        }
-
-      subdir_name = g_dir_read_name (old_dir);
-      move_failed = 0;
-      while (subdir_name && move_failed == 0)
-        {
-          gchar *old_subdir_path, *new_subdir_path;
-          GDir *new_subdir;
-
-          error = NULL;
-          old_subdir_path = g_build_filename (old_dir_path, subdir_name, NULL);
-          new_subdir_path = g_build_filename (new_dir_path, subdir_name, NULL);
-          new_subdir = g_dir_open (new_subdir_path, 0, &error);
-          if (new_subdir)
-            {
-              g_debug ("%s: Skipping '%s', directory already exists",
-                         __FUNCTION__, new_subdir_path);
-              gvm_file_remove_recurse (old_subdir_path);
-              g_dir_close (new_subdir);
-            }
-          else if (error->code == G_FILE_ERROR_NOENT)
-            {
-              gchar **cmd;
-              gchar *standard_out = NULL;
-              gchar *standard_err = NULL;
-              gint exit_status;
-
-              cmd = (gchar **) g_malloc (4 * sizeof (gchar *));
-              cmd[0] = g_strdup ("mv");
-              cmd[1] = old_subdir_path;
-              cmd[2] = new_subdir_path;
-              cmd[3] = NULL;
-              g_debug ("%s: Spawning in .: %s %s %s",
-                      __FUNCTION__, cmd[0], cmd[1], cmd[2]);
-              if ((g_spawn_sync (".",
-                                cmd,
-                                NULL,                  /* Environment. */
-                                G_SPAWN_SEARCH_PATH,
-                                NULL,                  /* Setup function. */
-                                NULL,
-                                &standard_out,
-                                &standard_err,
-                                &exit_status,
-                                NULL)
-                  == FALSE)
-                  || (WIFEXITED (exit_status) == 0)
-                  || WEXITSTATUS (exit_status))
-                {
-                  g_warning ("%s: failed rename: %d (WIF %i, WEX %i)",
-                            __FUNCTION__,
-                            exit_status,
-                            WIFEXITED (exit_status),
-                          WEXITSTATUS (exit_status));
-                  g_debug ("%s: stdout: %s", __FUNCTION__, standard_out);
-                  g_debug ("%s: stderr: %s", __FUNCTION__, standard_err);
-                  move_failed = 1;
-                }
-              g_free (cmd[0]);
-              g_free (cmd);
-            }
-          else
-            {
-              g_warning ("%s: failed to check directory '%s' : %s",
-                         __FUNCTION__, new_subdir_path, error->message);
-              move_failed = 1;
-            }
-          g_free (old_subdir_path);
-          g_free (new_subdir_path);
-          if (error)
-            g_error_free (error);
-          subdir_name = g_dir_read_name (old_dir);
-        }
-
-      g_dir_close (old_dir);
-
-      if (move_failed)
-        {
-          sql_rollback ();
-          return -1;
-        }
-    }
-  g_free (old_dir_path);
-  g_free (new_dir_path);
-
-  /* Set the database version to 172. */
-
-  set_db_version (172);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 172 to version 173.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_172_to_173 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 172. */
-
-  if (manage_db_version () != 172)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Remove unused columns. */
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE nvts RENAME TO nvts_172;");
-
-      sql ("CREATE TABLE IF NOT EXISTS nvts"
-           " (id INTEGER PRIMARY KEY, uuid, oid, version, name, comment,"
-           "  copyright, cve, bid, xref, tag, category INTEGER, family, cvss_base,"
-           "  creation_time, modification_time, solution_type TEXT, qod INTEGER,"
-           "  qod_type TEXT);");
-
-      sql ("INSERT INTO nvts"
-           " (id, uuid, oid, version, name, comment, copyright, cve,"
-           "  bid, xref, tag, category, family, cvss_base, creation_time,"
-           "  modification_time, solution_type, qod, qod_type)"
-           " SELECT id, uuid, oid, version, name, comment, copyright, cve,"
-           "  bid, xref, tag, category, family, cvss_base, creation_time,"
-           "  modification_time, solution_type, qod, qod_type"
-           " FROM nvts_172;");
-
-      sql ("DROP TABLE nvts_172;");
-    }
-  else
-    sql ("ALTER TABLE nvts DROP COLUMN summary;");
-
-  /* Set the database version to 173. */
-
-  set_db_version (173);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 173 to version 174.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_173_to_174 ()
-{
-  sql_begin_immediate ();
-  report_format_t report_format;
-
-  /* Ensure that the database is currently version 173. */
-
-  if (manage_db_version () != 173)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Get row id of Verinice ISM report format */
-  sql_int64 (&report_format,
-             "SELECT id FROM report_formats"
-             " WHERE uuid='c15ad349-bd8d-457a-880a-c7056532ee15';");
-
-  // Update version number in summary and description
-  sql ("UPDATE report_formats"
-       " SET summary='Greenbone Verinice ISM Report, v3.0.0.',"
-       "     description='Information Security Management Report for Verinice import, version 3.0.0.\n'"
-       " WHERE id = %llu",
-       report_format);
-
-  // Remove old attach params
-  sql ("DELETE FROM report_format_params"
-       " WHERE report_format = %llu"
-       "   AND name LIKE 'Attach %%%% report'",
-       report_format);
-
-  // Add new attach param
-  sql ("INSERT INTO report_format_params (report_format, name, type, value,"
-       " type_min, type_max, type_regex, fallback)"
-       " VALUES (%lli, 'Attached report formats', %i, '%s', 0, 0, '', 1);",
-       report_format,
-       REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST,
-       "6c248850-1f62-11e1-b082-406186ea4fc5");
-
-  /* Set the database version to 174. */
-
-  set_db_version (174);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 174 to version 175.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_174_to_175 ()
-{
-  GError *error;
-  int move_failed;
-  gchar *old_dir_path, *new_dir_path;
-  const gchar *subdir_name;
-  GDir *old_dir;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 174. */
-
-  if (manage_db_version () != 174)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The global report formats moved back to the DATA directory, because
-   * they are being merged into the predefined report formats. */
-
-  new_dir_path = g_build_filename (GVMD_DATA_DIR,
-                                   "report_formats",
-                                   NULL);
-
-  /* The new dir should exist already, so this will work even if we don't
-   * have write permission in GVMD_DATA_DIR. */
-  if (g_mkdir_with_parents (new_dir_path, 0755 /* "rwxr-xr-x" */))
-    {
-      g_warning ("%s: failed to create dir %s", __FUNCTION__, new_dir_path);
-      g_free (new_dir_path);
-      sql_rollback ();
-      return -1;
-    }
-
-  old_dir_path = g_build_filename (GVMD_STATE_DIR,
-                                   "global_report_formats",
-                                   NULL);
-
-  /* Ensure the old dir exists. */
-
-  g_mkdir_with_parents (old_dir_path, 0755 /* "rwxr-xr-x" */);
-
-  /* Iterate over subdirectories of old dir. */
-
-  error = NULL;
-  old_dir = g_dir_open (old_dir_path, 0, &error);
-  if (old_dir == NULL)
-    {
-      g_warning ("%s: Failed to open directory '%s': %s",
-                 __FUNCTION__, old_dir_path, error->message);
-      g_error_free (error);
-      g_free (old_dir_path);
-      g_free (new_dir_path);
-      sql_rollback ();
-      return -1;
-    }
-
-  subdir_name = g_dir_read_name (old_dir);
-  move_failed = 0;
-  while (subdir_name && move_failed == 0)
-    {
-      gchar *old_subdir_path, *new_subdir_path;
-      GDir *new_subdir;
-
-      error = NULL;
-      old_subdir_path = g_build_filename (old_dir_path, subdir_name, NULL);
-      new_subdir_path = g_build_filename (new_dir_path, subdir_name, NULL);
-      new_subdir = g_dir_open (new_subdir_path, 0, &error);
-      if (new_subdir)
-        {
-          g_debug ("%s: Skipping '%s', directory already exists",
-                   __FUNCTION__, new_subdir_path);
-          gvm_file_remove_recurse (old_subdir_path);
-          g_dir_close (new_subdir);
-        }
-      else if (error->code == G_FILE_ERROR_NOENT)
-        {
-          gchar **cmd;
-          gchar *standard_out = NULL;
-          gchar *standard_err = NULL;
-          gint exit_status;
-
-          cmd = (gchar **) g_malloc (4 * sizeof (gchar *));
-          cmd[0] = g_strdup ("mv");
-          cmd[1] = old_subdir_path;
-          cmd[2] = new_subdir_path;
-          cmd[3] = NULL;
-          g_debug ("%s: Spawning in .: %s %s %s",
-                  __FUNCTION__, cmd[0], cmd[1], cmd[2]);
-          if ((g_spawn_sync (".",
-                            cmd,
-                            NULL,                  /* Environment. */
-                            G_SPAWN_SEARCH_PATH,
-                            NULL,                  /* Setup function. */
-                            NULL,
-                            &standard_out,
-                            &standard_err,
-                            &exit_status,
-                            NULL)
-              == FALSE)
-              || (WIFEXITED (exit_status) == 0)
-              || WEXITSTATUS (exit_status))
-            {
-              g_warning ("%s: failed rename: %d (WIF %i, WEX %i)",
-                        __FUNCTION__,
-                        exit_status,
-                        WIFEXITED (exit_status),
-                      WEXITSTATUS (exit_status));
-              g_debug ("%s: stdout: %s", __FUNCTION__, standard_out);
-              g_debug ("%s: stderr: %s", __FUNCTION__, standard_err);
-              move_failed = 1;
-            }
-          g_free (cmd[0]);
-          g_free (cmd);
-        }
-      else
-        {
-          g_warning ("%s: failed to check directory '%s' : %s",
-                     __FUNCTION__, new_subdir_path, error->message);
-          move_failed = 1;
-        }
-      g_free (old_subdir_path);
-      g_free (new_subdir_path);
-      if (error)
-        g_error_free (error);
-      subdir_name = g_dir_read_name (old_dir);
-    }
-  g_free (new_dir_path);
-  g_dir_close (old_dir);
-
-  if (move_failed)
-    {
-      g_free (old_dir_path);
-      sql_rollback ();
-      return -1;
-    }
-
-  gvm_file_remove_recurse (old_dir_path);
-  g_free (old_dir_path);
-
-  /* Set the database version to 175. */
-
-  set_db_version (175);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 175 to version 176.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_175_to_176 ()
-{
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 175. */
-
-  if (manage_db_version () != 175)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Change the default scanner to use unix file sockets. */
-  sql ("UPDATE scanners SET host = '" GVM_RUN_DIR "/openvassd.sock'"
-       " WHERE uuid = '" SCANNER_UUID_DEFAULT "';");
-
-  /* Set the database version to 176. */
-
-  set_db_version (176);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 176 to version 177.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_176_to_177 ()
-{
-  int now;
-
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 176. */
-
-  if (manage_db_version () != 176)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The feed DESCRIBE commands were merged to new command GET_FEEDS. */
-
-  now = time (NULL);
-
-  sql ("INSERT INTO permissions"
-       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
-       "  resource_location, subject_type, subject, subject_location,"
-       "  creation_time, modification_time)"
-       " SELECT make_uuid (), *, %i, %i"
-       " FROM (SELECT DISTINCT owner, 'get_feeds', comment, resource_type,"
-       "              resource, resource_uuid, resource_location,"
-       "              subject_type, subject, subject_location"
-       "       FROM permissions"
-       "       WHERE (name = 'describe_feed'"
-       "              OR name = 'describe_scap'"
-       "              OR name = 'describe_cert'))"
-       "      AS subquery;",
-       now,
-       now);
-
-  sql ("DELETE FROM permissions"
-       " WHERE (name = 'describe_feed'"
-       "        OR name = 'describe_scap'"
-       "        OR name = 'describe_cert');");
-
-  /* Set the database version to 177. */
-
-  set_db_version (177);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 177 to version 178.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_177_to_178 ()
-{
-  credential_t credential;
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 177. */
-
-  if (manage_db_version () != 177)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Remove CA certificate from default scanner. */
-  sql ("UPDATE scanners SET ca_pub = NULL"
-       " WHERE uuid = '" SCANNER_UUID_DEFAULT "';");
-
-  /* Get credential to delete it if possible */
-  sql_int64 (&credential,
-             "SELECT credential FROM scanners"
-             " WHERE uuid = '" SCANNER_UUID_DEFAULT "'");
-
-  /* Remove reference to credential from default scanner. */
-  sql ("UPDATE scanners SET credential = NULL"
-       " WHERE uuid = '" SCANNER_UUID_DEFAULT "';");
-
-  /* Delete credential of default scanner if it is not used elsewhere. */
-  if ((sql_int ("SELECT count(*) FROM scanners"
-                " WHERE credential = %llu"
-                "   AND uuid != '" SCANNER_UUID_DEFAULT "';",
-                credential) == 0)
-      && (sql_int ("SELECT count(*) FROM scanners_trash"
-                   " WHERE credential = %llu"
-                   "   AND credential_location = %d;",
-                   credential, LOCATION_TABLE) == 0)
-      && (sql_int ("SELECT count(*) FROM targets_login_data"
-                   " WHERE credential = %llu;",
-                   credential) == 0)
-      && (sql_int ("SELECT count(*) FROM targets_trash_login_data"
-                   " WHERE credential = %llu"
-                   "   AND credential_location = %d;",
-                   credential, LOCATION_TABLE) == 0)
-      && (sql_int ("SELECT count(*) FROM slaves"
-                   " WHERE credential = %llu;",
-                   credential) == 0)
-      && (sql_int ("SELECT count(*) FROM slaves_trash"
-                   " WHERE credential = %llu"
-                   "   AND credential_location = %d;",
-                   credential, LOCATION_TABLE) == 0))
-    {
-      sql ("DELETE FROM credentials_data WHERE credential = %llu",
-           credential);
-      sql ("DELETE FROM credentials WHERE id = %llu",
-           credential);
-    }
-
-  /* Set the database version to 178. */
-
-  set_db_version (178);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 178 to version 179.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_178_to_179 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 178. */
-
-  if (manage_db_version () != 178)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Reports got new columns for slave username and password. */
-
-  sql ("ALTER TABLE reports ADD COLUMN slave_username TEXT;");
-  sql ("ALTER TABLE reports ADD COLUMN slave_password TEXT;");
-
-  sql ("UPDATE reports"
-       " SET slave_username = (SELECT credentials_data.value"
-       "                       FROM slaves, credentials_data"
-       "                       WHERE slaves.id = (SELECT id FROM slaves"
-       "                                          WHERE uuid = slave_uuid)"
-       "                       AND credentials_data.credential"
-       "                           = slaves.credential"
-       "                       AND credentials_data.type = 'username');");
-
-  sql ("UPDATE reports"
-       " SET slave_password = (SELECT credentials_data.value"
-       "                       FROM slaves, credentials_data"
-       "                       WHERE slaves.id = (SELECT id FROM slaves"
-       "                                          WHERE uuid = slave_uuid)"
-       "                       AND credentials_data.credential"
-       "                           = slaves.credential"
-       "                       AND credentials_data.type = 'username');");
-
-  /* Set the database version to 179. */
-
-  set_db_version (179);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Update a reference for migrate_179_to_180.
- *
- * @param[in]  table  Table.
- * @param[in]  trash  Whether to update from scanners_trash.
- *
- * @return 0 success, -1 error.
- */
-void
-migrate_179_to_180_update_ref (const gchar *table, int trash)
-{
-  sql ("UPDATE %s"
-       " SET resource_type = 'scanner',"
-       "     resource = (SELECT id FROM scanners%s"
-       "                 WHERE uuid = resource_uuid)"
-       " WHERE resource_type = 'slave'"
-       " AND resource_location = %i;",
-       table,
-       trash ? "_trash" : "",
-       trash ? LOCATION_TRASH : LOCATION_TABLE);
-}
-
-/**
- * @brief Migrate the database from version 179 to version 180.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_179_to_180 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 179. */
-
-  if (manage_db_version () != 179)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Slaves were replaced by GMP scanners. */
-
-  sql ("DELETE FROM settings"
-       " WHERE uuid = 'aec201fa-8a82-4b61-bebe-a44ea93b2909'"
-       "       OR uuid = '2681c32a-8dfd-40c9-a9c6-8d4e2c7799eb';");
-
-  sql ("UPDATE filters"
-       " SET type = replace (type, 'slave', 'scanner');");
-
-  sql ("UPDATE filters_trash"
-       " SET type = replace (type, 'slave', 'scanner');");
-
-  sql ("INSERT INTO scanners (uuid, owner, name, comment, host, port,"
-       "                      creation_time, modification_time, credential,"
-       "                      type, ca_pub)"
-       " SELECT uuid, owner, name, comment, host, CAST (port AS INTEGER),"
-       "        creation_time, modification_time, credential, %i, NULL"
-       " FROM slaves;",
-       SCANNER_TYPE_GMP);
-
-  migrate_179_to_180_update_ref ("tags", 0);
-  migrate_179_to_180_update_ref ("tags_trash", 0);
-  migrate_179_to_180_update_ref ("permissions", 0);
-  migrate_179_to_180_update_ref ("permissions_trash", 0);
-
-  sql ("UPDATE tasks"
-       " SET scanner = (SELECT id FROM scanners"
-       "                WHERE uuid = (SELECT uuid FROM slaves"
-       "                              WHERE id = tasks.slave)),"
-       "     slave = 0"
-       " WHERE slave != 0"
-       " AND slave_location = " G_STRINGIFY (LOCATION_TABLE) ";");
-
-  sql ("INSERT INTO scanners_trash (uuid, owner, name, comment, host, port,"
-       "                            creation_time, modification_time,"
-       "                            credential, type, ca_pub)"
-       " SELECT uuid, owner, name, comment, host, CAST (port AS INTEGER),"
-       "        creation_time, modification_time, credential, %i, NULL"
-       " FROM slaves_trash;",
-       SCANNER_TYPE_GMP);
-
-  migrate_179_to_180_update_ref ("tags", 1);
-  migrate_179_to_180_update_ref ("tags_trash", 1);
-  migrate_179_to_180_update_ref ("permissions", 1);
-  migrate_179_to_180_update_ref ("permissions_trash", 1);
-
-  sql ("UPDATE permissions"
-       " SET name = replace (name, 'slave', 'scanner');");
-
-  sql ("UPDATE permissions_trash"
-       " SET name = replace (name, 'slave', 'scanner');");
-
-  sql ("UPDATE tasks"
-       " SET scanner = (SELECT id FROM scanners_trash"
-       "                WHERE uuid = (SELECT uuid FROM slaves_trash"
-       "                              WHERE id = tasks.slave)),"
-       "     slave = 0"
-       " WHERE slave != 0"
-       " AND slave_location = " G_STRINGIFY (LOCATION_TRASH) ";");
-
-  sql ("DROP TABLE slaves;");
-  sql ("DROP TABLE slaves_trash;");
-
-  /* Set the database version to 180. */
-
-  set_db_version (180);
-
-  sql_commit ();
-
-  return 0;
-}
-
-/**
- * @brief Migrate the database from version 180 to version 181.
- *
- * @return 0 success, -1 error.
- */
-int
-migrate_180_to_181 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 180. */
-
-  if (manage_db_version () != 180)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Unused column "time" was removed from table tasks.
-   *
-   * Remove slave columns from task at the same time. */
-
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE tasks RENAME TO tasks_180;");
-
-      sql ("CREATE TABLE IF NOT EXISTS tasks"
-           " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, name, hidden INTEGER,"
-           "  comment, run_status INTEGER, start_time, end_time,"
-           "  config INTEGER, target INTEGER, schedule INTEGER, schedule_next_time,"
-           "  schedule_periods INTEGER, config_location INTEGER,"
-           "  target_location INTEGER, schedule_location INTEGER,"
-           "  scanner_location INTEGER, upload_result_count INTEGER,"
-           "  hosts_ordering, scanner, alterable, creation_time,"
-           "  modification_time);");
-
-      sql ("INSERT INTO tasks"
-           " (id, uuid, owner, name, hidden, comment, run_status, start_time,"
-           "  end_time, config, target, schedule, schedule_next_time,"
-           "  schedule_periods, config_location, target_location,"
-           "  schedule_location, scanner_location, upload_result_count,"
-           "  hosts_ordering, scanner, alterable, creation_time,"
-           "  modification_time)"
-           " SELECT id, uuid, owner, name, hidden, comment, run_status,"
-           "        start_time, end_time, config, target, schedule,"
-           "        schedule_next_time, schedule_periods, config_location,"
-           "        target_location, schedule_location, scanner_location,"
-           "        upload_result_count, hosts_ordering, scanner, alterable,"
-           "        creation_time, modification_time"
-           " FROM tasks_180;");
-
-      sql ("DROP TABLE tasks_180;");
-    }
-  else
-    {
-      sql ("ALTER TABLE tasks DROP COLUMN slave;");
-      sql ("ALTER TABLE tasks DROP COLUMN slave_location;");
-    }
-
-  /* Set the database version to 181. */
-
-  set_db_version (181);
-
-  sql_commit ();
+#include <assert.h>
+#include <errno.h>
+#include <glib/gstdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <time.h>
+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#endif
+#include "manage_sql.h"
+#include "sql.h"
+#include "utils.h"
 
-  return 0;
-}
+#include <ctype.h>
+#include <dirent.h>
+#include <gvm/base/logging.h>
+#include <gvm/util/fileutils.h>
+#include <gvm/util/uuidutils.h>
 
+#undef G_LOG_DOMAIN
 /**
- * @brief Move signatures.
- *
- * @param[in]  dest  Destination directory basename.
- *
- * @return 0 success, -1 error.
+ * @brief GLib log domain.
  */
-int
-migrate_181_to_182_move (const char *dest)
-{
-  gchar *new_dir_path, *old_dir_path;
-  GError *error;
-  GDir *old_dir;
-  const gchar *asc_name;
-  int move_failed;
-
-  new_dir_path = g_build_filename (GVMD_STATE_DIR,
-                                   "signatures",
-                                   dest,
-                                   NULL);
-
-  if (g_mkdir_with_parents (new_dir_path, 0755 /* "rwxr-xr-x" */))
-    {
-      g_warning ("%s: failed to create dir %s", __FUNCTION__, new_dir_path);
-      g_free (new_dir_path);
-      return -1;
-    }
-
-  old_dir_path = g_build_filename (GVM_NVT_DIR,
-                                   "private",
-                                   dest,
-                                   NULL);
-
-  error = NULL;
-  old_dir = g_dir_open (old_dir_path, 0, &error);
-  if (old_dir == NULL)
-    {
-      if (error->code == G_FILE_ERROR_NOENT)
-        /* No directory means no signatures to copy. */
-        goto free_exit;
-      g_warning ("%s: Failed to open directory '%s': %s",
-                 __FUNCTION__, old_dir_path, error->message);
-      g_error_free (error);
-      g_free (old_dir_path);
-      g_free (new_dir_path);
-      return -1;
-    }
-
-  asc_name = g_dir_read_name (old_dir);
-  move_failed = 0;
-  while (asc_name && move_failed == 0)
-    {
-      gchar *old_asc_path, *new_asc_path;
-
-      gchar **cmd;
-      gchar *standard_out = NULL;
-      gchar *standard_err = NULL;
-      gint exit_status;
-
-      error = NULL;
-      old_asc_path = g_build_filename (old_dir_path, asc_name, NULL);
-      new_asc_path = g_build_filename (new_dir_path, asc_name, NULL);
-
-      cmd = (gchar **) g_malloc (4 * sizeof (gchar *));
-      cmd[0] = g_strdup ("mv");
-      cmd[1] = old_asc_path;
-      cmd[2] = new_asc_path;
-      cmd[3] = NULL;
-      g_debug ("%s: Spawning in .: %s %s %s",
-              __FUNCTION__, cmd[0], cmd[1], cmd[2]);
-      if ((g_spawn_sync (".",
-                        cmd,
-                        NULL,                  /* Environment. */
-                        G_SPAWN_SEARCH_PATH,
-                        NULL,                  /* Setup function. */
-                        NULL,
-                        &standard_out,
-                        &standard_err,
-                        &exit_status,
-                        NULL)
-          == FALSE)
-          || (WIFEXITED (exit_status) == 0)
-          || WEXITSTATUS (exit_status))
-        {
-          g_warning ("%s: failed rename: %d (WIF %i, WEX %i)",
-                    __FUNCTION__,
-                    exit_status,
-                    WIFEXITED (exit_status),
-                  WEXITSTATUS (exit_status));
-          g_debug ("%s: stdout: %s", __FUNCTION__, standard_out);
-          g_debug ("%s: stderr: %s", __FUNCTION__, standard_err);
-          move_failed = 1;
-        }
-      g_free (cmd[0]);
-      g_free (cmd);
-      g_free (old_asc_path);
-      g_free (new_asc_path);
-      if (error)
-        g_error_free (error);
-      asc_name = g_dir_read_name (old_dir);
-    }
-  g_free (new_dir_path);
-  g_dir_close (old_dir);
+#define G_LOG_DOMAIN "md   main"
 
-  if (move_failed)
-    {
-      g_free (old_dir_path);
-      return -1;
-    }
+/* Headers from backend specific manage_xxx.c file. */
 
-  gvm_file_remove_recurse (old_dir_path);
- free_exit:
-  g_free (old_dir_path);
+void
+manage_create_result_indexes ();
 
-  return 0;
-}
+/* Types. */
 
 /**
- * @brief Migrate the database from version 181 to version 182.
- *
- * @return 0 success, -1 error.
+ * @brief A migrator.
  */
-int
-migrate_181_to_182 ()
+typedef struct
 {
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 181. */
-
-  if (manage_db_version () != 181)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* The directories used by users to provide report format signatures for
-   * their own report formats and agents moved from
-   * FEED/plugins/private/report_formats to
-   * STATE/var/lib/openvas/openvasmd/report_formats. */
-
-  if (migrate_181_to_182_move ("report_formats"))
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Set the database version to 182. */
-
-  set_db_version (182);
-
-  sql_commit ();
+  int version;        ///< Version that the migrator produces.
+  int (*function) (); ///< Function that does the migration.  NULL if too hard.
+} migrator_t;
 
-  return 0;
-}
+/* Functions. */
 
-/**
- * @brief Migrate the database from version 182 to version 183.
+/** @todo May be better ensure a ROLLBACK when functions like "sql" fail.
  *
- * @return 0 success, -1 error.
- */
-int
-migrate_182_to_183 ()
-{
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 182. */
-
-  if (manage_db_version () != 182)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* Slave usernames and passwords were removed from table reports. */
-
-  if (sql_is_sqlite3 ())
-    {
-      sql ("ALTER TABLE reports RENAME TO reports_182;");
-
-      sql ("CREATE TABLE reports"
-           " (id INTEGER PRIMARY KEY, uuid, owner INTEGER, hidden INTEGER,"
-           "  task INTEGER, date INTEGER, start_time, end_time, nbefile, comment,"
-           "  scan_run_status INTEGER, slave_progress, slave_task_uuid,"
-           "  slave_uuid, slave_name, slave_host, slave_port, source_iface,"
-           "  flags INTEGER);");
-
-      sql ("INSERT INTO reports"
-           " (id, uuid, owner, hidden, task, date, start_time, end_time,"
-           "  nbefile, comment, scan_run_status, slave_progress,"
-           "  slave_task_uuid, slave_uuid, slave_name, slave_host,"
-           "  slave_port, source_iface, flags)"
-           " SELECT id, uuid, owner, hidden, task, date, start_time, end_time,"
-           "        nbefile, comment, scan_run_status, slave_progress,"
-           "        slave_task_uuid, slave_uuid, slave_name, slave_host,"
-           "        slave_port, source_iface, flags"
-           " FROM reports_182;");
-
-      sql ("DROP TABLE reports_182;");
-    }
-  else
-    {
-      sql ("ALTER TABLE reports DROP COLUMN slave_username;");
-      sql ("ALTER TABLE reports DROP COLUMN slave_password;");
-    }
-
-  /* Set the database version to 183. */
-
-  set_db_version (183);
-
-  sql_commit ();
-
-  return 0;
-}
+ * Currently the SQL functions abort on failure.  This a general problem,
+ * not just for migrators, so perhaps the SQL interface should keep
+ * track of the transaction, and rollback before aborting. */
 
 /**
- * @brief Migrate the database from version 183 to version 184.
+ * @brief Permission SQL for migrate_150_to_151.
  *
- * @return 0 success, -1 error.
+ * @param[in]  name  Name.
+ * @param[in]  role  Role.
  */
-int
-migrate_183_to_184 ()
+static void
+insert_permission (const char *name, const char *role)
 {
-  sql_begin_immediate ();
-
-  /* Ensure that the database is currently version 183. */
-
-  if (manage_db_version () != 183)
-    {
-      sql_rollback ();
-      return -1;
-    }
-
-  /* Update the database. */
-
-  /* GMP command GET_NVT_FEED_VERSION was removed. */
-
-  sql ("DELETE FROM permissions WHERE name = 'get_nvt_feed_version';");
-
-  sql ("DELETE FROM permissions_trash WHERE name = 'get_nvt_feed_version';");
-
-  /* Deactivate report formats that are not predefined,
-   *  as some older ones may cause problems.
-   */
-  sql ("UPDATE report_formats SET flags = (flags & ~1) WHERE id NOT IN"
-       " (SELECT resource FROM resources_predefined"
-       "  WHERE resource_type='report_format');");
-
-  /* Set the database version to 184. */
-
-  set_db_version (184);
-
-  sql_commit ();
-
-  return 0;
+  sql ("INSERT INTO permissions"
+       " (uuid, owner, name, comment, resource_type, resource, resource_uuid,"
+       "  resource_location, subject_type, subject, subject_location,"
+       "  creation_time, modification_time)"
+       " VALUES"
+       "  (make_uuid (), NULL, '%s', '', '', 0, '', %d, 'role',"
+       "   (SELECT id FROM roles WHERE uuid = '%s'), %d, m_now (), m_now ());",
+       name,
+       LOCATION_TABLE,
+       role,
+       LOCATION_TABLE);
 }
 
 /**
@@ -13974,7 +216,7 @@ migrate_184_to_185 ()
        "   SET scanner_location = " G_STRINGIFY (LOCATION_TABLE));
 
   /* Remove the foreign key constraint in Postgres */
-  if (! sql_is_sqlite3 ())
+  if (!sql_is_sqlite3 ())
     {
       iterator_t fkeys;
       init_iterator (&fkeys,
@@ -13987,12 +229,10 @@ migrate_184_to_185 ()
                      "  AND ccu.table_name = 'scanners';");
       while (next (&fkeys))
         {
-          const char* constraint_name;
+          const char *constraint_name;
           constraint_name = iterator_string (&fkeys, 0);
-          sql ("ALTER TABLE configs_trash DROP constraint %s",
-               constraint_name);
+          sql ("ALTER TABLE configs_trash DROP constraint %s", constraint_name);
         }
-
     }
 
   /* Set the database version to 185. */
@@ -14272,7 +512,6 @@ migrate_190_to_191 ()
   icalcomponent *ical_component;
   gchar *quoted_ical;
 
-
   sql_begin_immediate ();
 
   /* Ensure that the database is currently version 190. */
@@ -14307,21 +546,26 @@ migrate_190_to_191 ()
       byday = iterator_int (&schedule_iter, 5);
       zone = iterator_string (&schedule_iter, 6);
 
-      ical_component
-        = icalendar_from_old_schedule_data (first_time, period, period_months,
-                                            duration, byday, zone);
+      ical_component = icalendar_from_old_schedule_data (
+        first_time, period, period_months, duration, byday, zone);
       quoted_ical = sql_quote (icalcomponent_as_ical_string (ical_component));
 
       g_debug ("%s: schedule %llu - first: %s (%s), period: %ld,"
                " period_months: %ld, duration: %ld - byday: %d\n"
                "generated iCalendar:\n%s",
-               __FUNCTION__, schedule,
+               __FUNCTION__,
+               schedule,
                iso_time_tz (&first_time, zone, NULL),
-               zone, period, period_months, duration, byday,
+               zone,
+               period,
+               period_months,
+               duration,
+               byday,
                quoted_ical);
 
       sql ("UPDATE schedules SET icalendar = '%s' WHERE id = %llu",
-           quoted_ical, schedule);
+           quoted_ical,
+           schedule);
 
       icalcomponent_free (ical_component);
       g_free (quoted_ical);
@@ -14345,21 +589,26 @@ migrate_190_to_191 ()
       byday = iterator_int (&schedule_iter, 5);
       zone = iterator_string (&schedule_iter, 6);
 
-      ical_component
-        = icalendar_from_old_schedule_data (first_time, period, period_months,
-                                            duration, byday, zone);
+      ical_component = icalendar_from_old_schedule_data (
+        first_time, period, period_months, duration, byday, zone);
       quoted_ical = sql_quote (icalcomponent_as_ical_string (ical_component));
 
       g_debug ("%s: trash schedule %llu - first: %s (%s), period: %ld,"
                " period_months: %ld, duration: %ld - byday: %d\n"
                "generated iCalendar:\n%s",
-               __FUNCTION__, schedule,
+               __FUNCTION__,
+               schedule,
                iso_time_tz (&first_time, zone, NULL),
-               zone, period, period_months, duration, byday,
+               zone,
+               period,
+               period_months,
+               duration,
+               byday,
                quoted_ical);
 
       sql ("UPDATE schedules_trash SET icalendar = '%s' WHERE id = %llu",
-           quoted_ical, schedule);
+           quoted_ical,
+           schedule);
 
       icalcomponent_free (ical_component);
       g_free (quoted_ical);
@@ -14451,18 +700,18 @@ migrate_192_to_193 ()
   else
     {
       sql ("CREATE TABLE IF NOT EXISTS tag_resources"
-          " (tag integer REFERENCES tags (id),"
-          "  resource_type text,"
-          "  resource integer,"
-          "  resource_uuid text,"
-          "  resource_location integer);");
+           " (tag integer REFERENCES tags (id),"
+           "  resource_type text,"
+           "  resource integer,"
+           "  resource_uuid text,"
+           "  resource_location integer);");
 
       sql ("CREATE TABLE IF NOT EXISTS tag_resources_trash"
-          " (tag integer REFERENCES tags_trash (id),"
-          "  resource_type text,"
-          "  resource integer,"
-          "  resource_uuid text,"
-          "  resource_location integer);");
+           " (tag integer REFERENCES tags_trash (id),"
+           "  resource_type text,"
+           "  resource integer,"
+           "  resource_uuid text,"
+           "  resource_location integer);");
     }
 
   /* Move tag resources to new tables */
@@ -14724,12 +973,13 @@ migrate_196_to_197 ()
     {
       sql ("ALTER TABLE reports RENAME TO reports_196;");
 
-      sql ("CREATE TABLE IF NOT EXISTS reports"
-           " (id INTEGER PRIMARY KEY, uuid, owner INTEGER,"
-           "  task INTEGER, date INTEGER, start_time, end_time, nbefile, comment,"
-           "  scan_run_status INTEGER, slave_progress, slave_task_uuid,"
-           "  slave_uuid, slave_name, slave_host, slave_port, source_iface,"
-           "  flags INTEGER);");
+      sql (
+        "CREATE TABLE IF NOT EXISTS reports"
+        " (id INTEGER PRIMARY KEY, uuid, owner INTEGER,"
+        "  task INTEGER, date INTEGER, start_time, end_time, nbefile, comment,"
+        "  scan_run_status INTEGER, slave_progress, slave_task_uuid,"
+        "  slave_uuid, slave_name, slave_host, slave_port, source_iface,"
+        "  flags INTEGER);");
 
       sql ("INSERT INTO reports"
            " (id, uuid, owner, task, date, start_time, end_time, nbefile,"
@@ -14783,11 +1033,12 @@ migrate_197_to_198 ()
     {
       sql ("ALTER TABLE nvts RENAME TO nvts_197;");
 
-      sql ("CREATE TABLE IF NOT EXISTS nvts"
-           " (id INTEGER PRIMARY KEY, uuid, oid, name, comment,"
-           "  cve, bid, xref, tag, category INTEGER, family, cvss_base,"
-           "  creation_time, modification_time, solution_type TEXT, qod INTEGER,"
-           "  qod_type TEXT);");
+      sql (
+        "CREATE TABLE IF NOT EXISTS nvts"
+        " (id INTEGER PRIMARY KEY, uuid, oid, name, comment,"
+        "  cve, bid, xref, tag, category INTEGER, family, cvss_base,"
+        "  creation_time, modification_time, solution_type TEXT, qod INTEGER,"
+        "  qod_type TEXT);");
 
       sql ("INSERT INTO nvts"
            " (id, uuid, oid, name, comment, cve, bid, xref, tag, category,"
@@ -14849,7 +1100,8 @@ migrate_198_to_199 ()
 /**
  * @brief UUID of 'Discovery' NVT selector, for migrator.
  */
-#define MIGRATE_TO_200_NVT_SELECTOR_UUID_DISCOVERY "0d9a2738-8fe2-4e22-8f26-bb886179e759"
+#define MIGRATE_TO_200_NVT_SELECTOR_UUID_DISCOVERY \
+  "0d9a2738-8fe2-4e22-8f26-bb886179e759"
 
 /**
  * @brief NVT selector type for "NVT" rule.
@@ -14878,6 +1130,7 @@ migrate_199_to_200 ()
 
   /* Various NVTs were added to and removed from the Discovery scan config. */
 
+  // clang-format off
   sql ("DELETE FROM nvt_selectors WHERE "
        " name='" MIGRATE_TO_200_NVT_SELECTOR_UUID_DISCOVERY "'"
        " AND (family_or_nvt='1.3.6.1.4.1.25623.1.0.902799'"
@@ -14908,6 +1161,7 @@ migrate_199_to_200 ()
        "        ('" MIGRATE_TO_200_NVT_SELECTOR_UUID_DISCOVERY "', 0,"
        "         " G_STRINGIFY (MIGRATE_TO_200_NVT_SELECTOR_TYPE_NVT) ","
        "         '1.3.6.1.4.1.25623.1.0.10942', 'Service detection');");
+  // clang-format on
 
   /* Set the database version to 200. */
 
@@ -14940,12 +1194,12 @@ migrate_200_to_201 ()
 
   /* Ticket commands were added. */
 
-  INSERT_PERMISSION (get_tickets, ROLE_UUID_OBSERVER);
+  insert_permission ("get_tickets", ROLE_UUID_OBSERVER);
 
-  INSERT_PERMISSION (get_tickets, ROLE_UUID_USER);
-  INSERT_PERMISSION (create_ticket, ROLE_UUID_USER);
-  INSERT_PERMISSION (modify_ticket, ROLE_UUID_USER);
-  INSERT_PERMISSION (delete_ticket, ROLE_UUID_USER);
+  insert_permission ("get_tickets", ROLE_UUID_USER);
+  insert_permission ("create_ticket", ROLE_UUID_USER);
+  insert_permission ("modify_ticket", ROLE_UUID_USER);
+  insert_permission ("delete_ticket", ROLE_UUID_USER);
 
   /* Set the database version to 201. */
 
@@ -15192,7 +1446,8 @@ migrate_203_to_204 ()
       sql ("UPDATE tickets SET open_comment = 'No comment for migration.';");
 
       sql ("ALTER TABLE tickets_trash ADD COLUMN open_comment text;");
-      sql ("UPDATE tickets_trash SET open_comment = 'No comment for migration.';");
+      sql (
+        "UPDATE tickets_trash SET open_comment = 'No comment for migration.';");
     }
 
   /* Set the database version to 204. */
@@ -15296,8 +1551,8 @@ replace_preference_names_205_to_206 (const char *table_name)
 
       // Find OID:
       quoted_nvt_name = sql_quote (nvt_name);
-      oid = sql_string ("SELECT oid FROM nvts WHERE name = '%s';",
-                        quoted_nvt_name);
+      oid =
+        sql_string ("SELECT oid FROM nvts WHERE name = '%s';", quoted_nvt_name);
 
       // Update
       if (oid)
@@ -15305,7 +1560,9 @@ replace_preference_names_205_to_206 (const char *table_name)
           new_name = g_strdup_printf ("%s:%s:%s", oid, type, preference);
           quoted_new_name = sql_quote (new_name);
           sql ("UPDATE \"%s\" SET name = '%s' WHERE id = %llu",
-              table_name, quoted_new_name, rowid);
+               table_name,
+               quoted_new_name,
+               rowid);
         }
       else
         {
@@ -15363,233 +1620,127 @@ migrate_205_to_206 ()
   return 0;
 }
 
-#undef UPDATE_CHART_SETTINGS
-#undef UPDATE_DASHBOARD_SETTINGS
+/**
+ * @brief Migrate the database from version 206 to version 207.
+ *
+ * @return 0 success, -1 error.
+ */
+int
+migrate_206_to_207 ()
+{
+  sql_begin_immediate ();
+
+  /* Ensure that the database is currently version 206. */
+
+  if (manage_db_version () != 206)
+    {
+      sql_rollback ();
+      return -1;
+    }
+
+  /* Update the database. */
+
+  /* User are now able to see themselves by default. */
+
+  sql ("INSERT INTO permissions"
+       " (uuid, owner, name, comment, resource_type, resource_uuid, resource,"
+       "  resource_location, subject_type, subject, subject_location,"
+       "  creation_time, modification_time)"
+       " SELECT make_uuid (), id, 'get_users',"
+       "        'Automatically created when adding user', 'user', uuid, id, 0,"
+       "        'user', id, 0, m_now (), m_now ()"
+       " FROM users"
+       " WHERE NOT"
+       "       EXISTS (SELECT * FROM permissions"
+       "               WHERE name = 'get_users'"
+       "               AND resource = users.id"
+       "               AND subject = users.id"
+       "               AND comment"
+       "                   = 'Automatically created when adding user');");
+
+  /* Set the database version to 207. */
+
+  set_db_version (207);
+
+  sql_commit ();
+
+  return 0;
+}
 
 /**
- * @brief Conditional for database_migrators.
+ * @brief Migrate the database from version 207 to version 208.
  *
- * Expands to the given function only if the backend is SQLite3.
+ * @return 0 success, -1 error.
  */
-#ifdef SQL_IS_SQLITE
-#define SQLITE_OR_NULL(function) function
-#else
-#define SQLITE_OR_NULL(function) NULL
-#endif
+int
+migrate_207_to_208 ()
+{
+  sql_begin_immediate ();
+
+  /* Ensure that the database is currently version 207. */
+
+  if (manage_db_version () != 207)
+    {
+      sql_rollback ();
+      return -1;
+    }
+
+  /* Update the database. */
+
+  /* Remove NOBID, NOCVE and NOXREF entries. An empty string will
+   * from now on indicate that there is no reference of the
+   * respective type. */
+
+  sql ("UPDATE nvts SET bid = '' WHERE bid LIKE 'NOBID';");
+  sql ("UPDATE nvts SET cve = '' WHERE cve LIKE 'NOCVE';");
+  sql ("UPDATE nvts SET xref = '' WHERE xref LIKE 'NOXREF';");
+
+  /* Set the database version to 208. */
+
+  set_db_version (208);
+
+  sql_commit ();
+
+  return 0;
+}
+
+#undef UPDATE_DASHBOARD_SETTINGS
+
+/**
+ * @brief The oldest version for which migration is supported
+ */
+#define MIGRATE_MIN_OLD_VERSION 184
 
 /**
  * @brief Array of database version migrators.
  */
-static migrator_t database_migrators[]
- = {{0, NULL},
-    {1, SQLITE_OR_NULL (migrate_0_to_1)},
-    {2, SQLITE_OR_NULL (migrate_1_to_2)},
-    {3, SQLITE_OR_NULL (migrate_2_to_3)},
-    {4, SQLITE_OR_NULL (migrate_3_to_4)},
-    {5, SQLITE_OR_NULL (migrate_4_to_5)},
-    {6, SQLITE_OR_NULL (migrate_5_to_6)},
-    {7, SQLITE_OR_NULL (migrate_6_to_7)},
-    {8, SQLITE_OR_NULL (migrate_7_to_8)},
-    {9, SQLITE_OR_NULL (migrate_8_to_9)},
-    {10, SQLITE_OR_NULL (migrate_9_to_10)},
-    {11, SQLITE_OR_NULL (migrate_10_to_11)},
-    {12, SQLITE_OR_NULL (migrate_11_to_12)},
-    {13, SQLITE_OR_NULL (migrate_12_to_13)},
-    {14, SQLITE_OR_NULL (migrate_13_to_14)},
-    {15, SQLITE_OR_NULL (migrate_14_to_15)},
-    {16, SQLITE_OR_NULL (migrate_15_to_16)},
-    {17, SQLITE_OR_NULL (migrate_16_to_17)},
-    {18, SQLITE_OR_NULL (migrate_17_to_18)},
-    {19, SQLITE_OR_NULL (migrate_18_to_19)},
-    {20, SQLITE_OR_NULL (migrate_19_to_20)},
-    {21, SQLITE_OR_NULL (migrate_20_to_21)}, // v1.0: rev 21
-    {22, SQLITE_OR_NULL (migrate_21_to_22)},
-    {23, SQLITE_OR_NULL (migrate_22_to_23)},
-    {24, SQLITE_OR_NULL (migrate_23_to_24)},
-    {25, SQLITE_OR_NULL (migrate_24_to_25)},
-    {26, SQLITE_OR_NULL (migrate_25_to_26)},
-    {27, SQLITE_OR_NULL (migrate_26_to_27)},
-    {28, SQLITE_OR_NULL (migrate_27_to_28)},
-    {29, SQLITE_OR_NULL (migrate_28_to_29)},
-    {30, SQLITE_OR_NULL (migrate_29_to_30)},
-    {31, SQLITE_OR_NULL (migrate_30_to_31)},
-    {32, SQLITE_OR_NULL (migrate_31_to_32)},
-    {33, SQLITE_OR_NULL (migrate_32_to_33)},
-    {34, SQLITE_OR_NULL (migrate_33_to_34)},
-    {35, SQLITE_OR_NULL (migrate_34_to_35)},
-    {36, SQLITE_OR_NULL (migrate_35_to_36)},
-    {37, SQLITE_OR_NULL (migrate_36_to_37)},
-    {38, SQLITE_OR_NULL (migrate_37_to_38)},
-    {39, SQLITE_OR_NULL (migrate_38_to_39)}, // v2.0: rev 39
-    {40, SQLITE_OR_NULL (migrate_39_to_40)},
-    {41, SQLITE_OR_NULL (migrate_40_to_41)},
-    {42, SQLITE_OR_NULL (migrate_41_to_42)},
-    {43, SQLITE_OR_NULL (migrate_42_to_43)},
-    {44, SQLITE_OR_NULL (migrate_43_to_44)},
-    {45, SQLITE_OR_NULL (migrate_44_to_45)},
-    {46, SQLITE_OR_NULL (migrate_45_to_46)},
-    {47, SQLITE_OR_NULL (migrate_46_to_47)},
-    {48, SQLITE_OR_NULL (migrate_47_to_48)},
-    {49, SQLITE_OR_NULL (migrate_48_to_49)},
-    {50, SQLITE_OR_NULL (migrate_49_to_50)},
-    {51, SQLITE_OR_NULL (migrate_50_to_51)},
-    {52, SQLITE_OR_NULL (migrate_51_to_52)},
-    {53, SQLITE_OR_NULL (migrate_52_to_53)},
-    {54, SQLITE_OR_NULL (migrate_53_to_54)},
-    {55, SQLITE_OR_NULL (migrate_54_to_55)},
-    {56, SQLITE_OR_NULL (migrate_55_to_56)}, // v3.0: rev 56
-    {57, SQLITE_OR_NULL (migrate_56_to_57)},
-    {58, SQLITE_OR_NULL (migrate_57_to_58)},
-    {59, SQLITE_OR_NULL (migrate_58_to_59)},
-    {60, SQLITE_OR_NULL (migrate_59_to_60)},
-    {61, SQLITE_OR_NULL (migrate_60_to_61)},
-    {62, SQLITE_OR_NULL (migrate_61_to_62)},
-    {63, SQLITE_OR_NULL (migrate_62_to_63)},
-    {64, migrate_63_to_64}, // v4.0: rev 64
-    {65, migrate_64_to_65},
-    {66, migrate_65_to_66},
-    {67, migrate_66_to_67},
-    {68, migrate_67_to_68},
-    {69, migrate_68_to_69},
-    {70, migrate_69_to_70},
-    {71, migrate_70_to_71},
-    {72, migrate_71_to_72},
-    {73, migrate_72_to_73},
-    {74, migrate_73_to_74},
-    {75, migrate_74_to_75},
-    {76, migrate_75_to_76},
-    {77, migrate_76_to_77},
-    {78, migrate_77_to_78},
-    {79, migrate_78_to_79},
-    {80, migrate_79_to_80},
-    {81, migrate_80_to_81},
-    {82, migrate_81_to_82},
-    {83, migrate_82_to_83},
-    {84, migrate_83_to_84},
-    {85, migrate_84_to_85},
-    {86, migrate_85_to_86},
-    {87, migrate_86_to_87},
-    {88, migrate_87_to_88},
-    {89, migrate_88_to_89},
-    {90, migrate_89_to_90},
-    {91, migrate_90_to_91},
-    {92, migrate_91_to_92},
-    {93, migrate_92_to_93},
-    {94, migrate_93_to_94},
-    {95, migrate_94_to_95},
-    {96, migrate_95_to_96},
-    {97, migrate_96_to_97},
-    {98, migrate_97_to_98},
-    {99, migrate_98_to_99},
-    {100, migrate_99_to_100},
-    {101, migrate_100_to_101},
-    {102, migrate_101_to_102},
-    {103, migrate_102_to_103},
-    {104, migrate_103_to_104},
-    {105, migrate_104_to_105},
-    {106, migrate_105_to_106},
-    {107, migrate_106_to_107},
-    {108, migrate_107_to_108},
-    {109, migrate_108_to_109},
-    {110, migrate_109_to_110},
-    {111, migrate_110_to_111},
-    {112, migrate_111_to_112},
-    {113, migrate_112_to_113},
-    {114, migrate_113_to_114},
-    {115, migrate_114_to_115},
-    {116, migrate_115_to_116},
-    {117, migrate_116_to_117},
-    {118, migrate_117_to_118},
-    {119, migrate_118_to_119},
-    {120, migrate_119_to_120},
-    {121, migrate_120_to_121},
-    {122, migrate_121_to_122},
-    {123, migrate_122_to_123}, // v5.0: rev 123
-    {124, migrate_123_to_124},
-    {125, migrate_124_to_125},
-    {126, migrate_125_to_126},
-    {127, migrate_126_to_127},
-    {128, migrate_127_to_128},
-    {129, migrate_128_to_129},
-    {130, migrate_129_to_130},
-    {131, migrate_130_to_131},
-    {132, migrate_131_to_132},
-    {133, migrate_132_to_133},
-    {134, migrate_133_to_134},
-    {135, migrate_134_to_135},
-    {136, migrate_135_to_136},
-    {137, migrate_136_to_137},
-    {138, migrate_137_to_138},
-    {139, migrate_138_to_139},
-    {140, migrate_139_to_140},
-    {141, migrate_140_to_141},
-    {142, migrate_141_to_142},
-    {143, migrate_142_to_143},
-    {144, migrate_143_to_144},
-    {145, migrate_144_to_145},
-    {146, migrate_145_to_146}, // v6.0: rev 146
-    {147, migrate_146_to_147},
-    {148, migrate_147_to_148},
-    {149, migrate_148_to_149},
-    {150, migrate_149_to_150},
-    {151, migrate_150_to_151},
-    {152, migrate_151_to_152},
-    {153, migrate_152_to_153},
-    {154, migrate_153_to_154},
-    {155, migrate_154_to_155},
-    {156, migrate_155_to_156},
-    {157, migrate_156_to_157},
-    {158, migrate_157_to_158},
-    {159, migrate_158_to_159},
-    {160, migrate_159_to_160},
-    {161, migrate_160_to_161},
-    {162, migrate_161_to_162},
-    {163, migrate_162_to_163},
-    {164, migrate_163_to_164},
-    {165, migrate_164_to_165},
-    {166, migrate_165_to_166},
-    {167, migrate_166_to_167},
-    {168, migrate_167_to_168},
-    {169, migrate_168_to_169},
-    {170, migrate_169_to_170},
-    {171, migrate_170_to_171},
-    {172, migrate_171_to_172},
-    {173, migrate_172_to_173},
-    {174, migrate_173_to_174},
-    {175, migrate_174_to_175},
-    {176, migrate_175_to_176},
-    {177, migrate_176_to_177},
-    {178, migrate_177_to_178},
-    {179, migrate_178_to_179},
-    {180, migrate_179_to_180},
-    {181, migrate_180_to_181},
-    {182, migrate_181_to_182},
-    {183, migrate_182_to_183},
-    {184, migrate_183_to_184},
-    {185, migrate_184_to_185}, // v7.0: rev 184
-    {186, migrate_185_to_186},
-    {187, migrate_186_to_187},
-    {188, migrate_187_to_188},
-    {189, migrate_188_to_189},
-    {190, migrate_189_to_190},
-    {191, migrate_190_to_191},
-    {192, migrate_191_to_192},
-    {193, migrate_192_to_193},
-    {194, migrate_193_to_194},
-    {195, migrate_194_to_195},
-    {196, migrate_195_to_196},
-    {197, migrate_196_to_197},
-    {198, migrate_197_to_198},
-    {199, migrate_198_to_199},
-    {200, migrate_199_to_200},
-    {201, migrate_200_to_201},
-    {202, migrate_201_to_202},
-    {203, migrate_202_to_203},
-    {204, migrate_203_to_204},
-    {205, migrate_204_to_205}, // v8.0: rev 205
-    {206, migrate_205_to_206},
-    /* End marker. */
-    {-1, NULL}};
+static migrator_t database_migrators[] = {
+  {185, migrate_184_to_185}, // v7.0: rev 184
+  {186, migrate_185_to_186},
+  {187, migrate_186_to_187},
+  {188, migrate_187_to_188},
+  {189, migrate_188_to_189},
+  {190, migrate_189_to_190},
+  {191, migrate_190_to_191},
+  {192, migrate_191_to_192},
+  {193, migrate_192_to_193},
+  {194, migrate_193_to_194},
+  {195, migrate_194_to_195},
+  {196, migrate_195_to_196},
+  {197, migrate_196_to_197},
+  {198, migrate_197_to_198},
+  {199, migrate_198_to_199},
+  {200, migrate_199_to_200},
+  {201, migrate_200_to_201},
+  {202, migrate_201_to_202},
+  {203, migrate_202_to_203},
+  {204, migrate_203_to_204},
+  {205, migrate_204_to_205}, // v8.0: rev 205
+  {206, migrate_205_to_206},
+  {207, migrate_206_to_207},
+  {208, migrate_207_to_208},
+  /* End marker. */
+  {-1, NULL}};
 
 /**
  * @brief Check whether the migration needs the real timezone.
@@ -15603,10 +1754,8 @@ gboolean
 manage_migrate_needs_timezone (GSList *log_config, const gchar *database)
 {
   int db_version;
-  g_log_set_handler (G_LOG_DOMAIN,
-                     ALL_LOG_LEVELS,
-                     (GLogFunc) gvm_log_func,
-                     log_config);
+  g_log_set_handler (
+    G_LOG_DOMAIN, ALL_LOG_LEVELS, (GLogFunc) gvm_log_func, log_config);
   init_manage_process (0, database);
   db_version = manage_db_version ();
   cleanup_manage_process (TRUE);
@@ -15626,12 +1775,17 @@ migrate_is_available (int old_version, int new_version)
 {
   migrator_t *migrators;
 
-  migrators = database_migrators + old_version + 1;
+  if (old_version < MIGRATE_MIN_OLD_VERSION)
+    return 0;
+
+  migrators = database_migrators + old_version - MIGRATE_MIN_OLD_VERSION;
 
   while ((migrators->version >= 0) && (migrators->version <= new_version))
     {
-      if (migrators->function == NULL) return 0;
-      if (migrators->version == new_version) return 1;
+      if (migrators->function == NULL)
+        return 0;
+      if (migrators->version == new_version)
+        return 1;
       migrators++;
     }
 
@@ -15658,10 +1812,8 @@ manage_migrate (GSList *log_config, const gchar *database)
   int new_version, new_scap_version, new_cert_version;
   int version_current = 0, scap_version_current = 0, cert_version_current = 0;
 
-  g_log_set_handler (G_LOG_DOMAIN,
-                     ALL_LOG_LEVELS,
-                     (GLogFunc) gvm_log_func,
-                     log_config);
+  g_log_set_handler (
+    G_LOG_DOMAIN, ALL_LOG_LEVELS, (GLogFunc) gvm_log_func, log_config);
 
   init_manage_process (0, database);
 
@@ -15688,17 +1840,17 @@ manage_migrate (GSList *log_config, const gchar *database)
     {
       switch (migrate_is_available (old_version, new_version))
         {
-          case -1:
-            cleanup_manage_process (TRUE);
-            return -1;
-          case  0:
-            cleanup_manage_process (TRUE);
-            return  2;
+        case -1:
+          cleanup_manage_process (TRUE);
+          return -1;
+        case 0:
+          cleanup_manage_process (TRUE);
+          return 2;
         }
 
       /* Call the migrators to take the DB from the old version to the new. */
 
-      migrators = database_migrators + old_version + 1;
+      migrators = database_migrators + old_version - MIGRATE_MIN_OLD_VERSION;
 
       while ((migrators->version >= 0) && (migrators->version <= new_version))
         {
@@ -15745,20 +1897,20 @@ manage_migrate (GSList *log_config, const gchar *database)
       g_message ("Migrating SCAP database");
       switch (gvm_migrate_secinfo (SCAP_FEED))
         {
-          case 0:
-            g_message ("SCAP database migrated successfully");
-            break;
-          case 1:
-            g_warning ("SCAP sync already running");
-            cleanup_manage_process (TRUE);
-            return 11;
-            break;
-          default:
-            assert (0);
-          case -1:
-            cleanup_manage_process (TRUE);
-            return -11;
-            break;
+        case 0:
+          g_message ("SCAP database migrated successfully");
+          break;
+        case 1:
+          g_warning ("SCAP sync already running");
+          cleanup_manage_process (TRUE);
+          return 11;
+          break;
+        default:
+          assert (0);
+        case -1:
+          cleanup_manage_process (TRUE);
+          return -11;
+          break;
         }
     }
 
@@ -15782,20 +1934,20 @@ manage_migrate (GSList *log_config, const gchar *database)
       g_message ("Migrating CERT database");
       switch (gvm_migrate_secinfo (CERT_FEED))
         {
-          case 0:
-            g_message ("CERT database migrated successfully");
-            break;
-          case 1:
-            g_warning ("CERT sync already running");
-            cleanup_manage_process (TRUE);
-            return 12;
-            break;
-          default:
-            assert (0);
-          case -1:
-            cleanup_manage_process (TRUE);
-            return -12;
-            break;
+        case 0:
+          g_message ("CERT database migrated successfully");
+          break;
+        case 1:
+          g_warning ("CERT sync already running");
+          cleanup_manage_process (TRUE);
+          return 12;
+          break;
+        default:
+          assert (0);
+        case -1:
+          cleanup_manage_process (TRUE);
+          return -12;
+          break;
         }
     }
 
diff --git a/src/manage_pg.c b/src/manage_pg.c
index e3e961d34..ff5532a68 100644
--- a/src/manage_pg.c
+++ b/src/manage_pg.c
@@ -649,6 +649,21 @@ manage_create_sql_functions ()
 
   /* Functions in pl/pgsql. */
 
+  /* Wrapping the "LOCK TABLE ... NOWAIT" like this will prevent
+   *  error messages in the PostgreSQL log if the lock is not available.
+   */
+  sql ("CREATE OR REPLACE FUNCTION try_exclusive_lock (regclass)"
+       " RETURNS integer AS $$"
+       " BEGIN"
+       "   EXECUTE 'LOCK TABLE \"'"
+       "           || $1"
+       "           || '\" IN ACCESS EXCLUSIVE MODE NOWAIT;';"
+       "   RETURN 1;"
+       " EXCEPTION WHEN lock_not_available THEN"
+       "   RETURN 0;"
+       " END;"
+       "$$ language 'plpgsql';");
+
   if (sql_int ("SELECT EXISTS (SELECT * FROM information_schema.tables"
                "               WHERE table_catalog = '%s'"
                "               AND table_schema = 'public'"
@@ -3084,7 +3099,7 @@ create_tables ()
        "              (SELECT id FROM nvts"
        "               WHERE oid = results.nvt"
        "               AND"
-       "                (cve = 'NOCVE'"
+       "                (cve = ''"
        "                 OR cve NOT IN (SELECT cve FROM nvts"
        "                                WHERE oid"
        "                                      IN (SELECT source_name"
@@ -3110,7 +3125,7 @@ create_tables ()
        "             (SELECT id FROM nvts AS outer_nvts"
        "              WHERE oid = results.nvt"
        "              AND"
-       "              (cve = 'NOCVE'"
+       "              (cve = ''"
        "               OR NOT EXISTS"
        "                  (SELECT cve FROM nvts"
        "                   WHERE oid IN (SELECT source_name"
diff --git a/src/manage_sql.c b/src/manage_sql.c
index ee56b170a..2a480621a 100644
--- a/src/manage_sql.c
+++ b/src/manage_sql.c
@@ -4527,7 +4527,9 @@ find_resource_with_permission (const char* type, const char* uuid,
   switch (sql_int64 (resource,
                      "SELECT id FROM %ss%s WHERE uuid = '%s'%s%s;",
                      type,
-                     (strcmp (type, "task") && trash) ? "_trash" : "",
+                     (trash && strcmp (type, "task") && strcmp (type, "report"))
+                      ? "_trash"
+                      : "",
                      quoted_uuid,
                      strcmp (type, "task")
                       ? ""
@@ -7730,7 +7732,7 @@ create_alert (const char* name, const char* comment, const char* filter_id,
       data_name = sql_quote (item);
       data = sql_quote (item + strlen (item) + 1);
 
-      ret = validate_email_data (method, name, &data, 0);
+      ret = validate_email_data (method, data_name, &data, 0);
       if (ret)
         {
           g_free (data_name);
@@ -8111,7 +8113,7 @@ modify_alert (const char *alert_id, const char *name, const char *comment,
           data_name = sql_quote (item);
           data = sql_quote (item + strlen (item) + 1);
 
-          ret = validate_email_data (method, name, &data, 1);
+          ret = validate_email_data (method, data_name, &data, 1);
           if (ret)
             {
               g_free (data_name);
@@ -9046,7 +9048,7 @@ email_write_content (FILE *content_file,
                    "Content-Type: multipart/mixed;"
                    " boundary=\""
                  : "Content-Type: text/plain; charset=utf-8\n"
-                   "Content-Transfer-Encoding: 8bit"),
+                   "Content-Transfer-Encoding: 8bit\n"),
                /* @todo Future callers may give email containing this string. */
                (attachment ? "=-=-=-=-=" : ""),
                (attachment ? "\"\n" : ""),
@@ -12852,7 +12854,7 @@ escalate_2 (alert_t alert, task_t task, report_t report, event_t event,
                            "a3810a62-1f62-11e1-9219-406186ea4fc5",
                            notes_details, overrides_details,
                            &report_content, &content_length, &extension,
-                           NULL, &term, &report_zone, &host_summary,
+                           &type, &term, &report_zone, &host_summary,
                            &report_format, &filter);
                   if (ret || report_content == NULL)
                     {
@@ -13857,6 +13859,7 @@ escalate_2 (alert_t alert, task_t task, report_t report, event_t event,
 
           auth_opts = gmp_authenticate_info_opts_defaults;
           auth_opts.username = current_credentials.username;
+          auth_opts.password = "dummy";
           if (gmp_authenticate_info_ext_c (&connection, auth_opts))
             {
               gvm_connection_free (&connection);
@@ -15404,12 +15407,12 @@ setup_full_config_prefs (config_t config, int safe_checks,
 
   sql ("INSERT into config_preferences (config, type, name, value)"
        " VALUES (%i, 'PLUGINS_PREFS',"
-       " '" OID_PING_HOST ":checkbox:Mark unrechable Hosts as dead (not scanning)',"
+       " '" OID_PING_HOST ":5:checkbox:Mark unrechable Hosts as dead (not scanning)',"
        " 'yes');",
        config);
   sql ("INSERT into config_preferences (config, type, name, value)"
        " VALUES (%i, 'PLUGINS_PREFS',"
-       " '" OID_LOGINS ":checkbox:NTLMSSP',"
+       " '" OID_LOGINS ":1:checkbox:NTLMSSP',"
        " 'yes');",
        config);
 }
@@ -15436,9 +15439,9 @@ update_nvti_cache ()
       nvti_set_name (nvti, iterator_string (&nvts, 1));
       nvti_set_family (nvti, iterator_string (&nvts, 2));
       nvti_set_cvss_base (nvti, iterator_string (&nvts, 3));
-      nvti_set_cve (nvti, iterator_string (&nvts, 4));
-      nvti_set_bid (nvti, iterator_string (&nvts, 5));
-      nvti_set_xref (nvti, iterator_string (&nvts, 6));
+      nvti_add_refs (nvti, "cve", iterator_string (&nvts, 4), "");
+      nvti_add_refs (nvti, "bid", iterator_string (&nvts, 5), "");
+      nvti_add_refs (nvti, NULL, iterator_string (&nvts, 6), "");
       nvti_set_tag (nvti, iterator_string (&nvts, 7));
       nvtis_add (nvti_cache, nvti);
     }
@@ -16758,15 +16761,14 @@ check_db_nvt_selectors ()
   if (sql_int ("SELECT count(*) FROM nvt_selectors WHERE name ="
                " '" MANAGE_NVT_SELECTOR_UUID_ALL "'"
                " AND type = " G_STRINGIFY (NVT_SELECTOR_TYPE_NVT)
-               " AND family_or_nvt = '1.3.6.1.4.1.25623.1.0.100315';")
+               " AND family_or_nvt = '" OID_PING_HOST "';")
       == 0)
     {
       sql ("INSERT into nvt_selectors"
            " (name, exclude, type, family_or_nvt, family)"
            " VALUES ('" MANAGE_NVT_SELECTOR_UUID_ALL "', 0, "
            G_STRINGIFY (NVT_SELECTOR_TYPE_NVT) ","
-           /* OID of the "Ping Host" NVT. */
-           " '1.3.6.1.4.1.25623.1.0.100315', 'Port scanners');");
+           " '" OID_PING_HOST "', 'Port scanners');");
     }
 
   if (sql_int ("SELECT count(*) FROM nvt_selectors WHERE name ="
@@ -17749,6 +17751,7 @@ check_db (int check_encryption_key)
   create_tables ();
   check_db_sequences ();
   set_db_version (GVMD_DATABASE_VERSION);
+  check_db_roles ();
   check_db_nvt_selectors ();
   check_db_nvts ();
   check_db_configs ();
@@ -17760,7 +17763,6 @@ check_db (int check_encryption_key)
     goto fail;
   if (check_db_report_formats_trash ())
     goto fail;
-  check_db_roles ();
   check_db_permissions ();
   check_db_settings ();
   cleanup_schedule_times ();
@@ -20539,7 +20541,7 @@ auto_delete_reports ()
 
       /* As in delete_report, this prevents other processes from getting the
        * report ID. */
-      if (sql_error ("LOCK table reports IN ACCESS EXCLUSIVE MODE NOWAIT;"))
+      if (sql_int ("SELECT try_exclusive_lock('reports');") == 0)
         {
           sql_rollback ();
           return;
@@ -20716,10 +20718,17 @@ result_nvt_notice (const gchar *nvt)
 {
   if (nvt == NULL)
     return;
-  sql ("INSERT into result_nvts (nvt)"
-       " SELECT '%s' WHERE NOT EXISTS (SELECT * FROM result_nvts WHERE nvt = '%s');",
-       nvt,
-       nvt);
+  if (sql_is_sqlite3 ()
+      || (sql_int ("SELECT current_setting ('server_version_num')::integer;")
+          < 90500))
+    sql ("INSERT into result_nvts (nvt)"
+         " SELECT '%s' WHERE NOT EXISTS (SELECT * FROM result_nvts"
+         "                               WHERE nvt = '%s');",
+         nvt,
+         nvt);
+  else
+    sql ("INSERT INTO result_nvts (nvt) VALUES ('%s') ON CONFLICT DO NOTHING;",
+         nvt);
 }
 
 /**
@@ -22475,7 +22484,7 @@ create_report (array_t *results, const char *task_id, const char *task_name,
 
           if (count == CREATE_REPORT_CHUNK_SIZE)
             {
-              report_cache_counts (report, 0, 0, NULL);
+              report_cache_counts (report, 1, 1, NULL);
               sql_commit ();
               gvm_usleep (CREATE_REPORT_CHUNK_SLEEP);
               sql_begin_immediate ();
@@ -22498,7 +22507,7 @@ create_report (array_t *results, const char *task_id, const char *task_name,
   if (first == 0)
     {
       sql (insert->str);
-      report_cache_counts (report, 0, 0, NULL);
+      report_cache_counts (report, 1, 1, NULL);
       sql_commit ();
       gvm_usleep (CREATE_REPORT_CHUNK_SLEEP);
       sql_begin_immediate ();
@@ -24434,8 +24443,8 @@ result_count (const get_data_t *get, report_t report, const char* host)
     filter = NULL;
 
   apply_overrides
-    = filter_term_apply_overrides (filter);
-  autofp = filter_term_autofp (filter);
+    = filter_term_apply_overrides (filter ? filter : get->filter);
+  autofp = filter_term_autofp (filter ? filter : get->filter);
   dynamic_severity = setting_dynamic_severity_int ();
 
   extra_tables
@@ -24556,57 +24565,39 @@ result_iterator_nvt_cvss_base (iterator_t *iterator)
 }
 
 /**
- * @brief Get the NVT CVE from a result iterator.
- *
- * @param[in]  iterator  Iterator.
+ * @brief Get the NVT's references in XML format from a nvti object via oid.
  *
- * @return The CVE of the NVT that produced the result, or NULL on error.
+ * @param[in]  xml       The buffer where to append to.
+ * @param[in]  oid       The oid of the nvti object from where to collect the refs.
  */
-const char*
-result_iterator_nvt_cve (iterator_t *iterator)
+void
+nvti_refs_append_xml (GString *xml, const char *oid)
 {
-  nvti_t *nvti;
-  if (iterator->done) return NULL;
-  nvti = nvtis_lookup (nvti_cache, result_iterator_nvt_oid (iterator));
-  if (nvti)
-    return nvti_cve (nvti);
-  return NULL;
-}
+  nvti_t *nvti = nvtis_lookup (nvti_cache, oid);
+  int i;
 
-/**
- * @brief Get the NVT BID from a result iterator.
- *
- * @param[in]  iterator  Iterator.
- *
- * @return The BID of the NVT that produced the result, or NULL on error.
- */
-const char*
-result_iterator_nvt_bid (iterator_t *iterator)
-{
-  nvti_t *nvti;
-  if (iterator->done) return NULL;
-  nvti = nvtis_lookup (nvti_cache, result_iterator_nvt_oid (iterator));
-  if (nvti)
-    return nvti_bid (nvti);
-  return NULL;
+  if (!nvti)
+    return;
+
+  for (i = 0; i < nvti_vtref_len (nvti); i++)
+    {
+      vtref_t *ref = nvti_vtref (nvti, i);
+      xml_string_append (xml, "<ref type=\"%s\" id=\"%s\"/>", vtref_type (ref), vtref_id (ref));
+    }
 }
 
 /**
- * @brief Get the NVT XREF from a result iterator.
+ * @brief Get the NVT's references in XML format from a result iterator.
  *
+ * @param[in]  xml       The buffer where to append to.
  * @param[in]  iterator  Iterator.
- *
- * @return The XREF of the NVT that produced the result, or NULL on error.
  */
-const char*
-result_iterator_nvt_xref (iterator_t *iterator)
+void
+result_iterator_nvt_refs_append (GString *xml, iterator_t *iterator)
 {
-  nvti_t *nvti;
-  if (iterator->done) return NULL;
-  nvti = nvtis_lookup (nvti_cache, result_iterator_nvt_oid (iterator));
-  if (nvti)
-    return nvti_xref (nvti);
-  return NULL;
+  if (iterator->done) return;
+
+  nvti_refs_append_xml (xml, result_iterator_nvt_oid (iterator));
 }
 
 /**
@@ -25335,7 +25326,7 @@ init_report_host_details_iterator (iterator_t* iterator,
                  " UNION SELECT 0, 'Closed CVE', cve, 'openvasmd', oid,"
                  "              nvts.name, cvss_base"
                  "       FROM nvts, report_host_details"
-                 "       WHERE cve != 'NOCVE'"
+                 "       WHERE cve != ''"
                  "       AND family IN (" LSC_FAMILY_LIST ")"
                  "       AND nvts.oid = report_host_details.source_name"
                  "       AND report_host = %llu"
@@ -28399,7 +28390,7 @@ static int
 report_closed_cve_count (report_t report)
 {
   return sql_int (" SELECT count(id) FROM nvts"
-                  " WHERE cve != 'NOCVE'"
+                  " WHERE cve != ''"
                   " AND family IN (" LSC_FAMILY_LIST ")"
                   " AND oid IN"
                   " (SELECT source_name FROM report_host_details"
@@ -28575,7 +28566,7 @@ print_report_host_details_xml (report_host_t report_host, FILE *stream)
              "<scan_nvt_version>%s</scan_nvt_version>"                     \
              "<severity>%s</severity>"                                     \
              "</error>",                                                   \
-             report_errors_iterator_host (errors),                         \
+             report_errors_iterator_host (errors) ?: "",                   \
              asset_id ? asset_id : "",                                     \
              report_errors_iterator_port (errors),                         \
              report_errors_iterator_desc (errors),                         \
@@ -34577,7 +34568,8 @@ create_target (const char* name, const char* asset_hosts_filter,
                target_t* target)
 {
   gchar *quoted_name, *quoted_hosts, *quoted_exclude_hosts, *quoted_comment;
-  gchar *port_list_comment, *quoted_ssh_port, *clean, *chosen_hosts;
+  gchar *port_list_comment, *quoted_ssh_port, *clean, *clean_exclude;
+  gchar *chosen_hosts;
   port_list_t port_list;
   int ret, alive_test, max;
   target_t new_target;
@@ -34632,40 +34624,44 @@ create_target (const char* name, const char* asset_hosts_filter,
         }
       cleanup_iterator (&asset_hosts);
       chosen_hosts = g_string_free (buffer, FALSE);
-      quoted_exclude_hosts = g_strdup ("");
 
       g_debug ("asset chosen_hosts: %s", chosen_hosts);
     }
   else
     {
       chosen_hosts = g_strdup (hosts);
-      quoted_exclude_hosts = exclude_hosts ? sql_quote (exclude_hosts)
-                                           : g_strdup ("");
-
       g_debug ("manual chosen_hosts: %s", chosen_hosts);
     }
 
-  max = manage_count_hosts (chosen_hosts, quoted_exclude_hosts);
+
+  clean = clean_hosts (chosen_hosts, &max);
+  g_free (chosen_hosts);
+  if (exclude_hosts)
+    clean_exclude = clean_hosts (exclude_hosts, NULL);
+  else
+    clean_exclude = g_strdup ("");
+
+  max = manage_count_hosts (clean, clean_exclude);
   if (max <= 0)
     {
-      g_free (chosen_hosts);
-      g_free (quoted_exclude_hosts);
       g_free (quoted_name);
+      g_free (clean);
+      g_free (clean_exclude);
       sql_rollback ();
       return 2;
     }
-  clean = clean_hosts (chosen_hosts, &max);
-  g_free (chosen_hosts);
   if (max > max_hosts)
     {
-      g_free (quoted_exclude_hosts);
       g_free (quoted_name);
       g_free (clean);
+      g_free (clean_exclude);
       sql_rollback ();
       return 3;
     }
   quoted_hosts = sql_quote (clean);
+  quoted_exclude_hosts = sql_quote (clean_exclude);
   g_free (clean);
+  g_free (clean_exclude);
 
   if (port_list_id)
     {
@@ -35325,7 +35321,7 @@ modify_target (const char *target_id, const char *name, const char *hosts,
 
   if (exclude_hosts)
     {
-      gchar *quoted_exclude_hosts, *quoted_hosts, *clean;
+      gchar *quoted_exclude_hosts, *quoted_hosts, *clean, *clean_exclude;
       int max;
 
       if (target_in_use (target))
@@ -35334,39 +35330,41 @@ modify_target (const char *target_id, const char *name, const char *hosts,
           return 15;
         }
 
-      quoted_exclude_hosts = sql_quote (exclude_hosts);
-
       if (hosts == NULL)
         {
-          g_free (quoted_exclude_hosts);
           sql_rollback ();
           return 12;
         }
 
       if (strlen (hosts) == 0)
         {
-          g_free (quoted_exclude_hosts);
           sql_rollback ();
           return 14;
         }
 
-      max = manage_count_hosts (hosts, quoted_exclude_hosts);
+      clean = clean_hosts (hosts, &max);
+      clean_exclude = clean_hosts (exclude_hosts, NULL);
+
+      max = manage_count_hosts (clean, clean_exclude);
       if (max <= 0)
         {
-          g_free (quoted_exclude_hosts);
+          g_free (clean);
+          g_free (clean_exclude);
           sql_rollback ();
           return 2;
         }
-      clean = clean_hosts (hosts, &max);
+
       if (max > max_hosts)
         {
-          g_free (quoted_exclude_hosts);
           g_free (clean);
+          g_free (clean_exclude);
           sql_rollback ();
           return 3;
         }
       quoted_hosts = sql_quote (clean);
+      quoted_exclude_hosts = sql_quote (clean_exclude);
       g_free (clean);
+      g_free (clean_exclude);
 
       sql ("UPDATE targets SET"
            " hosts = '%s',"
@@ -36465,12 +36463,12 @@ config_insert_preferences (config_t config,
           }
         else if (preference->type)
           {
-            gchar *quoted_type, *quoted_nvt_name, *quoted_preference_name;
+            gchar *quoted_type, *quoted_nvt_oid, *quoted_preference_name;
             gchar *quoted_default, *quoted_preference_hr_name;
 
             /* Presume NVT or OSP preference. */
 
-            if (preference->nvt_name == NULL
+            if (preference->nvt_oid == NULL
                 && (config_type == NULL || strcmp (config_type, "0") == 0))
               return -4;
 
@@ -36478,8 +36476,7 @@ config_insert_preferences (config_t config,
             while ((alt = (gchar*) g_ptr_array_index (preference->alts, alt_index++)))
               g_string_append_printf (value, ";%s", alt);
 
-            quoted_nvt_name = preference->nvt_name
-                                ? sql_quote (preference->nvt_name) : NULL;
+            quoted_nvt_oid = sql_quote (preference->nvt_oid ?: "");
             quoted_preference_name = sql_quote (preference->name);
             quoted_preference_hr_name
               = preference->hr_name
@@ -36498,12 +36495,13 @@ config_insert_preferences (config_t config,
             if (config_type == NULL || strcmp (config_type, "0") == 0)
               {
                 /* NVT preference */
-                /* OID:PrefType:PrefName value */
+                /* OID:PrefID:PrefType:PrefName value */
                 sql ("INSERT INTO config_preferences"
                      " (config, type, name, value)"
-                     " VALUES (%llu, 'PLUGINS_PREFS', '%s:%s:%s', '%s');",
+                     " VALUES (%llu, 'PLUGINS_PREFS', '%s:%s:%s:%s', '%s');",
                      config,
-                     quoted_nvt_name,
+                     quoted_nvt_oid,
+                     preference->id,
                      quoted_type,
                      quoted_preference_name,
                      quoted_value);
@@ -36522,7 +36520,7 @@ config_insert_preferences (config_t config,
                      quoted_preference_hr_name
                       ? quoted_preference_name : quoted_preference_hr_name);
               }
-            g_free (quoted_nvt_name);
+            g_free (quoted_nvt_oid);
             g_free (quoted_preference_name);
             g_free (quoted_type);
             g_free (quoted_value);
@@ -37392,7 +37390,7 @@ sync_config (const char *config_id)
  */
 #define CONFIG_ITERATOR_FILTER_COLUMNS                                        \
  { GET_ITERATOR_FILTER_COLUMNS, "nvt_selector", "families_total",             \
-   "nvts_total", "families_trend", "nvts_trend", NULL }
+   "nvts_total", "families_trend", "nvts_trend", "type", NULL }
 
 /**
  * @brief Scan config iterator columns.
@@ -37654,11 +37652,11 @@ config_iterator_scanner_trash (iterator_t* iterator)
 int
 config_in_use (config_t config)
 {
-  return sql_int ("SELECT count(*) FROM tasks"
-                  " WHERE config = %llu"
-                  " AND config_location = " G_STRINGIFY (LOCATION_TABLE)
-                  " AND hidden = 0;",
-                  config);
+  return !!sql_int ("SELECT count(*) FROM tasks"
+                    " WHERE config = %llu"
+                    " AND config_location = " G_STRINGIFY (LOCATION_TABLE)
+                    " AND hidden = 0;",
+                    config);
 }
 
 /**
@@ -37697,10 +37695,10 @@ config_writable (config_t config)
 int
 trash_config_in_use (config_t config)
 {
-  return sql_int ("SELECT count(*) FROM tasks"
-                  " WHERE config = %llu"
-                  " AND config_location = " G_STRINGIFY (LOCATION_TRASH),
-                  config);
+  return !!sql_int ("SELECT count(*) FROM tasks"
+                    " WHERE config = %llu"
+                    " AND config_location = " G_STRINGIFY (LOCATION_TRASH),
+                    config);
 }
 
 /**
@@ -37855,7 +37853,7 @@ init_otp_pref_iterator (iterator_t* iterator,
                  config,
                  quoted_section,
                  strcmp (quoted_section, "SERVER_PREFS") == 0
-                  ? "NOT LIKE '%:%:%'" : "LIKE '%:%:%'",
+                  ? "NOT LIKE '%:%:%:%'" : "LIKE '%:%:%:%'",
                  config);
   g_free (quoted_section);
 }
@@ -37940,14 +37938,14 @@ manage_set_config_preference (const gchar *config_id, const char* nvt,
 
       quoted_name = sql_quote (name);
 
-      /* OID:scanner:PrefType */
-      splits = g_strsplit (name, ":", 3);
-      if (splits && g_strv_length (splits) == 3
-          && strcmp (splits[1], "scanner") == 0)
+      /* OID:PrefID:scanner:PrefName */
+      splits = g_strsplit (name, ":", 4);
+      if (splits && g_strv_length (splits) == 4
+          && strcmp (splits[2], "scanner") == 0)
         {
           /* A scanner preference.  Remove type decoration from name. */
           g_free (quoted_name);
-          quoted_name = sql_quote (splits[2]);
+          quoted_name = sql_quote (splits[3]);
         }
       g_strfreev (splits);
 
@@ -37994,11 +37992,11 @@ manage_set_config_preference (const gchar *config_id, const char* nvt,
   else
     value = g_strdup ("");
 
-  /* OID:PrefType:PrefName value */
-  splits = g_strsplit (name, ":", 3);
-  if (splits && g_strv_length (splits) == 3)
+  /* OID:PrefID:PrefType:PrefName value */
+  splits = g_strsplit (name, ":", 4);
+  if (splits && g_strv_length (splits) == 4)
     {
-      if (strcmp (splits[1], "radio") == 0)
+      if (strcmp (splits[2], "radio") == 0)
         {
           char *old_value;
           gchar **split, **point;
@@ -38055,12 +38053,12 @@ manage_set_config_preference (const gchar *config_id, const char* nvt,
               value = g_string_free (string, FALSE);
             }
         }
-      else if (strcmp (splits[1], "scanner") == 0)
+      else if (strcmp (splits[2], "scanner") == 0)
         {
           /* A scanner preference.  Remove type decoration from name. */
 
           g_free (quoted_name);
-          quoted_name = sql_quote (splits[2]);
+          quoted_name = sql_quote (splits[3]);
         }
     }
   g_strfreev (splits);
@@ -38573,6 +38571,56 @@ DEF_ACCESS (config_timeout_iterator_nvt_name, 2);
  */
 DEF_ACCESS (config_timeout_iterator_value, 3);
 
+/**
+ * @brief Update or optionally insert a NVT preference.
+ *
+ * @param[in]  config_id        UUID of the config to set the preference in
+ * @param[in]  type             Type of the preference, e.g. "PLUGINS_PREFS"
+ * @param[in]  preference_name  Full name of the preference
+ * @param[in]  new_value        The new value to set
+ * @param[in]  insert           Whether to insert the preference if missing
+ */
+void
+update_config_preference (const char *config_id,
+                          const char *type,
+                          const char *preference_name,
+                          const char *new_value,
+                          gboolean insert)
+{
+  gchar *quoted_config_id = sql_quote (config_id);
+  gchar *quoted_type = sql_quote (type);
+  gchar *quoted_name = sql_quote (preference_name);
+  gchar *quoted_value = sql_quote (new_value);
+
+  if (sql_int ("SELECT count (*) FROM config_preferences"
+               " WHERE config = (SELECT id FROM configs WHERE uuid = '%s')"
+               "   AND type = '%s'"
+               "   AND name = '%s';",
+               quoted_config_id, quoted_type, quoted_name) == 0)
+    {
+      if (insert)
+        {
+          sql ("INSERT INTO config_preferences (config, type, name, value)"
+               " VALUES ((SELECT id FROM configs WHERE uuid = '%s'),"
+               "         '%s', '%s', '%s');",
+               quoted_config_id, quoted_type, quoted_name, quoted_value);
+        }
+    }
+  else
+    {
+      sql ("UPDATE config_preferences SET value = '%s'"
+           " WHERE config = (SELECT id FROM configs WHERE uuid = '%s')"
+           "   AND type = '%s'"
+           "   AND name = '%s';",
+           quoted_value, quoted_config_id, quoted_type, quoted_name);
+    }
+
+  g_free (quoted_config_id);
+  g_free (quoted_type);
+  g_free (quoted_name);
+  g_free (quoted_value);
+}
+
 /**
  * @brief Update the cached count and growing information in a config.
  *
@@ -41086,7 +41134,7 @@ init_nvt_preference_iterator (iterator_t* iterator, const char *oid)
                      " AND name != 'nasl_no_signature_check'"
                      " AND name != 'network_targets'"
                      " AND name != 'ntp_save_sessions'"
-                     " AND name != '%s:entry:Timeout'"
+                     " AND name != '%s:0:entry:Timeout'"
                      " AND name NOT %s 'server_info_%%'"
                      /* Task preferences. */
                      " AND name != 'max_checks'"
@@ -41106,7 +41154,7 @@ init_nvt_preference_iterator (iterator_t* iterator, const char *oid)
                    " AND name != 'nasl_no_signature_check'"
                    " AND name != 'network_targets'"
                    " AND name != 'ntp_save_sessions'"
-                   " AND name NOT %s '%%:entry:Timeout'"
+                   " AND name NOT %s '%%:0:entry:Timeout'"
                    " AND name NOT %s 'server_info_%%'"
                    /* Task preferences. */
                    " AND name != 'max_checks'"
@@ -41152,9 +41200,9 @@ nvt_preference_iterator_real_name (iterator_t* iterator)
   ret = iterator_string (iterator, 0);
   if (ret)
     {
-      char **splits = g_strsplit (ret, ":", 3);
-      if (splits && g_strv_length (splits) == 3)
-        real_name = g_strdup (splits[2]);
+      char **splits = g_strsplit (ret, ":", 4);
+      if (splits && g_strv_length (splits) == 4)
+        real_name = g_strdup (splits[3]);
       g_strfreev (splits);
       return real_name ?: g_strdup (ret);
     }
@@ -41173,17 +41221,17 @@ nvt_preference_iterator_type (iterator_t* iterator)
 {
   const char *ret;
   char *type = NULL;
-  if (iterator->done) return NULL;
+  if (iterator->done)
+    return NULL;
   ret = iterator_string (iterator, 0);
   if (ret)
     {
-      char **splits = g_strsplit (ret, ":", 3);
-      if (splits && g_strv_length (splits) == 3)
-        type = g_strdup (splits[1]);
+      char **splits = g_strsplit (ret, ":", 4);
+      if (splits && g_strv_length (splits) == 4)
+        type = g_strdup (splits[2]);
       g_strfreev (splits);
-      return type ?: NULL;
     }
-  return NULL;
+  return type;
 }
 
 /**
@@ -41198,17 +41246,43 @@ nvt_preference_iterator_oid (iterator_t* iterator)
 {
   const char *ret;
   char *oid = NULL;
-  if (iterator->done) return NULL;
+  if (iterator->done)
+    return NULL;
   ret = iterator_string (iterator, 0);
   if (ret)
     {
-      char **splits = g_strsplit (ret, ":", 3);
-      if (splits && g_strv_length (splits) == 3)
+      char **splits = g_strsplit (ret, ":", 4);
+      if (splits && g_strv_length (splits) == 4)
         oid = g_strdup (splits[0]);
       g_strfreev (splits);
-      return oid ?: NULL;
     }
-  return NULL;
+  return oid;
+}
+
+/**
+ * @brief Get the ID from an NVT preference iterator.
+ *
+ * @param[in]  iterator  Iterator.
+ *
+ * @return NVT.
+ */
+char*
+nvt_preference_iterator_id (iterator_t* iterator)
+{
+  const char *ret;
+  char *id = NULL;
+
+  if (iterator->done)
+    return NULL;
+  ret = iterator_string (iterator, 0);
+  if (ret)
+    {
+      char **splits = g_strsplit (ret, ":", 4);
+      if (splits && g_strv_length (splits) == 4)
+        id = g_strdup (splits[1]);
+      g_strfreev (splits);
+    }
+  return id;
 }
 
 /**
@@ -41247,21 +41321,21 @@ nvt_preference_iterator_config_value (iterator_t* iterator, config_t config)
 /**
  * @brief Get the number preferences available for an NVT.
  *
- * @param[in]  name  Name of NVT.
+ * @param[in]  oid  OID of NVT.
  *
  * @return Number of possible preferences on NVT.
  */
 int
-nvt_preference_count (const char *name)
+nvt_preference_count (const char *oid)
 {
-  gchar *quoted_name = sql_quote (name);
+  gchar *quoted_oid = sql_quote (oid);
   int ret = sql_int ("SELECT COUNT(*) FROM nvt_preferences"
-                     " WHERE name != '%s:entry:Timeout'"
-                     "   AND name %s '%s[%%';",
-                     quoted_name,
+                     " WHERE name != '%s:0:entry:Timeout'"
+                     "   AND name %s '%s:%%';",
+                     quoted_oid,
                      sql_ilike_op (),
-                     quoted_name);
-  g_free (quoted_name);
+                     quoted_oid);
+  g_free (quoted_oid);
   return ret;
 }
 
@@ -41496,6 +41570,31 @@ set_credential_data (credential_t credential,
   return 0;
 }
 
+/**
+ * @brief Test if a username is valid to use in a credential.
+ *
+ * Valid usernames may only contain alphanumeric characters and a few
+ *  special ones to avoid problems with installer package generation.
+ *
+ * @param[in]  username  The username string to test.
+ *
+ * @return Whether the username is valid.
+ */
+static int
+validate_credential_username (const gchar *username)
+{
+  const char *s;
+  s = username;
+  while (*s)
+    if (isalnum (*s)
+        || strchr ("-_\\.@", *s))
+      s++;
+    else
+      return 0;
+
+  return 1;
+}
+
 /**
  * @brief Test if a username is valid for a credential export format.
  *
@@ -41569,7 +41668,7 @@ validate_credential_username_for_format (const gchar *username,
  * @param[in]  allow_insecure  Whether to allow insecure uses.
  * @param[out] credential      Created Credential.
  *
- * @return 0 success, 1 LSC credential exists already, 2 name contains space,
+ * @return 0 success, 1 LSC credential exists already, 2 invalid username,
  *         3 Failed to create public key from private key/password,
  *         4 Invalid credential type, 5 login username missing,
  *         6 password missing, 7 private key missing, 8 certificate missing,
@@ -41753,8 +41852,21 @@ create_credential (const char* name, const char* comment, const char* login,
 
   /* Add non-secret data */
   if (login)
-    set_credential_data (new_credential,
-                         "username", login);
+    {
+      /*
+       * Ensure the login does not contain characters that cause problems
+       *  with package generation.
+       */
+      if (validate_credential_username (login) == 0)
+        {
+          sql_rollback ();
+          return 2;
+        }
+
+      set_credential_data (new_credential,
+                           "username", login);
+    }
+
   if (key_public)
     set_credential_data (new_credential, "public_key", key_public);
 
@@ -41766,7 +41878,10 @@ create_credential (const char* name, const char* comment, const char* login,
         set_credential_data (new_credential,
                              "certificate", certificate_truncated);
       else
-        return 17;
+        {
+          sql_rollback();
+          return 17;
+        }
       g_free (certificate_truncated);
     }
   if (auth_algorithm)
@@ -41923,23 +42038,6 @@ create_credential (const char* name, const char* comment, const char* login,
    * Auto-generate credential
    */
 
-  /* Ensure the login is alphanumeric, to help the package generation. */
-
-  if (login)
-    {
-      const char *s;
-      s = login;
-      while (*s)
-        if (isalnum (*s))
-          s++;
-        else
-          {
-            g_free (quoted_name);
-            sql_rollback ();
-            return 2;
-          }
-    }
-
   /* Create the keys and packages. */
 
   rand = g_rand_new ();
@@ -42146,16 +42244,13 @@ modify_credential (const char *credential_id,
 
   if (login && ret == 0)
     {
-      const char *s;
-      s = login;
-      // Check if login contains only alphanumeric characters
-      if (strcmp (login, "") == 0)
+      /*
+       * Ensure the login is not empty and does not contain characters that
+       *  cause problems with package generation.
+       */
+      if (strcmp (login, "") == 0
+          || validate_credential_username (login) == 0)
         ret = 4;
-      while (*s && ret == 0)
-        if (isalnum (*s))
-          s++;
-        else
-          ret = 4;
 
       if (ret == 0)
         set_credential_login (credential, login);
@@ -49769,6 +49864,20 @@ schedule_uuid (schedule_t schedule)
                      schedule);
 }
 
+/**
+ * @brief Return the UUID of a trash schedule.
+ *
+ * @param[in]  schedule  Schedule.
+ *
+ * @return Newly allocated UUID.
+ */
+char *
+trash_schedule_uuid (schedule_t schedule)
+{
+  return sql_string ("SELECT uuid FROM schedules_trash WHERE id = %llu;",
+                     schedule);
+}
+
 /**
  * @brief Return the name of a schedule.
  *
@@ -49783,6 +49892,20 @@ schedule_name (schedule_t schedule)
                      schedule);
 }
 
+/**
+ * @brief Return the name of a trash schedule.
+ *
+ * @param[in]  schedule  Schedule.
+ *
+ * @return Newly allocated name.
+ */
+char *
+trash_schedule_name (schedule_t schedule)
+{
+  return sql_string ("SELECT name FROM schedules_trash WHERE id = %llu;",
+                     schedule);
+}
+
 /**
  * @brief Return the period of a schedule.
  *
@@ -57674,9 +57797,9 @@ port_list_in_use (port_list_t port_list)
   if (port_list_is_predefined (port_list))
     return 1;
 
-  return sql_int ("SELECT count(*) FROM targets"
-                  " WHERE port_list = %llu",
-                  port_list);
+  return !!sql_int ("SELECT count(*) FROM targets"
+                    " WHERE port_list = %llu",
+                    port_list);
 }
 
 /**
@@ -57689,11 +57812,11 @@ port_list_in_use (port_list_t port_list)
 int
 trash_port_list_in_use (port_list_t port_list)
 {
-  return (sql_int ("SELECT count (*) FROM targets_trash"
-                   " WHERE port_list = %llu"
-                   " AND port_list_location = "
-                   G_STRINGIFY (LOCATION_TRASH) ";",
-                   port_list) > 0);
+  return !!sql_int ("SELECT count (*) FROM targets_trash"
+                    " WHERE port_list = %llu"
+                    " AND port_list_location = "
+                    G_STRINGIFY (LOCATION_TRASH) ";",
+                    port_list);
 }
 
 /**
@@ -63595,7 +63718,7 @@ modify_setting (const gchar *uuid, const gchar *name,
       if (value_64 && strlen (value_64))
         {
           value = (gchar*) g_base64_decode (value_64, &value_size);
-          if (g_utf8_validate (value, value_size, NULL))
+          if (g_utf8_validate (value, value_size, NULL) == FALSE)
             {
               if (r_errdesc)
                 *r_errdesc = g_strdup ("Value cannot be decoded to"
@@ -63630,7 +63753,7 @@ modify_setting (const gchar *uuid, const gchar *name,
       if (value_64 && strlen (value_64))
         {
           value = (gchar*) g_base64_decode (value_64, &value_size);
-          if (g_utf8_validate (value, value_size, NULL))
+          if (g_utf8_validate (value, value_size, NULL) == FALSE)
             {
               if (r_errdesc)
                 *r_errdesc = g_strdup ("Value cannot be decoded to"
@@ -63684,7 +63807,7 @@ modify_setting (const gchar *uuid, const gchar *name,
       if (value_64 && strlen (value_64))
         {
           value = (gchar*) g_base64_decode (value_64, &value_size);
-          if (g_utf8_validate (value, value_size, NULL))
+          if (g_utf8_validate (value, value_size, NULL) == FALSE)
             {
               if (r_errdesc)
                 *r_errdesc = g_strdup ("Value cannot be decoded to"
@@ -63859,7 +63982,7 @@ modify_setting (const gchar *uuid, const gchar *name,
       if (value_64 && strlen (value_64))
         {
           value = (gchar*) g_base64_decode (value_64, &value_size);
-          if (g_utf8_validate (value, value_size, NULL))
+          if (g_utf8_validate (value, value_size, NULL) == FALSE)
             {
               if (r_errdesc)
                 *r_errdesc = g_strdup ("Value cannot be decoded to"
@@ -63932,8 +64055,14 @@ modify_setting (const gchar *uuid, const gchar *name,
         setting_name = g_strdup ("Credentials Filter");
       else if (strcmp (uuid, "f9691163-976c-47e7-ad9a-38f2d5c81649") == 0)
         setting_name = g_strdup ("Filters Filter");
+      else if (strcmp (uuid, "f722e5a4-88d8-475f-95b9-e4dcafbc075b") == 0)
+        setting_name = g_strdup ("Groups Filter");
+      else if (strcmp (uuid, "37562dfe-1f7e-4cae-a7c0-fa95e6f194c5") == 0)
+        setting_name = g_strdup ("Hosts Filter");
       else if (strcmp (uuid, "96abcd5a-9b6d-456c-80b8-c3221bfa499d") == 0)
         setting_name = g_strdup ("Notes Filter");
+      else if (strcmp (uuid, "f608c3ec-ce73-4ff6-8e04-7532749783af") == 0)
+        setting_name = g_strdup ("Operating Systems Filter");
       else if (strcmp (uuid, "eaaaebf1-01ef-4c49-b7bb-955461c78e0a") == 0)
         setting_name = g_strdup ("Overrides Filter");
       else if (strcmp (uuid, "ffb16b28-538c-11e3-b8f9-406186ea4fc5") == 0)
@@ -63948,6 +64077,8 @@ modify_setting (const gchar *uuid, const gchar *name,
         setting_name = g_strdup ("Results Filter");
       else if (strcmp (uuid, "f38e673a-bcd1-11e2-a19a-406186ea4fc5") == 0)
         setting_name = g_strdup ("Roles Filter");
+      else if (strcmp (uuid, "ba00fe91-bdce-483c-b8df-2372e9774ad6") == 0)
+        setting_name = g_strdup ("Scanners Filter");
       else if (strcmp (uuid, "a83e321b-d994-4ae8-beec-bfb5fe3e7336") == 0)
         setting_name = g_strdup ("Schedules Filter");
       else if (strcmp (uuid, "108eea3b-fc61-483c-9da9-046762f137a8") == 0)
@@ -63956,6 +64087,12 @@ modify_setting (const gchar *uuid, const gchar *name,
         setting_name = g_strdup ("Targets Filter");
       else if (strcmp (uuid, "1c981851-8244-466c-92c4-865ffe05e721") == 0)
         setting_name = g_strdup ("Tasks Filter");
+      else if (strcmp (uuid, "801544de-f06d-4377-bb77-bbb23369bad4") == 0)
+        setting_name = g_strdup ("Tickets Filter");
+      else if (strcmp (uuid, "a33635be-7263-4549-bd80-c04d2dba89b4") == 0)
+        setting_name = g_strdup ("Users Filter");
+      else if (strcmp (uuid, "17c9d269-95e7-4bfa-b1b2-bc106a2175c7") == 0)
+        setting_name = g_strdup ("Vulnerabilities Filter");
       else if (strcmp (uuid, "3414a107-ae46-4dea-872d-5c4479a48e8f") == 0)
         setting_name = g_strdup ("CPE Filter");
       else if (strcmp (uuid, "def63b5a-41ef-43f4-b9ef-03ef1665db5d") == 0)
@@ -64119,7 +64256,7 @@ modify_setting (const gchar *uuid, const gchar *name,
       if (value_64 && strlen (value_64))
         {
           value = (gchar*) g_base64_decode (value_64, &value_size);
-          if (g_utf8_validate (value, value_size, NULL))
+          if (g_utf8_validate (value, value_size, NULL) == FALSE)
             {
               if (r_errdesc)
                 *r_errdesc = g_strdup ("Value cannot be decoded to"
@@ -64865,7 +65002,7 @@ create_user (const gchar * name, const gchar * password, const gchar *comment,
              gchar **group_id_return, array_t *roles, gchar **role_id_return,
              gchar **r_errdesc, user_t *new_user, int forbid_super_admin)
 {
-  char *errstr;
+  char *errstr, *uuid;
   gchar *quoted_hosts, *quoted_ifaces, *quoted_method, *quoted_name, *hash;
   gchar *quoted_comment, *clean, *generated;
   int index, max;
@@ -65070,6 +65207,28 @@ create_user (const gchar * name, const gchar * password, const gchar *comment,
   if (new_user)
     *new_user = user;
 
+  /* Ensure the user can see themself. */
+
+  uuid = user_uuid (user);
+  if (uuid == NULL)
+    {
+      g_warning ("%s: Failed to allocate UUID", __FUNCTION__);
+      sql_rollback ();
+      return -1;
+    }
+
+  create_permission_internal ("GET_USERS",
+                              "Automatically created when adding user",
+                              NULL,
+                              uuid,
+                              "user",
+                              uuid,
+                              NULL);
+
+  free (uuid);
+
+  /* Cache permissions. */
+
   cache_users = g_array_new (TRUE, TRUE, sizeof (user_t));
   g_array_append_val (cache_users, user);
   cache_all_permissions_for_users (cache_users);
@@ -65098,6 +65257,7 @@ copy_user (const char* name, const char* comment, const char *user_id,
   int ret;
   gchar *quoted_uuid;
   GArray *cache_users;
+  char *uuid;
 
   if (acl_user_can_super_everyone (user_id))
     return 99;
@@ -65132,6 +65292,28 @@ copy_user (const char* name, const char* comment, const char *user_id,
 
   g_free (quoted_uuid);
 
+  /* Ensure the user can see themself. */
+
+  uuid = user_uuid (user);
+  if (uuid == NULL)
+    {
+      g_warning ("%s: Failed to allocate UUID", __FUNCTION__);
+      sql_rollback ();
+      return -1;
+    }
+
+  create_permission_internal ("GET_USERS",
+                              "Automatically created when adding user",
+                              NULL,
+                              uuid,
+                              "user",
+                              uuid,
+                              NULL);
+
+  free (uuid);
+
+  /* Cache permissions. */
+
   cache_users = g_array_new (TRUE, TRUE, sizeof (user_t));
   g_array_append_val (cache_users, user);
   cache_all_permissions_for_users (cache_users);
@@ -66827,11 +67009,15 @@ vuln_iterator_opts_from_filter (const gchar *filter)
   int min_qod;
   gchar *ret;
 
-  assert (filter);
+  if (filter)
+    {
+      task_id = filter_term_value (filter, "task_id");
+      report_id = filter_term_value (filter, "report_id");
+      host = filter_term_value (filter, "host");
+    }
+  else
+    task_id = report_id = host = NULL;
 
-  task_id = filter_term_value (filter, "task_id");
-  report_id = filter_term_value (filter, "report_id");
-  host = filter_term_value (filter, "host");
   min_qod = filter_term_min_qod (filter);
 
   ret = vuln_iterator_opts_table (task_id, report_id, host, min_qod);
@@ -67387,18 +67573,66 @@ tag_add_resources_filter (tag_t tag, const char *type, const char *filter)
   get_data_t resources_get;
   int ret;
 
+  memset (&resources_get, '\0', sizeof (resources_get));
   resources_get.filter = g_strdup (filter);
   resources_get.filt_id = FILT_ID_NONE;
   resources_get.trash = LOCATION_TABLE;
   resources_get.type = g_strdup (type);
 
   ignore_max_rows_per_page = 1;
-  switch (type_build_select (type,
-                             "id, uuid",
-                             &resources_get, 0, 1, NULL, NULL, NULL,
-                             &filtered_select))
+  filtered_select = NULL;
+
+  if (strcasecmp (type, "TICKET") == 0)
+    {
+      /* TODO This is how it should be done for all types, in order
+       * to contain each per-resource implementation in its own file. */
+      if (init_ticket_iterator (&resources, &resources_get))
+        {
+          g_warning ("%s: Failed to build filter SELECT", __FUNCTION__);
+          sql_rollback ();
+          g_free (resources_get.filter);
+          g_free (resources_get.type);
+          return -1;
+        }
+    }
+  else switch (type_build_select (type,
+                                  "id, uuid",
+                                  &resources_get, 0, 1, NULL, NULL, NULL,
+                                  &filtered_select))
     {
       case 0:
+        if (sql_int ("SELECT count(*) FROM (%s) AS filter_selection",
+                     filtered_select) == 0)
+          {
+            g_free (filtered_select);
+            return 2;
+          }
+
+        if (type_is_info_subtype (type))
+          init_iterator (&resources,
+                         "SELECT id, uuid FROM (%s) AS filter_selection"
+                         " WHERE NOT EXISTS"
+                         "  (SELECT * FROM tag_resources"
+                         "    WHERE resource_type = '%s'"
+                         "      AND resource_uuid = filter_selection.uuid"
+                         "      AND tag = %llu)",
+                         filtered_select,
+                         type,
+                         tag);
+        else
+          init_iterator (&resources,
+                         "SELECT id, uuid FROM (%s) AS filter_selection"
+                         " WHERE NOT EXISTS"
+                         "  (SELECT * FROM tag_resources"
+                         "    WHERE resource_type = '%s'"
+                         "      AND resource = filter_selection.id"
+                         "      AND resource_location = %d"
+                         "      AND tag = %llu)",
+                         filtered_select,
+                         type,
+                         LOCATION_TABLE,
+                         tag);
+
         break;
       default:
         ignore_max_rows_per_page = 0;
@@ -67413,49 +67647,24 @@ tag_add_resources_filter (tag_t tag, const char *type, const char *filter)
   g_free (resources_get.filter);
   g_free (resources_get.type);
 
-  if (sql_int ("SELECT count(*) FROM (%s) AS filter_selection",
-               filtered_select) == 0)
-    {
-      g_free (filtered_select);
-      return 2;
-    }
-
-  if (type_is_info_subtype (type))
-    init_iterator (&resources,
-                   "SELECT id, uuid FROM (%s) AS filter_selection"
-                   " WHERE NOT EXISTS"
-                   "  (SELECT * FROM tag_resources"
-                   "    WHERE resource_type = '%s'"
-                   "      AND resource_uuid = filter_selection.uuid"
-                   "      AND tag = %llu)",
-                   filtered_select,
-                   type,
-                   tag);
-  else
-    init_iterator (&resources,
-                   "SELECT id, uuid FROM (%s) AS filter_selection"
-                   " WHERE NOT EXISTS"
-                   "  (SELECT * FROM tag_resources"
-                   "    WHERE resource_type = '%s'"
-                   "      AND resource = filter_selection.id"
-                   "      AND resource_location = %d"
-                   "      AND tag = %llu)",
-                   filtered_select,
-                   type,
-                   LOCATION_TABLE,
-                   tag);
-
-  ret = 0;
-  while (next (&resources) && ret == 0)
+  ret = 2;
+  while (next (&resources))
     {
       resource_t resource;
       const char *current_uuid;
+      int add_ret;
 
       resource = iterator_int64 (&resources, 0);
       current_uuid = iterator_string (&resources, 1);
 
-     ret = tag_add_resource (tag, type, current_uuid, resource,
-                             LOCATION_TABLE, 0);
+      add_ret = tag_add_resource (tag, type, current_uuid, resource,
+                                  LOCATION_TABLE, 0);
+      if (add_ret)
+        {
+          ret = add_ret;
+          break;
+        }
+      ret = 0;
     }
   cleanup_iterator (&resources);
 
@@ -67522,18 +67731,36 @@ tag_remove_resources_filter (tag_t tag, const char *type, const char *filter)
   get_data_t resources_get;
   int ret;
 
+  memset (&resources_get, '\0', sizeof (resources_get));
   resources_get.filter = g_strdup (filter);
   resources_get.filt_id = FILT_ID_NONE;
   resources_get.trash = LOCATION_TABLE;
   resources_get.type = g_strdup (type);
 
   ignore_max_rows_per_page = 1;
-  switch (type_build_select (type,
-                             "id",
-                             &resources_get, 0, 1, NULL, NULL, NULL,
-                             &iterator_select))
+  iterator_select = NULL;
+
+  if (strcasecmp (type, "TICKET") == 0)
+    {
+      /* TODO This is how it should be done for all types, in order
+       * to contain each per-resource implementation in its own file. */
+      if (init_ticket_iterator (&resources, &resources_get))
+        {
+          ignore_max_rows_per_page = 0;
+          g_warning ("%s: Failed to init ticket iterator", __FUNCTION__);
+          sql_rollback ();
+          g_free (resources_get.filter);
+          g_free (resources_get.type);
+          return -1;
+        }
+    }
+  else switch (type_build_select (type,
+                                  "id",
+                                  &resources_get, 0, 1, NULL, NULL, NULL,
+                                  &iterator_select))
     {
       case 0:
+        init_iterator (&resources, "%s", iterator_select);
         break;
       default:
         ignore_max_rows_per_page = 0;
@@ -67548,7 +67775,6 @@ tag_remove_resources_filter (tag_t tag, const char *type, const char *filter)
   g_free (resources_get.filter);
   g_free (resources_get.type);
 
-  init_iterator (&resources, "%s", iterator_select);
   ret = 2;
   while (next (&resources))
     {
@@ -68463,7 +68689,6 @@ column_is_timestamp (const char* column)
               || strcmp (column, "updated") == 0));
 }
 
-// FIX
 /**
  * @brief Return the columns for a resource iterator.
  *
@@ -68474,62 +68699,106 @@ column_is_timestamp (const char* column)
 static column_t *
 type_select_columns (const char *type)
 {
-  static column_t task_columns[] = TASK_ITERATOR_COLUMNS;
-  static column_t report_columns[] = REPORT_ITERATOR_COLUMNS;
-  static column_t result_columns[] = RESULT_ITERATOR_COLUMNS;
-  static column_t result_columns_no_cert[] = RESULT_ITERATOR_COLUMNS_NO_CERT;
-  static column_t vuln_columns[] = VULN_ITERATOR_COLUMNS;
-  static column_t host_columns[] = HOST_ITERATOR_COLUMNS;
-  static column_t os_columns[] = OS_ITERATOR_COLUMNS;
+  static column_t agent_columns[] = AGENT_ITERATOR_COLUMNS;
+  static column_t alert_columns[] = ALERT_ITERATOR_COLUMNS;
   static column_t allinfo_columns[] = ALL_INFO_ITERATOR_COLUMNS;
+  static column_t cert_bund_adv_columns[] = CERT_BUND_ADV_INFO_ITERATOR_COLUMNS;
+  static column_t config_columns[] = CONFIG_ITERATOR_COLUMNS;
   static column_t cpe_columns[] = CPE_INFO_ITERATOR_COLUMNS;
+  static column_t credential_columns[] = CREDENTIAL_ITERATOR_COLUMNS;
   static column_t cve_columns[] = CVE_INFO_ITERATOR_COLUMNS;
-  static column_t cert_bund_adv_columns[] = CERT_BUND_ADV_INFO_ITERATOR_COLUMNS;
   static column_t dfn_cert_adv_columns[] = DFN_CERT_ADV_INFO_ITERATOR_COLUMNS;
+  static column_t filter_columns[] = FILTER_ITERATOR_COLUMNS;
+  static column_t group_columns[] = GROUP_ITERATOR_COLUMNS;
+  static column_t host_columns[] = HOST_ITERATOR_COLUMNS;
+  static column_t note_columns[] = NOTE_ITERATOR_COLUMNS;
   static column_t nvt_columns[] = NVT_ITERATOR_COLUMNS;
+  static column_t os_columns[] = OS_ITERATOR_COLUMNS;
   static column_t ovaldef_columns[] = OVALDEF_INFO_ITERATOR_COLUMNS;
-  static column_t alert_columns[] = ALERT_ITERATOR_COLUMNS;
-  static column_t note_columns[] = NOTE_ITERATOR_COLUMNS;
   static column_t override_columns[] = OVERRIDE_ITERATOR_COLUMNS;
+  static column_t permission_columns[] = PERMISSION_ITERATOR_COLUMNS;
+  static column_t port_list_columns[] = PORT_LIST_ITERATOR_COLUMNS;
+  static column_t report_columns[] = REPORT_ITERATOR_COLUMNS;
+  static column_t report_format_columns[] = REPORT_FORMAT_ITERATOR_COLUMNS;
+  static column_t result_columns[] = RESULT_ITERATOR_COLUMNS;
+  static column_t result_columns_no_cert[] = RESULT_ITERATOR_COLUMNS_NO_CERT;
+  static column_t role_columns[] = ROLE_ITERATOR_COLUMNS;
+  static column_t scanner_columns[] = SCANNER_ITERATOR_COLUMNS;
+  static column_t schedule_columns[] = SCHEDULE_ITERATOR_COLUMNS;
+  static column_t tag_columns[] = TAG_ITERATOR_COLUMNS;
+  static column_t target_columns[] = TARGET_ITERATOR_COLUMNS;
+  static column_t task_columns[] = TASK_ITERATOR_COLUMNS;
+  static column_t user_columns[] = USER_ITERATOR_COLUMNS;
+  static column_t vuln_columns[] = VULN_ITERATOR_COLUMNS;
 
   if (type == NULL)
     return NULL;
-  else if (strcasecmp (type, "TASK") == 0)
-    return task_columns;
-  else if (strcasecmp (type, "REPORT") == 0)
-    return report_columns;
-  else if (strcasecmp (type, "RESULT") == 0)
-    {
-      if (manage_cert_loaded ())
-        return result_columns;
-      return result_columns_no_cert;
-    }
-  else if (strcasecmp (type, "VULN") == 0)
-    return vuln_columns;
-  else if (strcasecmp (type, "HOST") == 0)
-    return host_columns;
-  else if (strcasecmp (type, "OS") == 0)
-    return os_columns;
-  else if (strcasecmp (type, "ALLINFO") == 0)
+  if (strcasecmp (type, "AGENT") == 0)
+    return agent_columns;
+  if (strcasecmp (type, "ALERT") == 0)
+    return alert_columns;
+  if (strcasecmp (type, "ALLINFO") == 0)
     return allinfo_columns;
-  else if (strcasecmp (type, "CPE") == 0)
+  if (strcasecmp (type, "CERT_BUND_ADV") == 0)
+    return cert_bund_adv_columns;
+  if (strcasecmp (type, "CONFIG") == 0)
+    return config_columns;
+  if (strcasecmp (type, "CPE") == 0)
     return cpe_columns;
-  else if (strcasecmp (type, "CVE") == 0)
+  if (strcasecmp (type, "CREDENTIAL") == 0)
+    return credential_columns;
+  if (strcasecmp (type, "CVE") == 0)
     return cve_columns;
-  else if (strcasecmp (type, "CERT_BUND_ADV") == 0)
-    return cert_bund_adv_columns;
-  else if (strcasecmp (type, "DFN_CERT_ADV") == 0)
+  if (strcasecmp (type, "DFN_CERT_ADV") == 0)
     return dfn_cert_adv_columns;
-  else if (strcasecmp (type, "NVT") == 0)
+  if (strcasecmp (type, "FILTER") == 0)
+    return filter_columns;
+  if (strcasecmp (type, "GROUP") == 0)
+    return group_columns;
+  if (strcasecmp (type, "HOST") == 0)
+    return host_columns;
+  if (strcasecmp (type, "NOTE") == 0)
+    return note_columns;
+  if (strcasecmp (type, "NVT") == 0)
     return nvt_columns;
-  else if (strcasecmp (type, "OVALDEF") == 0)
+  if (strcasecmp (type, "OS") == 0)
+    return os_columns;
+  if (strcasecmp (type, "OVALDEF") == 0)
     return ovaldef_columns;
-  else if (strcasecmp (type, "ALERT") == 0)
-    return alert_columns;
-  else if (strcasecmp (type, "NOTE") == 0)
-    return note_columns;
-  else if (strcasecmp (type, "OVERRIDE") == 0)
+  if (strcasecmp (type, "OVERRIDE") == 0)
     return override_columns;
+  if (strcasecmp (type, "PERMISSION") == 0)
+    return permission_columns;
+  if (strcasecmp (type, "PORT_LIST") == 0)
+    return port_list_columns;
+  if (strcasecmp (type, "REPORT") == 0)
+    return report_columns;
+  if (strcasecmp (type, "REPORT_FORMAT") == 0)
+    return report_format_columns;
+  if (strcasecmp (type, "RESULT") == 0)
+    {
+      if (manage_cert_loaded ())
+        return result_columns;
+      return result_columns_no_cert;
+    }
+  if (strcasecmp (type, "ROLE") == 0)
+    return role_columns;
+  if (strcasecmp (type, "SCANNER") == 0)
+    return scanner_columns;
+  if (strcasecmp (type, "SCHEDULE") == 0)
+    return schedule_columns;
+  if (strcasecmp (type, "TAG") == 0)
+    return tag_columns;
+  if (strcasecmp (type, "TARGET") == 0)
+    return target_columns;
+  if (strcasecmp (type, "TASK") == 0)
+    return task_columns;
+  /* Tickets don't use this. */
+  assert (strcasecmp (type, "ticket"));
+  if (strcasecmp (type, "USER") == 0)
+    return user_columns;
+  if (strcasecmp (type, "VULN") == 0)
+    return vuln_columns;
   return NULL;
 }
 
@@ -68550,13 +68819,13 @@ type_where_columns (const char *type)
 
   if (type == NULL)
     return NULL;
-  else if (strcasecmp (type, "TASK") == 0)
+  if (strcasecmp (type, "TASK") == 0)
     return task_columns;
-  else if (strcasecmp (type, "REPORT") == 0)
+  if (strcasecmp (type, "REPORT") == 0)
     return report_columns;
-  else if (strcasecmp (type, "HOST") == 0)
+  if (strcasecmp (type, "HOST") == 0)
     return host_columns;
-  else if (strcasecmp (type, "OS") == 0)
+  if (strcasecmp (type, "OS") == 0)
     return os_columns;
   return NULL;
 }
@@ -68573,88 +68842,159 @@ type_filter_columns (const char *type)
 {
   if (type == NULL)
     return NULL;
-  else if (strcasecmp (type, "TASK") == 0)
+  if (strcasecmp (type, "AGENT") == 0)
     {
-      static const char *ret[] = TASK_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = AGENT_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "REPORT") == 0)
+  if (strcasecmp (type, "ALERT") == 0)
     {
-      static const char *ret[] = REPORT_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = ALERT_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "RESULT") == 0)
+  if (strcasecmp (type, "ALLINFO") == 0)
     {
-      static const char *ret[] = RESULT_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = ALL_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "VULN") == 0)
+  if (strcasecmp (type, "CERT_BUND_ADV") == 0)
     {
-      static const char *ret[] = VULN_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = CERT_BUND_ADV_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "HOST") == 0)
+  if (strcasecmp (type, "CONFIG") == 0)
     {
-      static const char *ret[] = HOST_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = CONFIG_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "OS") == 0)
+  if (strcasecmp (type, "CREDENTIAL") == 0)
     {
-      static const char *ret[] = OS_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = CREDENTIAL_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "ALLINFO") == 0)
+  if (strcasecmp (type, "CPE") == 0)
     {
-      static const char *ret[] = ALL_INFO_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = CPE_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "CPE") == 0)
+  if (strcasecmp (type, "CVE") == 0)
     {
-      static const char *ret[] = CPE_INFO_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = CVE_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "CVE") == 0)
+  if (strcasecmp (type, "DFN_CERT_ADV") == 0)
     {
-      static const char *ret[] = CVE_INFO_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = DFN_CERT_ADV_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "CERT_BUND_ADV") == 0)
+  if (strcasecmp (type, "FILTER") == 0)
     {
-      static const char *ret[] = CERT_BUND_ADV_INFO_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = FILTER_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "DFN_CERT_ADV") == 0)
+  if (strcasecmp (type, "GROUP") == 0)
     {
-      static const char *ret[] = DFN_CERT_ADV_INFO_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = GROUP_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "HOST") == 0)
+    {
+      static const char *ret[] = HOST_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "NVT") == 0)
+  if (strcasecmp (type, "NOTE") == 0)
+    {
+      static const char *ret[] = NOTE_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "NVT") == 0)
     {
       static const char *ret[] = NVT_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "OVALDEF") == 0)
+  if (strcasecmp (type, "OS") == 0)
+    {
+      static const char *ret[] = OS_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "OVALDEF") == 0)
     {
       static const char *ret[] = OVALDEF_INFO_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "ALERT") == 0)
+  if (strcasecmp (type, "OVERRIDE") == 0)
     {
-      static const char *ret[] = ALERT_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = OVERRIDE_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "NOTE") == 0)
+  if (strcasecmp (type, "PERMISSION") == 0)
     {
-      static const char *ret[] = NOTE_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = PERMISSION_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else if (strcasecmp (type, "OVERRIDE") == 0)
+  if (strcasecmp (type, "PORT_LIST") == 0)
     {
-      static const char *ret[] = OVERRIDE_ITERATOR_FILTER_COLUMNS;
+      static const char *ret[] = PORT_LIST_ITERATOR_FILTER_COLUMNS;
       return ret;
     }
-  else
-    return NULL;
+  if (strcasecmp (type, "REPORT") == 0)
+    {
+      static const char *ret[] = REPORT_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "REPORT_FORMAT") == 0)
+    {
+      static const char *ret[] = REPORT_FORMAT_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "RESULT") == 0)
+    {
+      static const char *ret[] = RESULT_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "ROLE") == 0)
+    {
+      static const char *ret[] = ROLE_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "SCANNER") == 0)
+    {
+      static const char *ret[] = SCANNER_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "SCHEDULE") == 0)
+    {
+      static const char *ret[] = SCHEDULE_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "TAG") == 0)
+    {
+      static const char *ret[] = TAG_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "TARGET") == 0)
+    {
+      static const char *ret[] = TARGET_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "TASK") == 0)
+    {
+      static const char *ret[] = TASK_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  /* Tickets don't use this. */
+  assert (strcasecmp (type, "ticket"));
+  if (strcasecmp (type, "USER") == 0)
+    {
+      static const char *ret[] = USER_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  if (strcasecmp (type, "VULN") == 0)
+    {
+      static const char *ret[] = VULN_ITERATOR_FILTER_COLUMNS;
+      return ret;
+    }
+  return NULL;
 
 }
 
@@ -68671,23 +69011,17 @@ type_opts_table (const char *type, const char *filter)
 {
   if (type == NULL)
     return NULL;
-  else if (strcasecmp (type, "TASK") == 0)
-    {
-      return task_iterator_opts_table (filter_term_apply_overrides (filter),
-                                       filter_term_min_qod (filter), 0);
-    }
-  else if (strcasecmp (type, "REPORT") == 0)
-    {
-      return report_iterator_opts_table (filter_term_apply_overrides (filter),
-                                         filter_term_min_qod (filter));
-    }
-  else if (strcasecmp (type, "RESULT") == 0)
-    {
-      return result_iterator_opts_table (filter_term_autofp (filter),
-                                         filter_term_apply_overrides (filter),
-                                         setting_dynamic_severity_int ());
-    }
-  else if (strcasecmp (type, "VULN") == 0)
+  if (strcasecmp (type, "TASK") == 0)
+    return task_iterator_opts_table (filter_term_apply_overrides (filter),
+                                     filter_term_min_qod (filter), 0);
+  if (strcasecmp (type, "REPORT") == 0)
+    return report_iterator_opts_table (filter_term_apply_overrides (filter),
+                                       filter_term_min_qod (filter));
+  if (strcasecmp (type, "RESULT") == 0)
+    return result_iterator_opts_table (filter_term_autofp (filter),
+                                       filter_term_apply_overrides (filter),
+                                       setting_dynamic_severity_int ());
+  if (strcasecmp (type, "VULN") == 0)
     {
       gchar *task_id, *report_id, *host;
       gchar *ret;
@@ -68705,8 +69039,7 @@ type_opts_table (const char *type, const char *filter)
 
       return ret;
     }
-  else
-    return NULL;
+  return NULL;
 }
 
 /**
@@ -68722,20 +69055,13 @@ type_table (const char *type, int trash)
 {
   if (type == NULL)
     return NULL;
-  else if (strcasecmp (type, "ALLINFO") == 0)
-    {
-      return g_strdup (ALL_INFO_UNION_COLUMNS);
-    }
-  else if (trash && type_trash_in_table (type) == 0)
-    {
-      return g_strdup_printf ("%ss_trash", type);
-    }
-  else if (trash == 0 || type_trash_in_table (type))
-    {
-      return g_strdup_printf ("%ss", type);
-    }
-  else
-    return NULL;
+  if (strcasecmp (type, "ALLINFO") == 0)
+    return g_strdup (ALL_INFO_UNION_COLUMNS);
+  if (trash && type_trash_in_table (type) == 0)
+    return g_strdup_printf ("%ss_trash", type);
+  if (trash == 0 || type_trash_in_table (type))
+    return g_strdup_printf ("%ss", type);
+  return NULL;
 }
 
 /**
@@ -68856,6 +69182,9 @@ type_build_select (const char *type, const char *columns_str,
   where_columns = type_where_columns (type);
   filter_columns = type_filter_columns (type);
 
+  if (filter_columns == NULL)
+    return -1;
+
   clause = filter_clause (type, filter ? filter : get->filter, filter_columns,
                           select_columns, where_columns, get->trash,
                           &filter_order, &first, &max, &permissions,
diff --git a/src/manage_sql_nvts.c b/src/manage_sql_nvts.c
index bd2f8c705..1fe1ec607 100644
--- a/src/manage_sql_nvts.c
+++ b/src/manage_sql_nvts.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Greenbone Networks GmbH
+/* Copyright (C) 2009-2019 Greenbone Networks GmbH
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
@@ -136,9 +136,6 @@ set_nvts_feed_version (const char *feed_version)
        sql_schema (),
        quoted);
   g_free (quoted);
-
-  sql ("UPDATE %s.meta SET value = 1 WHERE name = 'update_nvti_cache';",
-       sql_schema ());
 }
 
 /**
@@ -196,6 +193,7 @@ make_nvt_from_nvti (const nvti_t *nvti)
   gchar *quoted_cve, *quoted_bid, *quoted_xref, *quoted_tag;
   gchar *quoted_cvss_base, *quoted_qod_type, *quoted_family, *value;
   gchar *quoted_solution_type;
+  gchar *cve, *bid, *xref;
 
   int creation_time, modification_time, qod;
 
@@ -209,10 +207,16 @@ make_nvt_from_nvti (const nvti_t *nvti)
   else
     chunk_count++;
 
+  cve = nvti_refs (nvti, "cve", "", 0);
+  bid = nvti_refs (nvti, "bid", "", 0);
+  xref = nvti_refs (nvti, NULL, "cve,bid", 1);
   quoted_name = sql_quote (nvti_name (nvti) ? nvti_name (nvti) : "");
-  quoted_cve = sql_quote (nvti_cve (nvti) ? nvti_cve (nvti) : "");
-  quoted_bid = sql_quote (nvti_bid (nvti) ? nvti_bid (nvti) : "");
-  quoted_xref = sql_quote (nvti_xref (nvti) ? nvti_xref (nvti) : "");
+  quoted_cve = sql_quote (cve ? cve : "");
+  quoted_bid = sql_quote (bid ? bid : "");
+  quoted_xref = sql_quote (xref ? xref : "");
+  g_free (cve);
+  g_free (bid);
+  g_free (xref);
   if (nvti_tag (nvti))
     {
       const char *tags;
@@ -800,36 +804,6 @@ DEF_ACCESS (nvt_iterator_oid, GET_ITERATOR_COLUMN_COUNT);
  */
 DEF_ACCESS (nvt_iterator_name, GET_ITERATOR_COLUMN_COUNT + 2);
 
-/**
- * @brief Get the cve from an NVT iterator.
- *
- * @param[in]  iterator  Iterator.
- *
- * @return Cve, or NULL if iteration is complete.  Freed by
- *         cleanup_iterator.
- */
-DEF_ACCESS (nvt_iterator_cve, GET_ITERATOR_COLUMN_COUNT + 3);
-
-/**
- * @brief Get the bid from an NVT iterator.
- *
- * @param[in]  iterator  Iterator.
- *
- * @return Bid, or NULL if iteration is complete.  Freed by
- *         cleanup_iterator.
- */
-DEF_ACCESS (nvt_iterator_bid, GET_ITERATOR_COLUMN_COUNT + 4);
-
-/**
- * @brief Get the xref from an NVT iterator.
- *
- * @param[in]  iterator  Iterator.
- *
- * @return Xref, or NULL if iteration is complete.  Freed by
- *         cleanup_iterator.
- */
-DEF_ACCESS (nvt_iterator_xref, GET_ITERATOR_COLUMN_COUNT + 5);
-
 /**
  * @brief Get the tag from an NVT iterator.
  *
@@ -907,9 +881,7 @@ char *
 nvt_default_timeout (const char* oid)
 {
   return sql_string ("SELECT value FROM nvt_preferences"
-                     " WHERE name = (SELECT name FROM nvts"
-                     "               WHERE oid = '%s')"
-                     "              || ':entry:Timeout'",
+                     " WHERE name = '%s:0:entry:Timeout'",
                      oid);
 }
 
@@ -1085,6 +1057,41 @@ refresh_nvt_cves ()
     sql ("REINDEX nvt_cves_by_oid;");
 }
 
+/**
+ * @brief Update config preferences that don't have a preference ID.
+ */
+static void
+update_old_config_preferences ()
+{
+  iterator_t nvt_prefs;
+
+  init_iterator (&nvt_prefs, "SELECT name FROM nvt_preferences;");
+  while (next (&nvt_prefs))
+    {
+      char **splits, *quoted_name, *quoted_pref_name;
+      const char *pref_name = iterator_string (&nvt_prefs, 0);
+
+      if (!strstr (pref_name, ":"))
+        continue;
+      splits = g_strsplit (pref_name, ":", 4);
+      if (!splits || !splits[0] || !splits[1] || !splits[2] || !splits[3])
+        {
+          g_warning ("%s: Erroneous NVT preference '%s'", __FUNCTION__, pref_name);
+          g_strfreev (splits);
+          continue;
+        }
+      quoted_pref_name = sql_quote (pref_name);
+      quoted_name = sql_quote (splits[3]);
+      sql ("UPDATE config_preferences SET name = '%s'"
+           " WHERE name = '%s:%s:%s';",
+           quoted_pref_name, splits[0], splits[2], quoted_name);
+      g_free (quoted_pref_name);
+      g_free (quoted_name);
+      g_strfreev (splits);
+    }
+  cleanup_iterator (&nvt_prefs);
+}
+
 /**
  * @brief Complete an update of the NVT cache.
  *
@@ -1120,7 +1127,9 @@ manage_complete_nvt_cache_update (GList *nvts_list, GList *nvt_preferences_list)
   sql_begin_immediate ();
 
   /* Remove preferences from configs where the preference has vanished from
-   * the associated NVT. */
+   * the associated NVT. Update the ones that don't have a preference ID before
+   * that. */
+  update_old_config_preferences ();
   init_iterator (&configs, "SELECT id FROM configs;");
   while (next (&configs))
     sql ("DELETE FROM config_preferences"
@@ -1156,6 +1165,10 @@ manage_complete_nvt_cache_update (GList *nvts_list, GList *nvt_preferences_list)
 
   sql_commit ();
 
+  /* Tell the main process to update its NVTi cache. */
+  sql ("UPDATE %s.meta SET value = 1 WHERE name = 'update_nvti_cache';",
+       sql_schema ());
+
   count = sql_int ("SELECT count (*) FROM nvts;");
   g_info ("Updating NVT cache... done (%i NVTs).", count);
 }
diff --git a/src/manage_sql_tickets.c b/src/manage_sql_tickets.c
index 10b1acdcf..971ad5d6f 100644
--- a/src/manage_sql_tickets.c
+++ b/src/manage_sql_tickets.c
@@ -1517,21 +1517,24 @@ check_tickets (task_t task)
                  "                                        WHERE ticket = tickets.id"
                  "                                        AND result_location = %i"
                  "                                        LIMIT 1)))"
-                 /* Only if there were no login failures. */
-                 " AND NOT EXISTS (SELECT * FROM results"
-                 "                 WHERE report = %llu"
-                 /*                SSH Login Failed For Authenticated Checks. */
-                 "                 AND nvt = '1.3.6.1.4.1.25623.1.0.105936')"
-                 " AND NOT EXISTS (SELECT * FROM results"
-                 "                 WHERE report = %llu"
-                 /*                SMB Login Failed For Authenticated Checks. */
-                 "                 AND nvt = '1.3.6.1.4.1.25623.1.0.106091');",
+                 /* Only if there were no login failures on the host. */
+                 " AND NOT EXISTS (SELECT * FROM report_host_details"
+                 "                 WHERE report_host = (SELECT id"
+                 "                                      FROM report_hosts"
+                 "                                      WHERE report = %llu"
+                 "                                      AND report_hosts.host"
+                 "                                          = tickets.host"
+                 "                                      LIMIT 1)"
+                 "                 AND (name = 'Auth-SSH-Failure'"
+                 "                      OR name = 'Auth-SMB-Failure'"
+                 "                      OR name = 'Auth-SNMP-Failure'"
+                 "                      OR name = 'Auth-ESXi-Failure'));",
                  task,
                  TICKET_STATUS_OPEN,
                  TICKET_STATUS_FIXED,
                  report,
-                 LOCATION_TABLE,
                  report,
+                 LOCATION_TABLE,
                  report);
   while (next (&tickets))
     {
diff --git a/src/manage_sqlite3.c b/src/manage_sqlite3.c
index 8bfd48a29..2529de193 100644
--- a/src/manage_sqlite3.c
+++ b/src/manage_sqlite3.c
@@ -4009,7 +4009,7 @@ create_tables ()
        "              (SELECT id FROM nvts"
        "               WHERE oid = results.nvt"
        "               AND"
-       "               (cve = 'NOCVE'"
+       "               (cve = ''"
        "                 OR cve NOT IN (SELECT cve FROM nvts"
        "                                WHERE oid IN (SELECT source_name"
        "                                    FROM report_host_details"
@@ -4033,7 +4033,7 @@ create_tables ()
        "             (SELECT id FROM nvts AS outer_nvts"
        "              WHERE oid = results.nvt"
        "              AND"
-       "              (cve = 'NOCVE'"
+       "              (cve = ''"
        "               OR NOT EXISTS"
        "                  (SELECT cve FROM nvts"
        "                   WHERE oid IN (SELECT source_name"
diff --git a/src/manage_utils.c b/src/manage_utils.c
index 5915dce64..01ca23148 100644
--- a/src/manage_utils.c
+++ b/src/manage_utils.c
@@ -743,7 +743,7 @@ hosts_str_contains (const char* hosts_str, const char* find_host_str,
       return 0;
     }
 
-  int ret = gvm_host_in_hosts (find_hosts->hosts->data, NULL, hosts);
+  int ret = gvm_host_in_hosts (find_hosts->hosts[0], NULL, hosts);
   gvm_hosts_free (hosts);
   gvm_hosts_free (find_hosts);
   return ret;
diff --git a/src/otp.c b/src/otp.c
index d4553291b..461919de0 100644
--- a/src/otp.c
+++ b/src/otp.c
@@ -1260,19 +1260,25 @@ process_otp_scanner_input ()
                 }
               case SCANNER_PLUGIN_LIST_CVE_ID:
                 {
-                  nvti_set_cve (current_plugin, field);
+                  if (strcmp (field, "NOCVE"))
+                    nvti_add_refs (current_plugin, "cve", field, "");
+
                   set_scanner_state (SCANNER_PLUGIN_LIST_BUGTRAQ_ID);
                   break;
                 }
               case SCANNER_PLUGIN_LIST_BUGTRAQ_ID:
                 {
-                  nvti_set_bid (current_plugin, field);
+                  if (strcmp (field, "NOBID"))
+                    nvti_add_refs (current_plugin, "bid", field, "");
+
                   set_scanner_state (SCANNER_PLUGIN_LIST_XREFS);
                   break;
                 }
               case SCANNER_PLUGIN_LIST_XREFS:
                 {
-                  nvti_set_xref (current_plugin, field);
+                  if (strcmp (field, "NOXREF"))
+                    nvti_add_refs (current_plugin, NULL, field, "");
+
                   set_scanner_state (SCANNER_PLUGIN_LIST_TAGS);
                   switch (parse_scanner_plugin_list_tags (&messages))
                     {
@@ -1347,10 +1353,10 @@ process_otp_scanner_input ()
 
                   {
                     char **splits;
-                    /* OID:PrefType:PrefName value */
+                    /* OID:PrefID:PrefType:PrefName value */
 
-                    splits = g_strsplit (field, ":", 3);
-                    if (splits && g_strv_length (splits) == 3
+                    splits = g_strsplit (field, ":", 4);
+                    if (splits && g_strv_length (splits) == 4
                         && ((strcmp (splits[0], OID_SSH_AUTH) == 0)
                             || (strcmp (splits[0], OID_SNMP_AUTH) == 0)
                             || (strcmp (splits[0], OID_ESXI_AUTH) == 0)
diff --git a/src/report_formats/ARF/ARF.xsl b/src/report_formats/ARF/ARF.xsl
index 36537758f..f5e496dec 100644
--- a/src/report_formats/ARF/ARF.xsl
+++ b/src/report_formats/ARF/ARF.xsl
@@ -133,7 +133,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   <report id="{concat('report_', $ip)}">
     <content>
       <xsl:copy>
-        <xsl:for-each select="openvas:report()/results/result[host = $ip]">
+        <xsl:for-each select="openvas:report()/results/result[host/text() = $ip]">
           <xsl:copy-of select="."/>
         </xsl:for-each>
       </xsl:copy>
diff --git a/src/report_formats/Anonymous_XML/Anonymous_XML.xsl b/src/report_formats/Anonymous_XML/Anonymous_XML.xsl
index 7823683c4..d475abcf3 100644
--- a/src/report_formats/Anonymous_XML/Anonymous_XML.xsl
+++ b/src/report_formats/Anonymous_XML/Anonymous_XML.xsl
@@ -80,12 +80,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     </xsl:copy>
   </xsl:template>
 
+  <xsl:template match="host/detail[name = 'hostname_determination']/value" >
+    <xsl:copy>
+      <xsl:for-each select="str:tokenize(text (), ',')">
+        <xsl:choose>
+          <xsl:when test="position() = 1">
+            <xsl:value-of select="openvas:host (.)"/>
+          </xsl:when>
+          <xsl:when test="position() = 2">
+            <xsl:value-of select="concat (',', openvas:hostname (.))"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="concat (',', .)"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </xsl:copy>
+  </xsl:template>
+
   <xsl:template match="host/ip" >
     <xsl:copy>
       <xsl:value-of select="openvas:host (text ())"/>
     </xsl:copy>
   </xsl:template>
 
+  <xsl:template match="host/hostname" >
+    <xsl:copy>
+      <xsl:value-of select="openvas:hostname (text ())"/>
+    </xsl:copy>
+  </xsl:template>
+
   <xsl:template match="host/detail[name = 'traceroute']" >
   </xsl:template>
 
@@ -113,6 +137,57 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   <xsl:template match="scan/task/slave/name">
   </xsl:template>
 
+  <xsl:template match="filters/term" >
+    <xsl:copy>
+      <xsl:for-each select="str:tokenize(text (), ' ')">
+        <xsl:choose>
+          <xsl:when test="substring (., 1, 5) = 'host='">
+            <xsl:choose>
+              <xsl:when test="position() = 1">
+                <xsl:value-of select="concat ('host=', openvas:host (substring-after (., 'host=')))"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="concat (' host=', openvas:host (substring-after (., 'host=')))"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:when test="substring (., 1, 9) = 'hostname='">
+            <xsl:choose>
+              <xsl:when test="position() = 1">
+                <xsl:value-of select="concat ('hostname=', openvas:hostname (substring-after (., 'hostname=')))"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="concat (' hostname=', openvas:hostname (substring-after (., 'hostname=')))"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:choose>
+              <xsl:when test="position() = 1">
+                <xsl:value-of select="."/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="concat (' ', .)"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="filters/keywords/keyword[column = 'host']/value" >
+    <xsl:copy>
+      <xsl:value-of select="openvas:host (text ())"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="filters/keywords/keyword[column = 'hostname']/value" >
+    <xsl:copy>
+      <xsl:value-of select="openvas:hostname (text ())"/>
+    </xsl:copy>
+  </xsl:template>
+
   <xsl:template match="node()|@*" >
     <xsl:copy>
       <xsl:apply-templates select="node()|@*" />
diff --git a/src/report_formats/Anonymous_XML/report_format.xml b/src/report_formats/Anonymous_XML/report_format.xml
index e392e99d2..52dd6cbbb 100644
--- a/src/report_formats/Anonymous_XML/report_format.xml
+++ b/src/report_formats/Anonymous_XML/report_format.xml
@@ -2,7 +2,7 @@
   <name>Anonymous XML</name>
   <summary>Anonymous version of the raw XML report</summary>
   <description>
-    Complete scan report in OpenVAS Manager XML format.
+    Complete scan report in GMP XML format.
   </description>
   <extension>xml</extension>
   <content_type>text/xml</content_type>
diff --git a/src/report_formats/CPE/generate b/src/report_formats/CPE/generate
index 9d25145b5..261355d80 100755
--- a/src/report_formats/CPE/generate
+++ b/src/report_formats/CPE/generate
@@ -20,7 +20,7 @@
 # Report generator script: CPE.
 #
 # This report extracts the tables of identified
-# Common Product Enumerations from the given
+# Common Platform Enumerations from the given
 # XML scan report using a XSL transformation with
 # the tool xsltproc.
 
diff --git a/src/report_formats/CPE/report_format.xml b/src/report_formats/CPE/report_format.xml
index d8ba07779..4b11b641b 100644
--- a/src/report_formats/CPE/report_format.xml
+++ b/src/report_formats/CPE/report_format.xml
@@ -1,8 +1,8 @@
 <report_format id="5ceff8ba-1f62-11e1-ab9f-406186ea4fc5">
   <name>CPE</name>
-  <summary>Common Product Enumeration CSV table.</summary>
+  <summary>Common Platform Enumeration CSV table.</summary>
   <description>
-CPE stands for Common Product Enumeration.  It is a structured naming scheme for
+CPE stands for Common Platform Enumeration.  It is a structured naming scheme for
 information technology systems, platforms, and packages.  In other words: CPE
 provides a unique identifier for virtually any software product that is known for
 a vulnerability.
diff --git a/src/report_formats/CSV_Results/CSV_Results.xsl b/src/report_formats/CSV_Results/CSV_Results.xsl
index 59a8168f4..04662b7cc 100644
--- a/src/report_formats/CSV_Results/CSV_Results.xsl
+++ b/src/report_formats/CSV_Results/CSV_Results.xsl
@@ -127,28 +127,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   </xsl:choose>
 </xsl:template>
 
-<!-- Ensure NOCVE is removed -->
-<xsl:template name="cve">
-  <xsl:variable name="cve_list" select="translate(nvt/cve, ',', '')" />
-  <xsl:choose>
-    <xsl:when test="$cve_list = 'NOCVE'"/>
-    <xsl:otherwise>
-      <xsl:value-of select="$cve_list"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Ensure NOBID is removed -->
-<xsl:template name="bid">
-  <xsl:variable name="bid_list" select="translate(nvt/bid, ',', '')" />
-  <xsl:choose>
-    <xsl:when test="$bid_list = 'NOBID'"/>
-    <xsl:otherwise>
-      <xsl:value-of select="$bid_list"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
 <!-- Substitute "Open Port" if the NVT name is empty -->
 <xsl:template name="nvt_name">
   <xsl:variable name="name_without_single_quotes"
@@ -182,7 +160,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
 <!-- MATCH RESULT -->
 <xsl:template match="result">
-  <xsl:variable name="ip" select="host"/>
+  <xsl:variable name="ip" select="host/text()"/>
   <xsl:variable name="summary-tag" select="openvas:get-nvt-tag (nvt/tags, 'summary')"/>
   <xsl:variable name="summary">
     <xsl:choose>
@@ -232,9 +210,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   </xsl:choose>
   <xsl:text>",</xsl:text>
   <xsl:value-of select="openvas:formula_quote (nvt/@oid)"/>
-  <xsl:text>,"</xsl:text>
-  <xsl:value-of select="openvas:formula_quote (nvt/cve)"/>
+
+  <xsl:text>,"</xsl:text> <!-- column "CVEs" -->
+
+  <xsl:variable name="cell_cves">
+    <xsl:for-each select="nvt/refs/ref[@type = 'cve']">
+      <xsl:value-of select="str:replace (@id, $quote, $two-quotes)"/>
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="openvas:formula_quote (substring ($cell_cves, 0, string-length($cell_cves)))"/>
+
   <xsl:text>",</xsl:text>
+
   <xsl:value-of select="openvas:formula_quote (../../task/@id)"/>
   <xsl:text>,"</xsl:text>
   <xsl:value-of select="openvas:formula_quote (str:replace (../../task/name, $quote, $two-quotes))"/>
@@ -307,62 +295,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     <xsl:text>)</xsl:text>
     <xsl:call-template name="newline"/>
   </xsl:if>
-  <xsl:text>","</xsl:text>
-  <xsl:if test="nvt/bid != '' and nvt/bid != 'NOBID'">
-    <xsl:variable name="bidlist" select="nvt/bid/text()"/>
-    <xsl:variable name="bidcount" select="count (str:split($bidlist, ','))"/>
-    <xsl:variable name="new_bidlist">
-      <xsl:for-each select="str:split ($bidlist, ',')">
-        <xsl:value-of select="str:replace (., $quote, $two-quotes)"/>
-        <xsl:if test="position() &lt; $bidcount">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="openvas:formula_quote ($new_bidlist)"/>
-  </xsl:if>
-  <xsl:text>","</xsl:text>
-  <xsl:if test="count(nvt/cert/cert_ref) &gt; 0">
-    <xsl:variable name="certlist" select="nvt/cert"/>
-    <xsl:variable name="certcount" select="count ($certlist/cert_ref)"/>
-    <xsl:variable name="new_certlist">
-      <xsl:for-each select="$certlist/warning">
-        <xsl:text>Warning: </xsl:text>
-        <xsl:value-of select="str:replace (text(), $quote, $two-quotes)"/>
-        <xsl:call-template name="newline"/>
-      </xsl:for-each>
-      <xsl:if test="$certcount &gt; 0">
-        <xsl:for-each select="$certlist/cert_ref">
-          <xsl:value-of select="str:replace (@id, $quote, $two-quotes)"/>
-          <xsl:if test="position() &lt; $certcount">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:value-of select="openvas:formula_quote ($new_certlist)"/>
-  </xsl:if>
-  <xsl:text>","</xsl:text>
-  <xsl:if test="nvt/xref != '' and nvt/xref != 'NOXREF'">
-    <xsl:variable name="xreflist" select="nvt/xref/text()"/>
-    <xsl:variable name="xrefcount" select="count (str:split ($xreflist, ','))"/>
-    <xsl:variable name="new_xreflist">
-      <xsl:for-each select="str:split ($xreflist, ',')">
-        <xsl:choose>
-          <xsl:when test="contains(., 'URL:')">
-            <xsl:value-of select="str:replace (substring-after (., 'URL:'), $quote, $two-quotes)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="str:replace (., $quote, $two-quotes)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="position() &lt; $xrefcount">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:value-of select="openvas:formula_quote ($new_xreflist)"/>
-  </xsl:if>
+
+  <xsl:text>","</xsl:text> <!-- column "BIDs" -->
+
+  <xsl:variable name="cell_bids">
+    <xsl:for-each select="nvt/refs/ref[@type = 'bid']">
+      <xsl:value-of select="str:replace (@id, $quote, $two-quotes)"/>
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="openvas:formula_quote (substring ($cell_bids, 0, string-length($cell_bids)))"/>
+
+  <xsl:text>","</xsl:text> <!-- column "CERTs" -->
+
+  <xsl:variable name="cell_certs">
+    <xsl:for-each select="nvt/refs/ref[@type = 'dfn-cert']">
+      <xsl:value-of select="@id"/>
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+    <xsl:for-each select="nvt/refs/ref[@type = 'cert-bund']">
+      <xsl:value-of select="str:replace (@id, $quote, $two-quotes)"/>
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="openvas:formula_quote (substring ($cell_certs, 0, string-length($cell_certs)))"/>
+
+  <xsl:text>","</xsl:text> <!-- column "Other References" -->
+
+  <xsl:variable name="cell_urls">
+    <xsl:for-each select="nvt/refs/ref[@type = 'URL']">
+      <xsl:value-of select="str:replace (@id, $quote, $two-quotes)"/>
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="openvas:formula_quote (substring ($cell_urls, 0, string-length($cell_urls)))"/>
+
   <xsl:text>"</xsl:text>
   <xsl:text>
 </xsl:text>
diff --git a/src/report_formats/LaTeX/latex.xsl b/src/report_formats/LaTeX/latex.xsl
index 85181a1cc..ac662209a 100644
--- a/src/report_formats/LaTeX/latex.xsl
+++ b/src/report_formats/LaTeX/latex.xsl
@@ -568,15 +568,15 @@ advice given in each description, in order to rectify the issue.
       <xsl:with-param name="text" select="$host"/>
     </xsl:call-template>
     <xsl:text>&amp;</xsl:text>
-    <xsl:value-of select="count(../results/result[host=$host][threat/text()='High'])"/>
+    <xsl:value-of select="count(../results/result[host/text()=$host][threat/text()='High'])"/>
     <xsl:text>&amp;</xsl:text>
-    <xsl:value-of select="count(../results/result[host=$host][threat/text()='Medium'])"/>
+    <xsl:value-of select="count(../results/result[host/text()=$host][threat/text()='Medium'])"/>
     <xsl:text>&amp;</xsl:text>
-    <xsl:value-of select="count(../results/result[host=$host][threat/text()='Low'])"/>
+    <xsl:value-of select="count(../results/result[host/text()=$host][threat/text()='Low'])"/>
     <xsl:text>&amp;</xsl:text>
-    <xsl:value-of select="count(../results/result[host=$host][threat/text()='Log'])"/>
+    <xsl:value-of select="count(../results/result[host/text()=$host][threat/text()='Log'])"/>
     <xsl:text>&amp;</xsl:text>
-    <xsl:value-of select="count(../results/result[host=$host][threat/text()='False Positive'])"/>
+    <xsl:value-of select="count(../results/result[host/text()=$host][threat/text()='False Positive'])"/>
     <xsl:call-template name="latex-newline"/>
     <xsl:choose>
       <xsl:when test="$hostname">
@@ -750,7 +750,7 @@ advice given in each description, in order to rectify the issue.
     <xsl:for-each select="host"><xsl:call-template name="results-overview-table-single-host-row"/></xsl:for-each>
     <xsl:call-template name="latex-hline"/>
     <xsl:text>Total: </xsl:text>
-    <xsl:value-of select="count(openvas:report()/host_start)"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'High'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'Medium'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'Low'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'Log'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'False Positive'])"/><xsl:call-template name="latex-newline"/>
+    <xsl:value-of select="count(openvas:report()/host)"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'High'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'Medium'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'Low'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'Log'])"/>&amp;<xsl:value-of select="count(openvas:report()/results/result[threat = 'False Positive'])"/><xsl:call-template name="latex-newline"/>
     <xsl:call-template name="latex-hline"/>
     <xsl:text>\end{longtable}</xsl:text><xsl:call-template name="newline"/>
 
@@ -914,9 +914,9 @@ advice given in each description, in order to rectify the issue.
   <xsl:template name="single-host-overview-table-row">
     <xsl:param name="threat"/>
     <xsl:param name="host"/>
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:variable name="port_service" select="text()"/>
-        <xsl:if test="openvas:report()/results/result[host=$host][threat/text()=$threat][port=$port_service]">
+        <xsl:if test="openvas:report()/results/result[host/text()=$host][threat/text()=$threat][port=$port_service]">
           <xsl:call-template name="latex-hyperref">
             <xsl:with-param name="target" select="concat('port:', $host, ' ', $port_service, ' ', $threat)"/>
             <xsl:with-param name="text" select="$port_service"/>
@@ -1016,47 +1016,17 @@ advice given in each description, in order to rectify the issue.
 
   <!-- References box. -->
   <xsl:template name="references">
-    <xsl:variable name="cve_ref">
-      <xsl:if test="nvt/cve != '' and nvt/cve != 'NOCVE'">
-        <xsl:value-of select="nvt/cve/text()"/>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="bid_ref">
-      <xsl:if test="nvt/bid != '' and nvt/bid != 'NOBID'">
-        <xsl:value-of select="nvt/bid/text()"/>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="xref_ref">
-      <xsl:if test="nvt/xref != '' and nvt/xref != 'NOXREF'">
-        <xsl:value-of select="nvt/xref/text()"/>
-      </xsl:if>
-    </xsl:variable>
-
-    <xsl:if test="$cve_ref != '' or $bid_ref != '' or $xref_ref != ''">
+    <xsl:if test="count(nvt/refs/ref) &gt; 0">
       \hline
       <xsl:call-template name="latex-newline"/>
       <xsl:text>\textbf{References}</xsl:text>
       <xsl:call-template name="latex-newline"/>
-      <xsl:if test="$cve_ref != ''">
-        <xsl:call-template name="text-to-escaped-row">
-          <xsl:with-param name="string" select="concat('CVE: ', $cve_ref)"/>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="$bid_ref != ''">
-        <xsl:call-template name="text-to-escaped-row">
-          <xsl:with-param name="string" select="concat('BID:', $bid_ref)"/>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="$xref_ref != ''">
+
+      <xsl:for-each select="nvt/refs/ref">
         <xsl:call-template name="text-to-escaped-row">
-          <xsl:with-param name="string" select="'Other:'"/>
+          <xsl:with-param name="string" select="concat(@type, ': ', @id)"/>
         </xsl:call-template>
-        <xsl:for-each select="str:split($xref_ref, ',')">
-          <xsl:call-template name="text-to-escaped-row">
-            <xsl:with-param name="string" select="concat('  ', .)"/>
-          </xsl:call-template>
-        </xsl:for-each>
-      </xsl:if>
+      </xsl:for-each>
     </xsl:if>
   </xsl:template>
 
@@ -1155,11 +1125,11 @@ advice given in each description, in order to rectify the issue.
     <xsl:param name="host"/>
     <xsl:param name="port_service"/>
     <xsl:param name="threat"/>
-    <xsl:if test="openvas:report()/results/result[host=$host][threat/text()=$threat][port=$port_service]">
+    <xsl:if test="openvas:report()/results/result[host/text()=$host][threat/text()=$threat][port=$port_service]">
       <xsl:call-template name="latex-subsubsection"><xsl:with-param name="subsubsection_string" select="concat ($threat, ' ', $port_service)"/></xsl:call-template>
       <xsl:call-template name="latex-label"><xsl:with-param name="label_string" select="concat('port:', $host, ' ', $port_service, ' ', $threat)"/></xsl:call-template>
       <xsl:call-template name="newline"/>
-      <xsl:for-each select="openvas:report()/results/result[host=$host][threat/text()=$threat][port=$port_service]">
+      <xsl:for-each select="openvas:report()/results/result[host/text()=$host][threat/text()=$threat][port=$port_service]">
         <xsl:text>\begin{longtable}{|p{\textwidth * 1}|}</xsl:text><xsl:call-template name="newline"/>
         <xsl:call-template name="latex-hline"/>
         <xsl:text>\rowcolor{</xsl:text>
@@ -1457,7 +1427,7 @@ advice given in each description, in order to rectify the issue.
     <xsl:param name="host"/>
 
     <!-- TODO Solve other sorting possibilities. -->
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:call-template name="result-details-host-port-threat">
         <xsl:with-param name="threat">High</xsl:with-param>
         <xsl:with-param name="host" select="$host"/>
@@ -1465,7 +1435,7 @@ advice given in each description, in order to rectify the issue.
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:call-template name="result-details-host-port-threat">
         <xsl:with-param name="threat">Medium</xsl:with-param>
         <xsl:with-param name="host" select="$host"/>
@@ -1473,7 +1443,7 @@ advice given in each description, in order to rectify the issue.
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:call-template name="result-details-host-port-threat">
         <xsl:with-param name="threat">Low</xsl:with-param>
         <xsl:with-param name="host" select="$host"/>
@@ -1481,7 +1451,7 @@ advice given in each description, in order to rectify the issue.
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:call-template name="result-details-host-port-threat">
         <xsl:with-param name="threat">Log</xsl:with-param>
         <xsl:with-param name="host" select="$host"/>
@@ -1489,7 +1459,7 @@ advice given in each description, in order to rectify the issue.
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:call-template name="result-details-host-port-threat">
         <xsl:with-param name="threat">Debug</xsl:with-param>
         <xsl:with-param name="host" select="$host"/>
@@ -1497,7 +1467,7 @@ advice given in each description, in order to rectify the issue.
       </xsl:call-template>
     </xsl:for-each>
 
-    <xsl:for-each select="openvas:report()/ports/port[host=$host]">
+    <xsl:for-each select="openvas:report()/ports/port[host/text()=$host]">
       <xsl:call-template name="result-details-host-port-threat">
         <xsl:with-param name="threat">False Positive</xsl:with-param>
         <xsl:with-param name="host" select="$host"/>
diff --git a/src/report_formats/NBE/NBE.xsl b/src/report_formats/NBE/NBE.xsl
index 77c03c763..7cdc4d31b 100644
--- a/src/report_formats/NBE/NBE.xsl
+++ b/src/report_formats/NBE/NBE.xsl
@@ -11,7 +11,7 @@
   <xsl:strip-space elements="*"/>
 
 <!--
-Copyright (C) 2010-2018 Greenbone Networks GmbH
+Copyright (C) 2010-2019 Greenbone Networks GmbH
 
 SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -107,91 +107,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   <xsl:value-of select="substring-after('.', 'cvss_base_vector=')"/>
 </xsl:template>
 
-<xsl:template name="ref_cve_list">
-  <xsl:param name="cvelist"/>
-
-  <xsl:variable name="cvecount" select="count(str:split($cvelist, ','))"/>
-  <xsl:if test="$cvecount &gt; 0">
-    <xsl:text>CVE: </xsl:text>
-    <xsl:for-each select="str:split($cvelist, ',')">
-      <xsl:value-of select="str:replace (normalize-space(.), '&#10;', '\n')"/>
-      <xsl:if test="position() &lt; $cvecount">
-        <xsl:text>, </xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:text>\n</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="ref_bid_list">
-  <xsl:param name="bidlist"/>
-
-  <xsl:variable name="bidcount" select="count(str:split($bidlist, ','))"/>
-  <xsl:if test="$bidcount &gt; 0">
-    <xsl:text>BID: </xsl:text>
-    <xsl:for-each select="str:split($bidlist, ',')">
-      <xsl:value-of select="str:replace (., '&#10;', '\n')"/>
-      <xsl:if test="position() &lt; $bidcount">
-        <xsl:text>, </xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:text>\n</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="ref_cert_list">
-  <xsl:param name="certlist"/>
-
-  <xsl:variable name="certcount" select="count($certlist/cert_ref)"/>
-
-  <xsl:if test="count($certlist/warning)">
-    <xsl:for-each select="$certlist/warning">
-      <xsl:text>CERT: Warning: </xsl:text>
-      <xsl:value-of select="str:replace (text(), '&#10;', '\n')"/>
-      <xsl:text>\n</xsl:text>
-    </xsl:for-each>
-  </xsl:if>
-
-  <xsl:if test="$certcount &gt; 0">
-    <xsl:text>CERT: </xsl:text>
-    <xsl:for-each select="$certlist/cert_ref">
-      <xsl:value-of select="@id"/>
-      <xsl:if test="position() &lt; $certcount">
-        <xsl:text>, </xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:text>\n</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="ref_xref_list">
-  <xsl:param name="xreflist"/>
-
-  <xsl:variable name="xrefcount" select="count(str:split($xreflist, ','))"/>
-  <xsl:if test="$xrefcount &gt; 0">
-    <xsl:for-each select="str:split($xreflist, ',')">
-      <xsl:if test="position()=1">
-        <xsl:text>Other:</xsl:text>
-        <xsl:text>\n</xsl:text>
-      </xsl:if>
-      <xsl:text>    </xsl:text>
-      <xsl:choose>
-        <xsl:when test="contains(., 'URL:')">
-          <xsl:value-of select="str:replace (substring-after(., 'URL:'), '&#10;', '\n')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="str:replace (., '&#10;', '\n')"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:text>\n</xsl:text>
-    </xsl:for-each>
-  </xsl:if>
-</xsl:template>
-
 <xsl:template match="result">
   <xsl:variable name="netmask">
     <xsl:call-template name="substring-before-last">
-      <xsl:with-param name="string" select="host"/>
+      <xsl:with-param name="string" select="host/text()"/>
       <xsl:with-param name="delimiter" select="'.'"/>
     </xsl:call-template>
   </xsl:variable>
@@ -201,7 +120,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   <xsl:text>|</xsl:text>
   <xsl:value-of select="$netmask"/>
   <xsl:text>|</xsl:text>
-  <xsl:value-of select="host"/>
+  <xsl:value-of select="host/text()"/>
   <xsl:text>|</xsl:text>
   <xsl:value-of select="port"/>
   <xsl:text>|</xsl:text>
@@ -331,23 +250,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     <xsl:text>\n</xsl:text>
   </xsl:if>
 
-  <xsl:variable name="cve_ref">
-    <xsl:if test="nvt/cve != '' and nvt/cve != 'NOCVE'">
-      <xsl:value-of select="nvt/cve/text()"/>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="bid_ref">
-    <xsl:if test="nvt/bid != '' and nvt/bid != 'NOBID'">
-      <xsl:value-of select="nvt/bid/text()"/>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="cert_ref" select="nvt/cert"/>
-  <xsl:variable name="xref">
-    <xsl:if test="nvt/xref != '' and nvt/xref != 'NOXREF'">
-      <xsl:value-of select="nvt/xref/text()"/>
-    </xsl:if>
-  </xsl:variable>
-
   <xsl:if test="nvt/cvss_base != ''">
     <xsl:variable name="cvss_base_vector">
       <xsl:for-each select="str:split (nvt/tags, '|')">
@@ -364,21 +266,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     <xsl:text>)\n</xsl:text>
   </xsl:if>
 
-  <xsl:if test="$cve_ref != '' or $bid_ref != '' or $xref != '' or count($cert_ref/cert_ref) > 0">
+  <xsl:if test="count(nvt/refs/ref) > 0">
     <xsl:text>References:</xsl:text>
     <xsl:text>\n</xsl:text>
-    <xsl:call-template name="ref_cve_list">
-      <xsl:with-param name="cvelist" select="$cve_ref"/>
-    </xsl:call-template>
-    <xsl:call-template name="ref_bid_list">
-      <xsl:with-param name="bidlist" select="$bid_ref"/>
-    </xsl:call-template>
-    <xsl:call-template name="ref_cert_list">
-      <xsl:with-param name="certlist" select="$cert_ref"/>
-    </xsl:call-template>
-    <xsl:call-template name="ref_xref_list">
-      <xsl:with-param name="xreflist" select="$xref"/>
-    </xsl:call-template>
+    <xsl:for-each select="nvt/refs/ref">
+      <xsl:value-of select="concat(@type, ': ', @id, '\n')"/>
+    </xsl:for-each>
   </xsl:if>
   <xsl:call-template name="newline"/>
 </xsl:template>
diff --git a/src/report_formats/TXT/TXT.xsl b/src/report_formats/TXT/TXT.xsl
index 37887280f..1fa9868a7 100644
--- a/src/report_formats/TXT/TXT.xsl
+++ b/src/report_formats/TXT/TXT.xsl
@@ -311,87 +311,30 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="ref_cve_list">
-    <xsl:param name="cvelist"/>
-
-    <xsl:variable name="cvecount" select="count(str:split($cvelist, ','))"/>
-    <xsl:if test="$cvecount &gt; 0">
-      <xsl:text>CVE: </xsl:text>
-      <xsl:for-each select="str:split($cvelist, ',')">
-        <xsl:value-of select="normalize-space(.)"/>
-        <xsl:if test="position() &lt; $cvecount">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:call-template name="newline"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="ref_bid_list">
-    <xsl:param name="bidlist"/>
-
-    <xsl:variable name="bidcount" select="count(str:split($bidlist, ','))"/>
-    <xsl:if test="$bidcount &gt; 0">
-      <xsl:text>BID: </xsl:text>
-      <xsl:for-each select="str:split($bidlist, ',')">
-        <xsl:value-of select="."/>
-        <xsl:if test="position() &lt; $bidcount">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:call-template name="newline"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="ref_cert_list">
-    <xsl:param name="certlist"/>
+  <xsl:template name="refs_list">
+    <xsl:param name="refs"/>
 
-    <xsl:variable name="certcount" select="count($certlist/cert_ref)"/>
+    <xsl:variable name="refscount" select="count($refs/ref)"/>
 
-    <xsl:if test="count($certlist/warning)">
-      <xsl:for-each select="$certlist/warning">
+    <xsl:if test="count($refs/warning)">
+      <xsl:for-each select="$refs/warning">
         <xsl:text>CERT: Warning: </xsl:text>
         <xsl:value-of select="text()"/>
         <xsl:call-template name="newline"/>
       </xsl:for-each>
     </xsl:if>
 
-    <xsl:if test="$certcount &gt; 0">
-      <xsl:text>CERT: </xsl:text>
-      <xsl:for-each select="$certlist/cert_ref">
-        <xsl:call-template name="wrap">
-          <xsl:with-param name="string" select="@id"/>
-          <xsl:with-param name="width" select="'55'"/>
-        </xsl:call-template>
-        <xsl:if test="position() &lt; $certcount">
-          <xsl:text>, </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
+    <xsl:if test="$refscount &gt; 0">
+      <xsl:text>References:</xsl:text>
       <xsl:call-template name="newline"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="ref_xref_list">
-    <xsl:param name="xreflist"/>
-
-    <xsl:variable name="xrefcount" select="count(str:split($xreflist, ','))"/>
-    <xsl:if test="$xrefcount &gt; 0">
-      <xsl:for-each select="str:split($xreflist, ',')">
-        <xsl:if test="position()=1">
-          <xsl:text>Other:</xsl:text>
-          <xsl:call-template name="newline"/>
-        </xsl:if>
-        <xsl:text>    </xsl:text>
-        <xsl:choose>
-          <xsl:when test="contains(., 'URL:')">
-            <xsl:value-of select="substring-after(., 'URL:')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="."/>
-          </xsl:otherwise>
-        </xsl:choose>
+      <xsl:for-each select="$refs/ref">
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="@type"/>
+        <xsl:text>: </xsl:text>
+        <xsl:value-of select="@id"/>
         <xsl:call-template name="newline"/>
       </xsl:for-each>
+      <xsl:call-template name="newline"/>
     </xsl:if>
   </xsl:template>
 
@@ -609,39 +552,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
       <xsl:call-template name="newline"/>
     </xsl:if>
 
-    <xsl:variable name="cve_ref">
-      <xsl:if test="nvt/cve != '' and nvt/cve != 'NOCVE'">
-        <xsl:value-of select="nvt/cve/text()"/>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="bid_ref">
-      <xsl:if test="nvt/bid != '' and nvt/bid != 'NOBID'">
-        <xsl:value-of select="nvt/bid/text()"/>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="cert_ref" select="nvt/cert"/>
-    <xsl:variable name="xref">
-      <xsl:if test="nvt/xref != '' and nvt/xref != 'NOXREF'">
-        <xsl:value-of select="nvt/xref/text()"/>
-      </xsl:if>
-    </xsl:variable>
-
-    <xsl:if test="$cve_ref != '' or $bid_ref != '' or $xref != '' or count($cert_ref/cert_ref) > 0">
-      <xsl:text>References:</xsl:text>
-      <xsl:call-template name="newline"/>
-      <xsl:call-template name="ref_cve_list">
-        <xsl:with-param name="cvelist" select="$cve_ref"/>
-      </xsl:call-template>
-      <xsl:call-template name="ref_bid_list">
-        <xsl:with-param name="bidlist" select="$bid_ref"/>
-      </xsl:call-template>
-      <xsl:call-template name="ref_cert_list">
-        <xsl:with-param name="certlist" select="$cert_ref"/>
+    <xsl:if test="count(nvt/refs/ref) > 0">
+      <xsl:call-template name="refs_list">
+        <xsl:with-param name="refs" select="nvt/refs"/>
       </xsl:call-template>
-      <xsl:call-template name="ref_xref_list">
-        <xsl:with-param name="xreflist" select="$xref"/>
-      </xsl:call-template>
-      <xsl:call-template name="newline"/>
     </xsl:if>
 
     <xsl:if test="delta">
diff --git a/src/report_formats/Verinice_ITG/Verinice_ITG.xsl b/src/report_formats/Verinice_ITG/Verinice_ITG.xsl
index d14ba2e72..b4bd3ddf3 100644
--- a/src/report_formats/Verinice_ITG/Verinice_ITG.xsl
+++ b/src/report_formats/Verinice_ITG/Verinice_ITG.xsl
@@ -262,7 +262,7 @@ transformation with the tool xsltproc.
         </syncAttribute>
         <extId><xsl:value-of select="$task_id"/>-<xsl:value-of select="$addr"/>-results</extId>
         <extObjectType>gsm_itg_result_group</extObjectType>
-        <xsl:for-each select="/report/results/result[port='general/IT-Grundschutz-T'][host=$addr]">
+        <xsl:for-each select="/report/results/result[port='general/IT-Grundschutz-T'][host/text()=$addr]">
           <xsl:apply-templates select="description">
             <xsl:with-param name="task_id">
               <xsl:value-of select="$task_id"/>
diff --git a/src/report_formats/XML/report_format.xml b/src/report_formats/XML/report_format.xml
index 07e9c91ee..963a26365 100644
--- a/src/report_formats/XML/report_format.xml
+++ b/src/report_formats/XML/report_format.xml
@@ -2,7 +2,7 @@
   <name>XML</name>
   <summary>Raw XML report.</summary>
   <description>
-    Complete scan report in OpenVAS Manager XML format.
+    Anonymized scan report in GMP XML format.
   </description>
   <extension>xml</extension>
   <content_type>text/xml</content_type>
diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
index 05f4c1cfc..f242d2f35 100644
--- a/src/schema_formats/XML/GMP.xml.in
+++ b/src/schema_formats/XML/GMP.xml.in
@@ -1406,12 +1406,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         <e>type</e>
         <e>family</e>
         <e>cvss_base</e>
-        <e>cve</e>
         <e>cpe</e>
-        <e>bid</e>
         <e>tags</e>
-        <e>cert</e>
-        <e>xref</e>
+        <e>refs</e>
       </pattern>
       <ele>
         <name>name</name>
@@ -1433,54 +1430,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         <summary>CVSS base value associated with the NVT</summary>
         <pattern><t>integer</t></pattern>
       </ele>
-      <ele>
-        <name>cve</name>
-        <summary>CVE associated with the NVT</summary>
-        <pattern>text</pattern>
-      </ele>
       <ele>
         <name>cpe</name>
         <summary>The CPE which produced the CVE (for "cve" results)</summary>
         <pattern>text</pattern>
       </ele>
-      <ele>
-        <name>bid</name>
-        <summary>BID associated with the NVT</summary>
-        <pattern>text</pattern>
-      </ele>
       <ele>
         <name>tags</name>
         <summary>Tags associated with the NVT</summary>
         <pattern>text</pattern>
       </ele>
       <ele>
-        <name>cert</name>
-        <summary>List of CERT advisories referencing this NVT via CVEs</summary>
+        <name>refs</name>
+        <summary>List of references of various types for this vulnerability test</summary>
         <pattern>
-          <any><e>cert_ref</e></any>
+          <any><e>ref</e></any>
         </pattern>
         <ele>
-          <name>cert_ref</name>
-          <summary>A CERT advisory reference</summary>
+          <name>ref</name>
+          <summary>A reference</summary>
           <pattern>
             <attrib>
               <name>id</name>
-              <summary>ID of the advisory</summary>
+              <summary>ID of the reference</summary>
               <type>text</type>
             </attrib>
             <attrib>
               <name>type</name>
-              <summary>Type of the advisory (e.g. "DFN-CERT", "CERT-BUND")</summary>
+	      <summary>Type of the reference, for example "cve", "bid", "dfn-cert", "cert-bund"
+	      </summary>
               <type>text</type>
             </attrib>
           </pattern>
         </ele>
       </ele>
-      <ele>
-        <name>xref</name>
-        <summary>XREFs associated with the NVT</summary>
-        <pattern>text</pattern>
-      </ele>
     </ele>
     <ele>
       <name>scan_nvt_version</name>
@@ -5099,9 +5082,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
               <name>CPE</name>
               <extension>csv</extension>
               <content_type>text/csv</content_type>
-              <summary>Common Product Enumeration CSV table.</summary>
+              <summary>Common Platform Enumeration CSV table.</summary>
               <description>
-                CPE stands for Common Product Enumeration.  It is a
+                CPE stands for Common Platform Enumeration.  It is a
                 <truncated>...</truncated>
               </description>
               <predefined>1</predefined>
@@ -8016,6 +7999,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <type>boolean</type>
             <summary>Whether new NVTs will be added</summary>
           </column>
+          <column>
+            <name>type</name>
+            <type>
+              <alts>
+                <alt>0</alt>
+                <alt>1</alt>
+              </alts></type>
+            <summary>The type of the config (0 = OpenVAS, 1 OSP)</summary>
+          </column>
         </filter_keywords>
       </attrib>
       <attrib>
@@ -8160,9 +8152,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         </ele>
         <ele>
           <name>type</name>
-          <summary>The type the config.</summary>
+          <summary>The type of the config (0 = OpenVAS, 1 OSP)</summary>
           <pattern>
-            text
+            <t>
+              <alts>
+                <alt>0</alt>
+                <alt>1</alt>
+              </alts>
+            </t>
           </pattern>
         </ele>
         <ele>
@@ -8360,6 +8357,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
               <e>nvt</e>
               <e>hr_name</e>
               <e>name</e>
+              <e>id</e>
               <e>type</e>
               <e>value</e>
               <e>default</e>
@@ -8392,9 +8390,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
               <summary>The compact name of the preference as used by the scanner</summary>
               <pattern><t>name</t></pattern>
             </ele>
+            <ele>
+              <name>id</name>
+              <summary>The ID of the preference</summary>
+              <pattern>text</pattern>
+            </ele>
             <ele>
               <name>type</name>
-              <summary>The type of preference</summary>
+              <summary>The type of the preference</summary>
               <pattern>text</pattern>
             </ele>
             <ele>
@@ -8642,6 +8645,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
                 <nvt oid="1.3.6.1.4.1.25623.1.0.10330">
                   <name>Services</name>
                 </nvt>
+                <id>1</id>
                 <name>Network connection timeout :</name>
                 <type>entry</type>
                 <value>5</value>
@@ -12207,7 +12211,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
           <column>
             <name>cve</name>
             <type>text</type>
-            <summary>List of BIDs of the NVT</summary>
+            <summary>List of CVEs of the NVT</summary>
           </column>
           <column>
             <name>xref</name>
@@ -13734,10 +13738,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
               <e>family</e>
               <e>cvss_base</e>
               <e>qod</e>
-              <e>cve_id</e>
-              <e>cert_refs</e>
-              <e>bugtraq_id</e>
-              <e>xrefs</e>
+              <e>refs</e>
               <e>tags</e>
               <o><e>preference_count</e></o>
               <o><e>timeout</e></o>
@@ -13846,51 +13847,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
           </ele>
         </ele>
         <ele>
-          <name>cve_id</name>
-          <summary>IDs of the CVEs the NVT addresses</summary>
-          <pattern>text</pattern>
-        </ele>
-        <ele>
-          <name>bugtraq_id</name>
-          <summary>List of Bugtraq IDs of the NVT</summary>
-          <pattern>text</pattern>
-        </ele>
-        <ele>
-          <name>cert_refs</name>
-          <summary>List of CERT advisories referencing this NVT via CVEs</summary>
+          <name>refs</name>
+          <summary>List of references of various types for this vulnerability test</summary>
           <pattern>
-            <any><e>cert_ref</e></any>
+            <any><e>ref</e></any>
             <o><e>warning</e></o>
           </pattern>
           <ele>
-            <name>cert_ref</name>
-            <summary>A CERT advisory reference</summary>
+            <name>ref</name>
+            <summary>A reference</summary>
             <pattern>
               <attrib>
                 <name>id</name>
-                <summary>ID of the advisory</summary>
+                <summary>ID of the reference</summary>
                 <type>text</type>
               </attrib>
               <attrib>
                 <name>type</name>
-                <summary>Type of the advisory (e.g. "DFN-CERT", "CERT-BUND")</summary>
+                <summary>Type of the reference, for example "cve", "bid", "dfn-cert", "cert-bund"</summary>
                 <type>text</type>
               </attrib>
             </pattern>
           </ele>
           <ele>
             <name>warning</name>
-            <summary>A warning message, e.g. when the database is not</summary>
+            <summary>A warning message, e.g. when the CERT database is not available</summary>
             <pattern>
               text
             </pattern>
           </ele>
         </ele>
-        <ele>
-          <name>xrefs</name>
-          <summary>List of other references of the NVT</summary>
-          <pattern>text</pattern>
-        </ele>
         <ele>
           <name>tags</name>
           <summary>The tags of the NVT, separated by vertical bars</summary>
@@ -14002,10 +13988,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <summary>Find what is listening on which port</summary>
             <family>Service detection</family>
             <cvss_base></cvss_base>
-            <cve_id>NOCVE</cve_id>
-            <bugtraq_id>NOBID</bugtraq_id>
-            <cert_refs/>
-            <xrefs>NOXREF</xrefs>
+            <refs/>
             <tags>NOTAG</tags>
             <preference_count>-1</preference_count>
             <timeout></timeout>
@@ -14016,6 +13999,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
                 <nvt oid="1.3.6.1.4.1.25623.1.0.10330">
                   <name>Services</name>
                 </nvt>
+                <id>1</id>
                 <name>Network connection timeout :</name>
                 <type>entry</type>
                 <value>5</value>
@@ -15474,6 +15458,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         <pattern>
           <e>nvt</e>
           <e>name</e>
+          <e>id</e>
           <e>type</e>
           <e>value</e>
           <any><e>alt</e></any>
@@ -15501,9 +15486,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
           <summary>The name of the preference</summary>
           <pattern><t>name</t></pattern>
         </ele>
+        <ele>
+          <name>id</name>
+          <summary>The ID of the preference</summary>
+          <pattern>text</pattern>
+        </ele>
         <ele>
           <name>type</name>
-          <summary>The type of preference</summary>
+          <summary>The type of the preference</summary>
           <pattern>text</pattern>
         </ele>
         <ele>
@@ -15531,7 +15521,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
       <response>
         <get_preferences_response status="200" status_text="OK">
           <preference>
-            <name>1.3.6.1.4.1.25623.1.0.10330:entry:Network connection timeout :</name>
+            <name>1.3.6.1.4.1.25623.1.0.10330:1:entry:Network connection timeout :</name>
             <value>5</value>
           </preference>
           <truncated>...</truncated>
@@ -15547,7 +15537,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
       <response>
         <get_preferences_response status="200" status_text="OK">
           <preference>
-            <name>1.3.6.1.4.1.25623.1.0.10330:entry:Network connection timeout :</name>
+            <name>1.3.6.1.4.1.25623.1.0.10330:1:entry:Network connection timeout :</name>
             <value>5</value>
             <default>5</default>
           </preference>
@@ -15567,6 +15557,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <nvt oid="1.3.6.1.4.1.25623.1.0.10330">
               <name>Services</name>
             </nvt>
+            <id>1</id>
             <name>Network connection timeout :</name>
             <type>entry</type>
             <value>5</value>
@@ -15588,6 +15579,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <nvt oid="1.3.6.1.4.1.25623.1.0.10330">
               <name>Services</name>
             </nvt>
+            <id>1</id>
             <name>Network connection timeout :</name>
             <type>entry</type>
             <value>5</value>
@@ -15936,6 +15928,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         <summary>ID of filter to use to filter reports</summary>
         <type>uuid</type>
       </attrib>
+      <attrib>
+        <name>details</name>
+        <summary>
+          Whether to get the details of the reports including the
+          results, hosts, ports etc.
+        </summary>
+        <type>boolean</type>
+      </attrib>
       <attrib>
         <name>type</name>
         <summary>Type of report to get</summary>
@@ -16369,13 +16369,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
                   <nvt oid="1.3.6.1.4.1.25623.1.0.74">
                     <name>Test NVT: fields with ISO-8859-1 chars ()</name>
                     <cvss_base>5.0</cvss_base>
-                    <cve>CVE-2013-1406</cve>
-                    <bid>51702</bid>
                     <tags>NOTAGS</tags>
-                    <cert>
-                      <cert_ref id="DFN-CERT-2013-0246" type="DFN-CERT"/>
-                    </cert>
-                    <xref>NOXREF</xref>
+                    <refs>
+                      <ref id="CVE-2013-1406" type="cve"/>
+                      <ref id="51702" type="bid"/>
+                      <ref id="DFN-CERT-2013-0246" type="dfn-cert"/>
+                    </refs>
                   </nvt>
                   <threat>Medium</threat>
                   <description>Test with  umlaut Warning Port 0.</description>
@@ -17421,11 +17420,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <nvt oid="1.3.6.1.4.1.25623.1.0.74">
               <name>Test NVT: fields with ISO-8859-1 chars</name>
               <cvss_base>5.0</cvss_base>
-              <cve>CVE-2009-3095</cve>
-              <bid>36254</bid>
               <tags>NOTAGS</tags>
-              <cert></cert>
-              <xref>NOXREF</xref>
+              <refs>
+                 <ref type="cve" id="CVE-2009-3095"/>
+                 <ref type="bid" id="36254"/>
+              </refs>
             </nvt>
             <threat>Medium</threat>
             <description>Test with umlaut.</description>
@@ -17479,11 +17478,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
             <nvt oid="1.3.6.1.4.1.25623.1.0.75">
               <name>Test NVT: long lines</name>
               <cvss_base>9</cvss_base>
-              <cve>CVE-2009-3095</cve>
-              <bid>36254</bid>
               <tags>NOTAGS</tags>
-              <cert></cert>
-              <xref>NOXREF</xref>
+              <refs>
+                 <ref type="cve" id="CVE-2009-3095"/>
+                 <ref type="bid" id="36254"/>
+              </refs>
             </nvt>
             <threat>High</threat>
             <description>Test with very long warning.</description>
@@ -23773,7 +23772,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
         <modify_config config_id="254cd3ef-bbe1-4d58-859d-21b8d0c046c6">
           <preference>
             <nvt oid="1.3.6.1.4.1.25623.1.0.14259"></nvt>
-            <name>1.3.6.1.4.1.25623.1.0.14259:checkbox:UDP port scan</name>
+            <name>1.3.6.1.4.1.25623.1.0.14259:1:checkbox:UDP port scan</name>
             <value>eWVz</value>
           </preference>
         </modify_config>
@@ -23788,7 +23787,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
       <request>
         <modify_config config_id="254cd3ef-bbe1-4d58-859d-21b8d0c046c6">
           <preference>
-            <name>scanner:scanner:vhosts</name>
+            <name>scanner:scanner:scanner:vhosts</name>
             <value>ZXhhbXBsZQ==</value>
           </preference>
         </modify_config>
@@ -26299,6 +26298,69 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
   <!-- Compatibility changes between versions. -->
 
+  <change>
+    <command>GET_PREFERENCES, GET_CONFIGS</command>
+    <summary>Add NVT Preferences ID</summary>
+    <description>
+      <p>
+        The PREFERENCE element in GET_PREFERENCES and GET_CONFIGS responses
+        contains an ID subelement. The ID should help in identifying
+        preferences within the same nvt instead of using the preference name
+        which may be changed.
+      </p>
+      <p>
+        The content of the elements CVE_ID, BUGTRAQ_ID and XREFS is now integrated
+        into the REFS element.
+      </p>
+    </description>
+    <version>9.0</version>
+  </change>
+  <change>
+    <command>GET_NVTS, GET_INFO</command>
+    <summary>New element REFS replaces CVE_ID, BUGTRAQ_ID, XREFS and CERT_REFS</summary>
+    <version>9.0</version>
+    <description>
+      <p>
+        The former element CERT_REFS is now named REFS and the id's for the type
+        are now lower case, ie. "cert-bund" and "dfn-cert" instead of "CERT-Bund" and "DFN-CERT".
+      </p>
+      <p>
+        The content of the elements CVE_ID, BUGTRAQ_ID and XREFS is now integrated
+        into the REFS element.
+      </p>
+    </description>
+  </change>
+  <change>
+    <command>GET_REPORTS, GET_RESULTS</command>
+    <summary>New element RESULT/NVT/REFS replaces RESULT/NVT/CERT</summary>
+    <version>9.0</version>
+    <description>
+      <p>
+        The former element CERT is now named REFS and the id's for the type
+        are now lower case, ie. "cert-bund" and "dfn-cert" instead of "CERT-Bund" and "DFN-CERT".
+      </p>
+    </description>
+  </change>
+  <change>
+    <command>GET_REPORTS, GET_RESULTS</command>
+    <summary>Elements RESULT/NVT/CVE, RESULT/NVT/BID and RESULT/NVT/XREF consolidated into RESULT/NVT/REFS</summary>
+    <version>9.0</version>
+    <description>
+      <p>
+        The content of former elements CVE and BID are now also part of REFS and the
+	respective REF types are "cve" and "bid".
+      </p>
+      <p>
+        The content of former element XREF is now also part of REFS and the
+        respective REF type is the former prefix of the XREF, for example "URL".
+      </p>
+      <p>
+        The "NOCVE", "NOXREF" and "NOBID" strings that previously indicated the absense
+        of a CVE, XREF or BID are not applied anymore.
+      </p>
+    </description>
+  </change>
+
   <change>
     <command>CREATE_FILTER, CREATE_TARGET</command>
     <summary>NAME MAKE_UNIQUE removed</summary>