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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-02 20:16:21 +0100 (Wed, 02 Nov 2011)
New Revision: 11952

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
Log:
	* src/manage_sql.c (cvss_threat, prognosis_where_levels): Match CVSS
	threat boundaries to update of CR 42.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-11-02 17:25:03 UTC (rev 11951)
+++ trunk/openvas-manager/ChangeLog	2011-11-02 19:16:21 UTC (rev 11952)
@@ -1,5 +1,10 @@
 2011-11-02  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/manage_sql.c (cvss_threat, prognosis_where_levels): Match CVSS
+	threat boundaries to update of CR 42.
+
+2011-11-02  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/manage_sql.c (print_report_xml): Correct detail descriptions in
 	assets case.
 

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2011-11-02 17:25:03 UTC (rev 11951)
+++ trunk/openvas-manager/src/manage_sql.c	2011-11-02 19:16:21 UTC (rev 11952)
@@ -906,9 +906,9 @@
 {
   if (cvss < 0 || cvss > 10)
     return "";
-  if (cvss < 2)
+  if (cvss <= 2)
     return "Low";
-  if (cvss < 5)
+  if (cvss <= 5)
     return "Medium";
   return "High";
 }
@@ -10900,22 +10900,22 @@
     return "";
 
   if (high && medium)
-    return " AND cves.cvss >= 2";
+    return " AND cves.cvss > 2";
 
   if (high && low)
-    return " AND (cves.cvss >= 5 OR cves.cvss < 2)";
+    return " AND (cves.cvss > 5 OR cves.cvss <= 2)";
 
   if (medium && low)
-    return " AND cves.cvss < 5";
+    return " AND cves.cvss <= 5";
 
   if (high)
-    return " AND cves.cvss >= 5";
+    return " AND cves.cvss > 5";
 
   if (medium)
-    return " AND cves.cvss < 5 AND cves.cvss >= 2";
+    return " AND cves.cvss <= 5 AND cves.cvss > 2";
 
   if (low)
-    return " AND cves.cvss < 2";
+    return " AND cves.cvss <= 2";
 
   return "";
 }