[Openvas-commits] r13259 - in branches/openvas-manager-3.0: . src

[scm-commit at wald.intevation.org]

Author: mattm
Date: 2012-04-17 15:20:56 +0200 (Tue, 17 Apr 2012)
New Revision: 13259

Modified:
   branches/openvas-manager-3.0/ChangeLog
   branches/openvas-manager-3.0/src/manage_sql.c
Log:
	* src/manage_sql.c (init_port_range_iterator)
	(init_port_list_target_iterator): Add explicit "all" case, otherwise the
	selection is always empty.  Backport from trunk; initially committed in
	r13258.

Modified: branches/openvas-manager-3.0/ChangeLog
===================================================================
--- branches/openvas-manager-3.0/ChangeLog	2012-04-17 11:33:37 UTC (rev 13258)
+++ branches/openvas-manager-3.0/ChangeLog	2012-04-17 13:20:56 UTC (rev 13259)
@@ -1,3 +1,10 @@
+2012-04-17  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/manage_sql.c (init_port_range_iterator)
+	(init_port_list_target_iterator): Add explicit "all" case, otherwise the
+	selection is always empty.  Backport from trunk; initially committed in
+	r13258.
+
 2012-03-28  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
 	* CMakeLists.txt, INSTALL: Set dependency for glib and gnutls

Modified: branches/openvas-manager-3.0/src/manage_sql.c
===================================================================
--- branches/openvas-manager-3.0/src/manage_sql.c	2012-04-17 11:33:37 UTC (rev 13258)
+++ branches/openvas-manager-3.0/src/manage_sql.c	2012-04-17 13:20:56 UTC (rev 13259)
@@ -35393,21 +35393,36 @@
 {
   assert (current_credentials.uuid);
 
-  init_iterator (iterator,
-                 "SELECT uuid, comment, start, end, type, exclude"
-                 " FROM port_ranges%s"
-                 " WHERE port_list = %llu"
-                 " AND"
-                 " (((SELECT owner FROM port_lists WHERE ROWID = port_list)"
-                 "   IS NULL)"
-                 "  OR ((SELECT owner FROM port_lists WHERE ROWID = port_list)"
-                 "      = (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
-                 " ORDER BY %s %s;",
-                 trash ? "_trash" : "",
-                 port_list,
-                 current_credentials.uuid,
-                 sort_field ? sort_field : "type, CAST (start AS INTEGER)",
-                 ascending ? "ASC" : "DESC");
+  if (port_list)
+    init_iterator (iterator,
+                   "SELECT uuid, comment, start, end, type, exclude"
+                   " FROM port_ranges%s"
+                   " WHERE port_list = %llu"
+                   " AND"
+                   " (((SELECT owner FROM port_lists WHERE ROWID = port_list)"
+                   "   IS NULL)"
+                   "  OR ((SELECT owner FROM port_lists WHERE ROWID = port_list)"
+                   "      = (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
+                   " ORDER BY %s %s;",
+                   trash ? "_trash" : "",
+                   port_list,
+                   current_credentials.uuid,
+                   sort_field ? sort_field : "type, CAST (start AS INTEGER)",
+                   ascending ? "ASC" : "DESC");
+  else
+    init_iterator (iterator,
+                   "SELECT uuid, comment, start, end, type, exclude"
+                   " FROM port_ranges%s"
+                   " WHERE"
+                   " (((SELECT owner FROM port_lists WHERE ROWID = port_list)"
+                   "   IS NULL)"
+                   "  OR ((SELECT owner FROM port_lists WHERE ROWID = port_list)"
+                   "      = (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
+                   " ORDER BY %s %s;",
+                   trash ? "_trash" : "",
+                   current_credentials.uuid,
+                   sort_field ? sort_field : "type, CAST (start AS INTEGER)",
+                   ascending ? "ASC" : "DESC");
 }
 
 /**
@@ -35525,15 +35540,24 @@
 {
   assert (current_credentials.uuid);
 
-  init_iterator (iterator,
-                 "SELECT uuid, name FROM targets"
-                 " WHERE port_range = %llu"
-                 " AND ((owner IS NULL) OR (owner ="
-                 " (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
-                 " ORDER BY name %s;",
-                 port_list,
-                 current_credentials.uuid,
-                 ascending ? "ASC" : "DESC");
+  if (port_list)
+    init_iterator (iterator,
+                   "SELECT uuid, name FROM targets"
+                   " WHERE port_range = %llu"
+                   " AND ((owner IS NULL) OR (owner ="
+                   " (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
+                   " ORDER BY name %s;",
+                   port_list,
+                   current_credentials.uuid,
+                   ascending ? "ASC" : "DESC");
+  else
+    init_iterator (iterator,
+                   "SELECT uuid, name FROM targets"
+                   " WHERE ((owner IS NULL) OR (owner ="
+                   " (SELECT ROWID FROM users WHERE users.uuid = '%s')))"
+                   " ORDER BY name %s;",
+                   current_credentials.uuid,
+                   ascending ? "ASC" : "DESC");
 }
 
 /**