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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-03-15 07:12:01 +0100 (Tue, 15 Mar 2011)
New Revision: 10541

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
Log:
	* src/manage_sql.c (delete_lsc_credential): Remove attempt at location
	check from "in use" test.  The credential of a target can only be in the
	trash when the target is in the trash.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-03-15 06:00:32 UTC (rev 10540)
+++ trunk/openvas-manager/ChangeLog	2011-03-15 06:12:01 UTC (rev 10541)
@@ -1,5 +1,11 @@
 2011-03-15  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/manage_sql.c (delete_lsc_credential): Remove attempt at location
+	check from "in use" test.  The credential of a target can only be in the
+	trash when the target is in the trash.
+
+2011-03-15  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/manage_sql.c (delete_report_format): Put trash report formats in
 	DATA dir instead of SYSCONF dir.
 	(manage_restore): Restore report formats from DATA dir to DATA or STATE

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2011-03-15 06:00:32 UTC (rev 10540)
+++ trunk/openvas-manager/src/manage_sql.c	2011-03-15 06:12:01 UTC (rev 10541)
@@ -19433,12 +19433,7 @@
 
   if (sql_int (0, 0,
                "SELECT count(*) FROM targets"
-               " WHERE"
-               " (lsc_credential = %llu"
-               "  AND ssh_location = " G_STRINGIFY (LOCATION_TABLE) ")"
-               " OR"
-               " (smb_lsc_credential = %llu"
-               "  AND smb_location = " G_STRINGIFY (LOCATION_TABLE) ")",
+               " WHERE lsc_credential = %llu OR smb_lsc_credential = %llu",
                lsc_credential,
                lsc_credential))
     {