[Openvas-commits] r1557 - trunk/sladinstaller

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2008-10-16 15:10:58 +0200 (Thu, 16 Oct 2008)
New Revision: 1557

Modified:
   trunk/sladinstaller/ChangeLog
   trunk/sladinstaller/gtk.cpp
Log:
Intergrated the OpenVAS patch into the sladinstaller trunk, fixed
filename widget for ssh key selection.

* gtk.cpp: (ThreadFunc) Changed to use .openvas instead of .nessus.
(loadsladkey) Changed to use a variable to store the ssh key instead of
storing it in the filename widget. (install) Read the ssh key from the
correct place.


Modified: trunk/sladinstaller/ChangeLog
===================================================================
--- trunk/sladinstaller/ChangeLog	2008-10-16 09:37:28 UTC (rev 1556)
+++ trunk/sladinstaller/ChangeLog	2008-10-16 13:10:58 UTC (rev 1557)
@@ -1,3 +1,13 @@
+2008-10-16  Michael Wiegand <michael.wiegand at intevation.de>
+
+	Intergrated the OpenVAS patch into the sladinstaller trunk, fixed
+	filename widget for ssh key selection.
+
+	* gtk.cpp: (ThreadFunc) Changed to use .openvas instead of .nessus.
+	(loadsladkey) Changed to use a variable to store the ssh key instead of
+	storing it in the filename widget. (install) Read the ssh key from the
+	correct place.
+
 2008-10-10  Michael Wiegand <michael.wiegand at intevation.de>
 
 	Adding sladinstaller to the OpenVAS SVN repository. This version was

Modified: trunk/sladinstaller/gtk.cpp
===================================================================
--- trunk/sladinstaller/gtk.cpp	2008-10-16 09:37:28 UTC (rev 1556)
+++ trunk/sladinstaller/gtk.cpp	2008-10-16 13:10:58 UTC (rev 1557)
@@ -1,5 +1,5 @@
 // SLAD Installer (c) 2005-2006 by DN-Systems Enterprise Internet
-// Solutions GmbH
+// Solutions GmbH, (c) 2008 by Intevation GmbH
 //
 // This file is part of SLAD Installer.
 //
@@ -67,6 +67,7 @@
 static GtkWidget *package, *hostname, *ip, *rootpassword, *sshpassphrase, *twsitepassphrase, *twlocalpassphrase, *progress, *installbutton, *mainwindow, *sladpubkey, *sladradiobutton, *scroll;
 static GtkTextBuffer *log;
 static std::string log_, filename_sladconf, filename_sshkey;
+static gchar * filecontent_sladpubkey;
 static GThread *installthread;
 static volatile bool installthreadrun;
 
@@ -308,8 +309,8 @@
 	      dir="~";
 	  }
       }
-    // and nessus directory
-    dir+="/.nessus";
+    // and OpenVAS directory
+    dir+="/.openvas";
     mkdir(dir.c_str(), 0700);
 
     std::string ip_;
@@ -512,7 +513,7 @@
   switch(SladRadioButton)
     {
     case SLAD_PUBKEY:
-      td->sladpubkey=gtk_entry_get_text(GTK_ENTRY(sladpubkey));
+      td->sladpubkey=filecontent_sladpubkey;
       if(td->sladpubkey.empty())
 	{
 	  ERROR(_("No public key was provided"));
@@ -622,7 +623,7 @@
 	  while(len && isspace(buf[len-1]))
 	    buf[--len]=0;
 
-	  fn=buf;
+	  filecontent_sladpubkey = buf;
 	}
       fclose(f);
     }