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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Dec 30 19:01:19 CET 2009


Author: mattm
Date: 2009-12-30 19:01:18 +0100 (Wed, 30 Dec 2009)
New Revision: 6283

Added:
   trunk/openvas-manager/src/tests/omp_get_lsc_credentials_1.c
   trunk/openvas-manager/src/tests/omp_get_lsc_credentials_2.c
Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/tests/CMakeLists.txt
   trunk/openvas-manager/src/tests/omp_create_lsc_credential_0.c
   trunk/openvas-manager/src/tests/omp_create_lsc_credential_1.c
   trunk/openvas-manager/src/tests/omp_delete_lsc_credential_0.c
   trunk/openvas-manager/src/tests/omp_get_configs_0.c
   trunk/openvas-manager/src/tests/omp_get_configs_1.c
   trunk/openvas-manager/src/tests/omp_get_configs_2.c
   trunk/openvas-manager/src/tests/omp_get_configs_3.c
   trunk/openvas-manager/src/tests/omp_get_lsc_credentials_0.c
   trunk/openvas-manager/src/tests/omp_get_status_5.c
   trunk/openvas-manager/src/tests/omp_help_0.c
   trunk/openvas-manager/src/tests/omp_start_task_4.c
Log:
	* src/tests/omp_help_0.c (help_text): Match to current value.

	* src/tests/omp_get_configs_0.c, src/tests/omp_get_configs_1.c,
	src/tests/omp_get_configs_3.c, src/tests/omp_get_configs_2.c: Clear
	expected NVT growing state for "Full and fast".

	* src/tests/omp_get_status_5.c: Add config, escalator and target
	entities to expected response.

	* src/tests/omp_create_lsc_credential_1.c,
	src/tests/omp_delete_lsc_credential_0.c,
	src/tests/omp_create_lsc_credential_0.c,
	src/tests/omp_get_lsc_credentials_0.c: Add LOGIN to CREATE_LSC_CREDENTIAL.

	* src/tests/omp_start_task_4.c: Swap success and failure.

	* src/tests/omp_get_lsc_credentials_1.c,
	src/tests/omp_get_lsc_credentials_2.c: New files.

	* src/tests/CMakeLists.txt: Add omp_get_lsc_credentials_1 and
	omp_get_lsc_credentials_2.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/ChangeLog	2009-12-30 18:01:18 UTC (rev 6283)
@@ -1,5 +1,29 @@
 2009-12-30  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/tests/omp_help_0.c (help_text): Match to current value.
+
+	* src/tests/omp_get_configs_0.c, src/tests/omp_get_configs_1.c,
+	src/tests/omp_get_configs_3.c, src/tests/omp_get_configs_2.c: Clear
+	expected NVT growing state for "Full and fast".
+
+	* src/tests/omp_get_status_5.c: Add config, escalator and target
+	entities to expected response.
+
+	* src/tests/omp_create_lsc_credential_1.c,
+	src/tests/omp_delete_lsc_credential_0.c,
+	src/tests/omp_create_lsc_credential_0.c,
+	src/tests/omp_get_lsc_credentials_0.c: Add LOGIN to CREATE_LSC_CREDENTIAL.
+
+	* src/tests/omp_start_task_4.c: Swap success and failure.
+
+	* src/tests/omp_get_lsc_credentials_1.c,
+	src/tests/omp_get_lsc_credentials_2.c: New files.
+
+	* src/tests/CMakeLists.txt: Add omp_get_lsc_credentials_1 and
+	omp_get_lsc_credentials_2.
+
+2009-12-30  Matthew Mundell <matthew.mundell at intevation.de>
+
 	* src/tasks_sql.h (where_levels): Neaten doc formatting.
 
 	* src/ompd.c (serve_omp): Just read and log a character on select

Modified: trunk/openvas-manager/src/tests/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/src/tests/CMakeLists.txt	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/CMakeLists.txt	2009-12-30 18:01:18 UTC (rev 6283)
@@ -308,6 +308,18 @@
 target_link_libraries (omp_get_lsc_credentials_0 common)
 ADD_TEST (omp_get_lsc_credentials_0 omp_get_lsc_credentials_0)
 
+add_executable (omp_get_lsc_credentials_1 omp_get_lsc_credentials_1.c)
+set_target_properties (omp_get_lsc_credentials_1 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
+set_target_properties (omp_get_lsc_credentials_1 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (omp_get_lsc_credentials_1 common)
+ADD_TEST (omp_get_lsc_credentials_1 omp_get_lsc_credentials_1)
+
+add_executable (omp_get_lsc_credentials_2 omp_get_lsc_credentials_2.c)
+set_target_properties (omp_get_lsc_credentials_2 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
+set_target_properties (omp_get_lsc_credentials_2 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
+target_link_libraries (omp_get_lsc_credentials_2 common)
+ADD_TEST (omp_get_lsc_credentials_2 omp_get_lsc_credentials_2)
+
 add_executable (omp_get_targets_0 omp_get_targets_0.c)
 set_target_properties (omp_get_targets_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
 set_target_properties (omp_get_targets_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")

Modified: trunk/openvas-manager/src/tests/omp_create_lsc_credential_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_create_lsc_credential_0.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_create_lsc_credential_0.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -57,6 +57,7 @@
   if (openvas_server_send (&session,
                            "<create_lsc_credential>"
                            "<name>ompcreatelsccredential0</name>"
+                           "<login>ompcreatelsccredential0</login>"
                            "</create_lsc_credential>")
       == -1)
     {

Modified: trunk/openvas-manager/src/tests/omp_create_lsc_credential_1.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_create_lsc_credential_1.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_create_lsc_credential_1.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -56,6 +56,7 @@
   omp_delete_lsc_credential (&session, "ompcreatelsccredential1");
   if (openvas_server_send (&session, "<create_lsc_credential>"
                                      "<name>ompcreatelsccredential1</name>"
+                                     "<login>ompcreatelsccredential1</login>"
                                      "</create_lsc_credential>")
       == -1)
     {
@@ -95,6 +96,7 @@
 
   if (openvas_server_send (&session, "<create_lsc_credential>"
                                      "<name>ompcreatelsccredential1</name>"
+                                     "<login>ompcreatelsccredential1</login>"
                                      "</create_lsc_credential>")
       == -1)
     {

Modified: trunk/openvas-manager/src/tests/omp_delete_lsc_credential_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_delete_lsc_credential_0.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_delete_lsc_credential_0.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -57,6 +57,7 @@
   if (openvas_server_send (&session,
                            "<create_lsc_credential>"
                            "<name>ompdeletelsccredential0</name>"
+                           "<login>ompdeletelsccredential0</login>"
                            "</create_lsc_credential>")
       == -1)
     {

Modified: trunk/openvas-manager/src/tests/omp_get_configs_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_configs_0.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_configs_0.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -92,7 +92,7 @@
               count = entity_child (config, "nvt_count");
               if (count == NULL) break;
               growing = entity_child (count, "growing");
-              if (growing == NULL || strcmp (entity_text (growing), "1"))
+              if (growing == NULL || strcmp (entity_text (growing), "0"))
                 break;
               found_1 = 1;
               break;

Modified: trunk/openvas-manager/src/tests/omp_get_configs_1.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_configs_1.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_configs_1.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -101,7 +101,7 @@
               count = entity_child (config, "nvt_count");
               if (count == NULL) break;
               growing = entity_child (count, "growing");
-              if (growing == NULL || strcmp (entity_text (growing), "1"))
+              if (growing == NULL || strcmp (entity_text (growing), "0"))
                 break;
               found_1 = 1;
             }

Modified: trunk/openvas-manager/src/tests/omp_get_configs_2.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_configs_2.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_configs_2.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -129,7 +129,7 @@
               count = entity_child (config, "nvt_count");
               if (count == NULL) break;
               growing = entity_child (count, "growing");
-              if (growing == NULL || strcmp (entity_text (growing), "1"))
+              if (growing == NULL || strcmp (entity_text (growing), "0"))
                 break;
               found_1 = 1;
               break;

Modified: trunk/openvas-manager/src/tests/omp_get_configs_3.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_configs_3.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_configs_3.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -140,7 +140,7 @@
               count = entity_child (config, "nvt_count");
               if (count == NULL) break;
               growing = entity_child (count, "growing");
-              if (growing == NULL || strcmp (entity_text (growing), "1"))
+              if (growing == NULL || strcmp (entity_text (growing), "0"))
                 break;
               found_1 = 1;
             }

Modified: trunk/openvas-manager/src/tests/omp_get_lsc_credentials_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_lsc_credentials_0.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_lsc_credentials_0.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -59,14 +59,14 @@
   /* Ensure the lsc_credentials exist. */
 
   omp_delete_lsc_credential (&session, NAME_1);
-  if (omp_create_lsc_credential (&session, NAME_1, COMMENT_1) == -1)
+  if (omp_create_lsc_credential (&session, NAME_1, NAME_2, COMMENT_1) == -1)
     {
       close_manager_connection (socket, session);
       return EXIT_FAILURE;
     }
 
   omp_delete_lsc_credential (&session, NAME_2);
-  if (omp_create_lsc_credential (&session, NAME_2, NULL) == -1)
+  if (omp_create_lsc_credential (&session, NAME_2, NAME_1, NULL) == -1)
     {
       close_manager_connection (socket, session);
       return EXIT_FAILURE;
@@ -95,13 +95,17 @@
         {
           entity_t name = entity_child (lsc_credential, "name");
           entity_t comment = entity_child (lsc_credential, "comment");
+          entity_t login = entity_child (lsc_credential, "login");
           if (name == NULL
+              || login == NULL
               || comment == NULL)
             goto free_fail;
           if ((strcmp (entity_text (name), NAME_1) == 0)
+              && (strcmp (entity_text (login), NAME_2) == 0)
               && (strcmp (entity_text (comment), COMMENT_1) == 0))
             found_1 = 1;
           else if ((strcmp (entity_text (name), NAME_2) == 0)
+                   && (strcmp (entity_text (login), NAME_1) == 0)
                    && (strcmp (entity_text (comment), "") == 0))
             found_2 = 1;
           lsc_credentials = next_entities (lsc_credentials);

Added: trunk/openvas-manager/src/tests/omp_get_lsc_credentials_1.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_lsc_credentials_1.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_lsc_credentials_1.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -0,0 +1,119 @@
+/* Test 1 of getting the lsc_credentials.
+ * $Id$
+ * Description: Test OMP get_lsc_credentials, naming a credential.
+ *
+ * Authors:
+ * Matthew Mundell <matthew.mundell at intevation.de>
+ *
+ * Copyright:
+ * Copyright (C) 2009 Greenbone Networks GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * or, at your option, any later version as published by the Free
+ * Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define TRACE 1
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "common.h"
+#include "../tracef.h"
+
+#define NAME_1 "ompgetlsccredentials1name1"
+#define NAME_2 "ompgetlsccredentials1name2"
+#define COMMENT_1 "Test comment."
+
+int
+main ()
+{
+  int socket, found_1 = 0;
+  gnutls_session_t session;
+  entities_t lsc_credentials;
+  entity_t entity, lsc_credential;
+
+  setup_test ();
+
+  socket = connect_to_manager (&session);
+  if (socket == -1) return EXIT_FAILURE;
+
+  if (omp_authenticate_env (&session))
+    {
+      close_manager_connection (socket, session);
+      return EXIT_FAILURE;
+    }
+
+  /* Ensure the lsc_credentials exist. */
+
+  omp_delete_lsc_credential (&session, NAME_1);
+  if (omp_create_lsc_credential (&session, NAME_1, NAME_1, COMMENT_1) == -1)
+    {
+      close_manager_connection (socket, session);
+      return EXIT_FAILURE;
+    }
+
+  omp_delete_lsc_credential (&session, NAME_2);
+  if (omp_create_lsc_credential (&session, NAME_2, NAME_2, NULL) == -1)
+    {
+      close_manager_connection (socket, session);
+      return EXIT_FAILURE;
+    }
+
+  /* Request the lsc_credentials. */
+
+  if (openvas_server_sendf (&session,
+                            "<get_lsc_credentials name=\"%s\"/>",
+                            NAME_1)
+      == -1)
+    goto delete_fail;
+
+  /* Check that the response includes the created entry. */
+
+  entity = NULL;
+  if (read_entity (&session, &entity))
+    {
+      fprintf (stderr, "Failed to read response.\n");
+      goto delete_fail;
+    }
+
+  if (entity_attribute (entity, "status")
+      && strcmp (entity_attribute (entity, "status"), "200") == 0)
+    {
+      lsc_credentials = entity->entities;
+      if ((lsc_credential = first_entity (lsc_credentials)))
+        {
+          entity_t name = entity_child (lsc_credential, "name");
+          entity_t comment = entity_child (lsc_credential, "comment");
+          entity_t login = entity_child (lsc_credential, "login");
+          if (name == NULL
+              || login == NULL
+              || comment == NULL)
+            goto free_fail;
+          if ((strcmp (entity_text (name), NAME_1) == 0)
+              && (strcmp (entity_text (login), NAME_1) == 0)
+              && (strcmp (entity_text (comment), COMMENT_1) == 0))
+            found_1 = 1;
+        }
+    }
+
+ free_fail:
+  free_entity (entity);
+ delete_fail:
+  omp_delete_lsc_credential (&session, NAME_1);
+  omp_delete_lsc_credential (&session, NAME_2);
+  close_manager_connection (socket, session);
+  return found_1 ? EXIT_SUCCESS : EXIT_FAILURE;
+}

Added: trunk/openvas-manager/src/tests/omp_get_lsc_credentials_2.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_lsc_credentials_2.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_lsc_credentials_2.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -0,0 +1,123 @@
+/* Test 2 of getting the lsc_credentials.
+ * $Id$
+ * Description: Test OMP get_lsc_credentials with a format, naming a credential.
+ *
+ * Authors:
+ * Matthew Mundell <matthew.mundell at intevation.de>
+ *
+ * Copyright:
+ * Copyright (C) 2009 Greenbone Networks GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * or, at your option, any later version as published by the Free
+ * Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define TRACE 1
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "common.h"
+#include "../tracef.h"
+
+#define NAME_1 "ompgetlsccredentials2name1"
+#define NAME_2 "ompgetlsccredentials2name2"
+#define COMMENT_1 "Test comment."
+
+int
+main ()
+{
+  int socket, found_1 = 0;
+  gnutls_session_t session;
+  entities_t lsc_credentials;
+  entity_t entity, lsc_credential;
+
+  setup_test ();
+
+  socket = connect_to_manager (&session);
+  if (socket == -1) return EXIT_FAILURE;
+
+  if (omp_authenticate_env (&session))
+    {
+      close_manager_connection (socket, session);
+      return EXIT_FAILURE;
+    }
+
+  /* Ensure the lsc_credentials exist. */
+
+  omp_delete_lsc_credential (&session, NAME_1);
+  if (omp_create_lsc_credential (&session, NAME_1, NAME_1, COMMENT_1) == -1)
+    {
+      close_manager_connection (socket, session);
+      return EXIT_FAILURE;
+    }
+
+  omp_delete_lsc_credential (&session, NAME_2);
+  if (omp_create_lsc_credential (&session, NAME_2, NAME_2, NULL) == -1)
+    {
+      close_manager_connection (socket, session);
+      return EXIT_FAILURE;
+    }
+
+  /* Request the lsc_credentials. */
+
+  if (openvas_server_sendf (&session,
+                            "<get_lsc_credentials name=\"%s\" format=\"rpm\"/>",
+                            NAME_1)
+      == -1)
+    goto delete_fail;
+
+  /* Check that the response includes both created entries. */
+
+  entity = NULL;
+  if (read_entity (&session, &entity))
+    {
+      fprintf (stderr, "Failed to read response.\n");
+      goto delete_fail;
+    }
+
+  if (entity_attribute (entity, "status")
+      && strcmp (entity_attribute (entity, "status"), "200") == 0)
+    {
+      lsc_credentials = entity->entities;
+      if ((lsc_credential = first_entity (lsc_credentials)))
+        {
+          entity_t name = entity_child (lsc_credential, "name");
+          entity_t login = entity_child (lsc_credential, "login");
+          entity_t comment = entity_child (lsc_credential, "comment");
+          entity_t package = entity_child (lsc_credential, "package");
+          if (name == NULL
+              || login == NULL
+              || comment == NULL)
+            goto free_fail;
+          if ((strcmp (entity_text (name), NAME_1) == 0)
+              && (strcmp (entity_text (login), NAME_1) == 0)
+              && (strcmp (entity_text (comment), COMMENT_1) == 0)
+              && entity_attribute (package, "format")
+              && (strcmp (entity_attribute (package, "format"), "rpm") == 0)
+              && openvas_isbase64 (entity_text (package)))
+            found_1 = 1;
+        }
+    }
+
+ free_fail:
+  free_entity (entity);
+ delete_fail:
+  omp_delete_lsc_credential (&session, NAME_1);
+  omp_delete_lsc_credential (&session, NAME_2);
+  close_manager_connection (socket, session);
+  return found_1 ? EXIT_SUCCESS : EXIT_FAILURE;
+}

Modified: trunk/openvas-manager/src/tests/omp_get_status_5.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_get_status_5.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_get_status_5.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -40,7 +40,8 @@
   int socket;
   gnutls_session_t session;
   char* id;
-  entity_t entity, expected, task, messages, report_count;
+  entity_t entity, expected, task, messages, report_count, element;
+  gchar* string;
 
   setup_test ();
 
@@ -92,6 +93,18 @@
   task = add_entity (&expected->entities, "task", NULL);
   add_attribute (task, "id", id);
   add_entity (&task->entities, "name", "Task for omp_get_status_5");
+
+  element = add_entity (&task->entities, "config", NULL);
+  string = g_strdup_printf ("Imported config for task %s", id);
+  add_entity (&element->entities, "name", string);
+  g_free (string);
+  element = add_entity (&task->entities, "escalator", NULL);
+  add_entity (&element->entities, "name", NULL);
+  element = add_entity (&task->entities, "target", NULL);
+  string = g_strdup_printf ("Imported target for task %s", id);
+  add_entity (&element->entities, "name", string);
+  g_free (string);
+
   add_entity (&task->entities, "status", "New");
   add_entity (&task->entities, "progress", "-1");
   messages = add_entity (&task->entities, "messages", NULL);

Modified: trunk/openvas-manager/src/tests/omp_help_0.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_help_0.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_help_0.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -36,13 +36,15 @@
 "    ABORT_TASK             Abort a running task.\n"
 "    AUTHENTICATE           Authenticate with the manager.\n"
 "    COMMANDS               Run a list of commands.\n"
+"    CREATE_AGENT           Create an agent.\n"
 "    CREATE_CONFIG          Create a config.\n"
-"    CREATE_AGENT           Create a agent.\n"
+"    CREATE_ESCALATOR       Create an escalator.\n"
 "    CREATE_LSC_CREDENTIAL  Create a local security check credential.\n"
 "    CREATE_TARGET          Create a target.\n"
 "    CREATE_TASK            Create a task.\n"
-"    DELETE_AGENT           Delete a agent.\n"
+"    DELETE_AGENT           Delete an agent.\n"
 "    DELETE_CONFIG          Delete a config.\n"
+"    DELETE_ESCALATOR       Delete an escalator.\n"
 "    DELETE_LSC_CREDENTIAL  Delete a local security check credential.\n"
 "    DELETE_REPORT          Delete a report.\n"
 "    DELETE_TARGET          Delete a target.\n"
@@ -51,6 +53,7 @@
 "    GET_CERTIFICATES       Get all available certificates.\n"
 "    GET_CONFIGS            Get all configs.\n"
 "    GET_DEPENDENCIES       Get dependencies for all available NVTs.\n"
+"    GET_ESCALATORS         Get all escalators.\n"
 "    GET_LSC_CREDENTIALS    Get all local security check credentials.\n"
 "    GET_NVT_ALL            Get IDs and names of all available NVTs.\n"
 "    GET_NVT_DETAILS        Get all details for all available NVTs.\n"

Modified: trunk/openvas-manager/src/tests/omp_start_task_4.c
===================================================================
--- trunk/openvas-manager/src/tests/omp_start_task_4.c	2009-12-30 17:49:46 UTC (rev 6282)
+++ trunk/openvas-manager/src/tests/omp_start_task_4.c	2009-12-30 18:01:18 UTC (rev 6283)
@@ -97,7 +97,10 @@
       free (id2);
  fail:
       close_manager_connection (socket, session);
-      return EXIT_FAILURE;
+      /* With the new forking mechanism for starting tasks it is possible
+       * to start two tasks on the same connection, so this is actually
+       * the correct behaviour. */
+      return EXIT_SUCCESS;
     }
 
   free_entity (expected);
@@ -107,5 +110,5 @@
   free (id1);
   free (id2);
   close_manager_connection (socket, session);
-  return EXIT_SUCCESS;
+  return EXIT_FAILURE;
 }



More information about the Openvas-commits mailing list