[Openvas-commits] r3426 - in trunk/openvas-client: . src/gui

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-05-19 15:03:44 +0200 (Tue, 19 May 2009)
New Revision: 3426

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/src/gui/ssh_keys_dialog.c
Log:
Remove installers / packages together with key files if an entry
is deleted via the OpenVAS LSC Credentials Manager.

* src/gui/ssh_keys_dialog.c (ssh_keys_dialog_delete_login):
Remove generated installers/packages when deleting a login.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-05-19 13:01:16 UTC (rev 3425)
+++ trunk/openvas-client/ChangeLog	2009-05-19 13:03:44 UTC (rev 3426)
@@ -1,5 +1,13 @@
 2009-05-19  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	Remove installers / packages together with key files if an entry
+	is deleted via the OpenVAS LSC Credentials Manager.
+
+	* src/gui/ssh_keys_dialog.c (ssh_keys_dialog_delete_login):
+	Remove generated installers/packages when deleting a login.
+
+2009-05-19  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	* src/util/openvas_lsc_target_prep.c,
 	src/util/openvas_lsc_target_prep.h (openvas_lsc_target_prep_remove):
 	New. Removes all generated installers / packages.

Modified: trunk/openvas-client/src/gui/ssh_keys_dialog.c
===================================================================
--- trunk/openvas-client/src/gui/ssh_keys_dialog.c	2009-05-19 13:01:16 UTC (rev 3425)
+++ trunk/openvas-client/src/gui/ssh_keys_dialog.c	2009-05-19 13:03:44 UTC (rev 3426)
@@ -44,6 +44,7 @@
 #include "preferences.h"
 #include "nvt_pref_sshlogin.h"
 #include "ssh_keys_dialog.h"
+#include "openvas_lsc_target_prep.h"
 #include "openvas_lsc_user_deb.h"
 #include "openvas_lsc_user_makensis.h"
 #include "openvas_ssh_key_create.h"
@@ -66,7 +67,7 @@
  * @see ssh_keys_dialog_show
  */
 void
-ssh_manager_button_cb (GtkWidget* super, void* ignored )
+ssh_manager_button_cb (GtkWidget* super, void* ignored)
 {
   // So far no pre- or post conditions, show dialog directly.
   ssh_keys_dialog_show();
@@ -161,9 +162,10 @@
   if (response == GTK_RESPONSE_YES)
     {
       openvas_ssh_login* login = g_hash_table_lookup(Global->sshkeys,  selected_account);
+      // Remove any installer / package.
+      openvas_lsc_target_prep_remove (login);
       // Remove files and entry in Context->sshkeys hash map
       openvas_ssh_key_create_undo (login);
-      /** @TODO remove installers */
 
       // Save the file so that the removed login is not listed anymore and will
       // not appear next time.