[Openvas-commits] r6035 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2009-12-02 12:57:18 +0100 (Wed, 02 Dec 2009)
New Revision: 6035

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/tasks_sql.h
Log:
Fixed a bug which caused NVT selections in non-growing families to be
wrongly calculated.

* src/tasks_sql.h (manage_set_config_nvts): Defer determining the old
NVT count until we know whether the family is growing or not, hand the
correct growing flag to nvt_selector_nvt_count ().


Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-12-02 08:38:40 UTC (rev 6034)
+++ trunk/openvas-manager/ChangeLog	2009-12-02 11:57:18 UTC (rev 6035)
@@ -1,3 +1,12 @@
+2009-12-02  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	Fixed a bug which caused NVT selections in non-growing families to be
+	wrongly calculated.
+
+	* src/tasks_sql.h (manage_set_config_nvts): Defer determining the old
+	NVT count until we know whether the family is growing or not, hand the
+	correct growing flag to nvt_selector_nvt_count ().
+
 2009-12-01  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	Post-release version bump.

Modified: trunk/openvas-manager/src/tasks_sql.h
===================================================================
--- trunk/openvas-manager/src/tasks_sql.h	2009-12-02 08:38:40 UTC (rev 6034)
+++ trunk/openvas-manager/src/tasks_sql.h	2009-12-02 11:57:18 UTC (rev 6035)
@@ -5968,14 +5968,14 @@
   /* If the family is growing, then exclude all no's, otherwise the family
    * is static, so include all yes's. */
 
-  old_nvt_count = nvt_selector_nvt_count (selector, family, 1);
-
   if (nvt_selector_family_growing (selector,
                                    family,
                                    config_families_growing (config)))
     {
       iterator_t nvts;
 
+      old_nvt_count = nvt_selector_nvt_count (selector, family, 1);
+
       /* Clear any NVT selectors for this family from the config. */
 
       sql ("DELETE FROM nvt_selectors"
@@ -6014,6 +6014,8 @@
     }
   else
     {
+      old_nvt_count = nvt_selector_nvt_count (selector, family, 0);
+
       /* Clear any NVT selectors for this family from the config. */
 
       sql ("DELETE FROM nvt_selectors"