Author: timopollmeier
Date: 2016-10-12 13:05:54 +0200 (Wed, 12 Oct 2016)
New Revision: 26382
Modified:
branches/openvas-manager-6.0/ChangeLog
branches/openvas-manager-6.0/src/manage_sql.c
Log:
Backport r26381.
* src/manage_sql.c (init_aggregate_iterator): Also fall back to the
default qod value if min_qod_str is an empty string.
Modified: branches/openvas-manager-6.0/ChangeLog
===================================================================
--- branches/openvas-manager-6.0/ChangeLog 2016-10-12 10:59:44 UTC (rev
26381)
+++ branches/openvas-manager-6.0/ChangeLog 2016-10-12 11:05:54 UTC (rev
26382)
@@ -1,5 +1,12 @@
2016-10-12 Timo Pollmeier <timo.pollme...@greenbone.net>
+ Backport r26381.
+
+ * src/manage_sql.c (init_aggregate_iterator): Also fall back to the
+ default qod value if min_qod_str is an empty string.
+
+2016-10-12 Timo Pollmeier <timo.pollme...@greenbone.net>
+
Backport r26371 and r26374.
* src/manage_sql.c (print_report_xml): Create hash tables shortly
Modified: branches/openvas-manager-6.0/src/manage_sql.c
===================================================================
--- branches/openvas-manager-6.0/src/manage_sql.c 2016-10-12 10:59:44 UTC
(rev 26381)
+++ branches/openvas-manager-6.0/src/manage_sql.c 2016-10-12 11:05:54 UTC
(rev 26382)
@@ -4860,7 +4860,8 @@
apply_overrides_str = filter_term_value (filter ? filter : get->filter,
"apply_overrides");
apply_overrides = apply_overrides_str ? atoi (apply_overrides_str) : 1;
min_qod_str = filter_term_value (filter ? filter : get->filter, "min_qod");
- min_qod = min_qod_str ? atoi (min_qod_str) : MIN_QOD_DEFAULT;
+ min_qod = (min_qod_str && strcmp (min_qod_str, ""))
+ ? atoi (min_qod_str) : MIN_QOD_DEFAULT;
g_free (apply_overrides_str);
g_free (min_qod_str);
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
