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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2010-06-09 12:23:25 +0200 (Wed, 09 Jun 2010)
New Revision: 7975

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
Log:
	* src/manage_sql.c (init_result_iterator): Collate hosts with collate_ip.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2010-06-09 10:22:18 UTC (rev 7974)
+++ trunk/openvas-manager/ChangeLog	2010-06-09 10:23:25 UTC (rev 7975)
@@ -1,3 +1,7 @@
+2010-06-09  Matthew Mundell <matthew.mundell at greenbone.net>
+
+	* src/manage_sql.c (init_result_iterator): Collate hosts with collate_ip.
+
 2010-06-08  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	Add target UUIDs.

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2010-06-09 10:22:18 UTC (rev 7974)
+++ trunk/openvas-manager/src/manage_sql.c	2010-06-09 10:23:25 UTC (rev 7975)
@@ -6268,17 +6268,17 @@
                                cvss_sql ? cvss_sql->str : "",
                                ascending
                                 ? ((strcmp (sort_field, "port") == 0)
-                                    ? " ORDER BY host,"
+                                    ? " ORDER BY host COLLATE collate_ip,"
                                       " port,"
                                       " type COLLATE collate_message_type DESC"
-                                    : " ORDER BY host,"
+                                    : " ORDER BY host COLLATE collate_ip,"
                                       " type COLLATE collate_message_type,"
                                       " port")
                                 : ((strcmp (sort_field, "port") == 0)
-                                    ? " ORDER BY host,"
+                                    ? " ORDER BY host COLLATE collate_ip,"
                                       " port DESC,"
                                       " type COLLATE collate_message_type DESC"
-                                    : " ORDER BY host,"
+                                    : " ORDER BY host COLLATE collate_ip,"
                                       " type COLLATE collate_message_type DESC,"
                                       " port"),
                                max_results,