Author: mattm
Date: 2017-08-07 18:12:24 +0200 (Mon, 07 Aug 2017)
New Revision: 29326

Modified:
   branches/openvas-manager-7.0/ChangeLog
   branches/openvas-manager-7.0/src/manage_sql.c
Log:
        Backport r29325.

        * src/manage_sql.c (report_severity_data): Ignore "Max Rows Per Page"
        setting when counting the results for the report cache.

Modified: branches/openvas-manager-7.0/ChangeLog
===================================================================
--- branches/openvas-manager-7.0/ChangeLog      2017-08-07 15:55:33 UTC (rev 
29325)
+++ branches/openvas-manager-7.0/ChangeLog      2017-08-07 16:12:24 UTC (rev 
29326)
@@ -1,3 +1,10 @@
+2017-08-07  Matthew Mundell <matthew.mund...@greenbone.net>
+
+       Backport r29325.
+
+       * src/manage_sql.c (report_severity_data): Ignore "Max Rows Per Page"
+       setting when counting the results for the report cache.
+
 2017-08-04  Matthew Mundell <matthew.mund...@greenbone.net>
 
        Backport r29318.

Modified: branches/openvas-manager-7.0/src/manage_sql.c
===================================================================
--- branches/openvas-manager-7.0/src/manage_sql.c       2017-08-07 15:55:33 UTC 
(rev 29325)
+++ branches/openvas-manager-7.0/src/manage_sql.c       2017-08-07 16:12:24 UTC 
(rev 29326)
@@ -23092,7 +23092,9 @@
     {
       get_data_t *get_all;
       get_all = report_results_get_data (1, -1, apply_overrides, autofp, 0);
+      ignore_max_rows_per_page = 1;
       init_result_get_iterator (&results, get_all, report, host, NULL);
+      ignore_max_rows_per_page = 0;
       while (next (&results))
         {
           double severity = result_iterator_severity_double (&results);
@@ -23112,7 +23114,9 @@
       get_filtered.type = get->type;
       get_filtered.ignore_pagination = 1;
 
+      ignore_max_rows_per_page = 1;
       init_result_get_iterator (&results, &get_filtered, report, host, NULL);
+      ignore_max_rows_per_page = 0;
       while (next (&results))
         {
           double severity = result_iterator_severity_double (&results);

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits

Reply via email to