Author: mattm
Date: 2016-10-17 17:07:35 +0200 (Mon, 17 Oct 2016)
New Revision: 26418
Modified:
trunk/openvas-manager/ChangeLog
trunk/openvas-manager/src/manage_migrators.c
Log:
* src/manage_migrators.c (migrate_165_to_166): Neaten comments.
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2016-10-17 13:57:14 UTC (rev 26417)
+++ trunk/openvas-manager/ChangeLog 2016-10-17 15:07:35 UTC (rev 26418)
@@ -1,5 +1,9 @@
2016-10-17 Matthew Mundell <matthew.mund...@greenbone.net>
+ * src/manage_migrators.c (migrate_165_to_166): Neaten comments.
+
+2016-10-17 Matthew Mundell <matthew.mund...@greenbone.net>
+
Ensure Discovery has "Report about unrechable Hosts" "no" and System
Discovery includes "Traceroute".
Modified: trunk/openvas-manager/src/manage_migrators.c
===================================================================
--- trunk/openvas-manager/src/manage_migrators.c 2016-10-17 13:57:14 UTC
(rev 26417)
+++ trunk/openvas-manager/src/manage_migrators.c 2016-10-17 15:07:35 UTC
(rev 26418)
@@ -12105,7 +12105,7 @@
/* Update the database. */
- /* Create new credentials */
+ /* Create new credentials. */
init_iterator (&alert_data,
"SELECT id, name,"
" (SELECT data FROM alert_method_data"
@@ -12138,7 +12138,7 @@
quoted_name = sql_quote (name);
quoted_login = sql_quote (login);
- // Create basic credential
+ /* Create basic credential. */
if (sql_int ("SELECT count(*) FROM credentials"
" WHERE name = 'Credential for Alert %s'"
" AND owner = %llu;",
@@ -12162,7 +12162,7 @@
" m_now (), m_now ());",
quoted_name, owner);
- // Add credential data
+ /* Add credential data. */
new_credential = sql_last_insert_id ();
new_credential_id = sql_string ("SELECT uuid FROM credentials"
" WHERE id = %llu;",
@@ -12207,14 +12207,14 @@
g_free (quoted_secret);
}
- // Update alert_method_data
+ /* 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
+ /* Create permissions. */
sql ("INSERT INTO"
" permissions (uuid, owner, name,"
" comment, resource_type, resource,"
@@ -12258,7 +12258,7 @@
}
cleanup_iterator (&alert_data);
- /* Create new trash credentials */
+ /* Create new trash credentials. */
init_iterator (&alert_data,
"SELECT id, name,"
" (SELECT data FROM alert_method_data_trash"
@@ -12291,7 +12291,7 @@
quoted_name = sql_quote (name);
quoted_login = sql_quote (login);
- // Create basic credential
+ /* Create basic credential. */
sql ("INSERT INTO credentials_trash"
" (uuid, name, owner, comment, type,"
@@ -12307,7 +12307,7 @@
" WHERE id = %llu;",
new_credential);
- // Add credential data
+ /* Add credential data. */
sql ("INSERT INTO credentials_trash_data (credential, type, value)"
" VALUES (%llu, 'username', '%s');",
new_credential, quoted_login);
@@ -12346,7 +12346,7 @@
g_free (quoted_secret);
}
- // Update alert_method_data
+ /* Update alert_method_data. */
sql ("INSERT INTO alert_method_data_trash (alert, name, data)"
" VALUES (%llu, '%s_credential', '%s');",
alert,
@@ -12359,7 +12359,7 @@
method == 8 ? "scp" : "verinice_server",
LOCATION_TRASH);
- // Create permissions
+ /* Create permissions. */
sql ("INSERT INTO"
" permissions (uuid, owner, name,"
" comment, resource_type, resource,"
@@ -12406,7 +12406,7 @@
}
cleanup_iterator (&alert_data);
- /* Remove now obsolete rows from alert_method_data and ..._trash */
+ /* 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'"
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
