[Openvas-commits] r12180 - in trunk/openvas-cli: . omp

[scm-commit@wald.intevation.org]

Author: hdoreau
Date: 2011-11-24 12:36:25 +0100 (Thu, 24 Nov 2011)
New Revision: 12180

Modified:
   trunk/openvas-cli/ChangeLog
   trunk/openvas-cli/omp/omp.c
Log:
* omp/omp.c (manager_get_reports): Don't exit if OMP version 3.0 is
used. If an unknown version is used, display it before exiting.


Modified: trunk/openvas-cli/ChangeLog
===================================================================
--- trunk/openvas-cli/ChangeLog	2011-11-24 10:11:17 UTC (rev 12179)
+++ trunk/openvas-cli/ChangeLog	2011-11-24 11:36:25 UTC (rev 12180)
@@ -1,3 +1,8 @@
+2011-11-24  Henri Doreau <henri.doreau at greenbone.net>
+
+	* omp/omp.c (manager_get_reports): Don't exit if OMP version 3.0 is
+	used. If an unknown version is used, display it before exiting.
+
 2011-10-12  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	Post release version bump.

Modified: trunk/openvas-cli/omp/omp.c
===================================================================
--- trunk/openvas-cli/omp/omp.c	2011-11-24 10:11:17 UTC (rev 12179)
+++ trunk/openvas-cli/omp/omp.c	2011-11-24 11:36:25 UTC (rev 12180)
@@ -560,14 +560,14 @@
       default_format = "XML";
       format_req_str = "format";
     }
-  else if (strcmp (version, "2.0") == 0)
+  else if ((strcmp (version, "2.0") == 0) || (strcmp (version, "3.0") == 0))
     {
       default_format = "d5da9f67-8551-4e51-807b-b6a873d70e34";
       format_req_str = "format_id";
     }
   else
     {
-      fprintf (stderr, "Unknown OMP version.\n");
+      fprintf (stderr, "Unknown OMP version (%s).\n", version);
       g_free (version);
       manager_close (connection);
       return -1;