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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-03-13 18:13:09 +0100 (Fri, 13 Mar 2009)
New Revision: 2768

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage.c
Log:
	* manage.c (stop_task, start_task): Correct conditions of running checks.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-03-13 16:57:00 UTC (rev 2767)
+++ trunk/openvas-manager/ChangeLog	2009-03-13 17:13:09 UTC (rev 2768)
@@ -1,5 +1,9 @@
 2009-03-13  Matthew Mundell <matt at mundell.ukfsn.org>
 
+	* manage.c (stop_task, start_task): Correct conditions of running checks.
+
+2009-03-13  Matthew Mundell <matt at mundell.ukfsn.org>
+
 	Ensure that delete_task also removes the symlinks to the directory of
 	all the user's reports.
 

Modified: trunk/openvas-manager/src/manage.c
===================================================================
--- trunk/openvas-manager/src/manage.c	2009-03-13 16:57:00 UTC (rev 2767)
+++ trunk/openvas-manager/src/manage.c	2009-03-13 17:13:09 UTC (rev 2768)
@@ -784,7 +784,9 @@
 {
   tracef ("   start task %u\n", task->id);
 
-  if (task->running) return 0;
+  if (task->running == 1      /* Requested. */
+      || task->running == 2)  /* Running. */
+    return 0;
 
   if (send_to_server ("CLIENT <|> PREFERENCES <|>\n")) return -1;
 
@@ -847,7 +849,8 @@
 stop_task (task_t* task)
 {
   tracef ("   stop task %u\n", task->id);
-  if (task->running)
+  if (task->running == 1      /* Requested. */
+      || task->running == 2)  /* Running. */
     {
       // FIX dik
       if (send_to_server ("CLIENT <|> STOP_ATTACK <|> dik <|> CLIENT\n"))