[Openvas-commits] r5427 - in trunk/openvas-client: . openvas openvas/prefs_dialog

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Oct 7 12:49:45 CEST 2009


Author: jan
Date: 2009-10-07 12:49:43 +0200 (Wed, 07 Oct 2009)
New Revision: 5427

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/openvas/context.c
   trunk/openvas-client/openvas/openvas-client.c
   trunk/openvas-client/openvas/pdf_output.c
   trunk/openvas-client/openvas/preferences.c
   trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c
Log:
* openvas/context.c (context_collect, context_new, context_add,
context_collect_servers), openvas/openvas-client.c (main),
openvas/pdf_output.c (arglist_to_pdf),
openvas/preferences.c (prefs_get_default),
openvas/prefs_dialog/prefs_scope_tree.c (create_omp_scope):
Renamed key "nessus_dir" to "openvas_dir".  



Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-10-07 10:37:26 UTC (rev 5426)
+++ trunk/openvas-client/ChangeLog	2009-10-07 10:49:43 UTC (rev 5427)
@@ -1,3 +1,12 @@
+2009-10-07  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
+	* openvas/context.c (context_collect, context_new, context_add,
+	context_collect_servers), openvas/openvas-client.c (main),
+	openvas/pdf_output.c (arglist_to_pdf),
+	openvas/preferences.c (prefs_get_default),
+	openvas/prefs_dialog/prefs_scope_tree.c (create_omp_scope):
+	Renamed key "nessus_dir" to "openvas_dir".  
+
 2009-10-07  Matthew Mundell <matthew.mundell at intevation.de>
 
 	* ChangeLog: Mark USE_OMP in last few logs.

Modified: trunk/openvas-client/openvas/context.c
===================================================================
--- trunk/openvas-client/openvas/context.c	2009-10-07 10:37:26 UTC (rev 5426)
+++ trunk/openvas-client/openvas/context.c	2009-10-07 10:49:43 UTC (rev 5427)
@@ -520,22 +520,22 @@
 void
 context_collect (struct context *context)
 {
-  const char *dir = estrdup (prefs_get_string (context, "nessus_dir"));
+  const char *dir = estrdup (prefs_get_string (context, "openvas_dir"));
   context_collect_recurse (context, dir);
 }
 
 #ifdef USE_OMP
 /**
- * @brief Recursively collects server contexts found in and under the nessus_dir.
+ * @brief Recursively collects server contexts found in and under the openvas_dir.
  *
- * @param context Is queried for the nessus_dir preference, found server
+ * @param context Is queried for the openvas_dir preference, found server
  *                contexts are added to it under .Servers.
  */
 void
 context_collect_servers (struct context *context)
 {
   /** @todo use glibs path building functions (instead of strcat) */
-  const char *dir = prefs_get_string (context, "nessus_dir");
+  const char *dir = prefs_get_string (context, "openvas_dir");
   char *sdir = emalloc (strlen (dir) + strlen ("/.Servers") + 1);
 
   strcpy (sdir, dir);
@@ -760,7 +760,7 @@
   if (parent->dir)
     dir = parent->dir;
   else
-    dir = prefs_get_string (parent, "nessus_dir");
+    dir = prefs_get_string (parent, "openvas_dir");
 
   if(!check_is_dir(dir) && (mkdir(dir, 0700) < 0))
     {
@@ -924,7 +924,7 @@
   if(parent->dir)
     dir = parent->dir;
   else
-    dir = prefs_get_string(parent, "nessus_dir");
+    dir = prefs_get_string(parent, "openvas_dir");
 
   if(!check_is_dir(dir) && (mkdir(dir, 0700) < 0))
   {

Modified: trunk/openvas-client/openvas/openvas-client.c
===================================================================
--- trunk/openvas-client/openvas/openvas-client.c	2009-10-07 10:37:26 UTC (rev 5426)
+++ trunk/openvas-client/openvas/openvas-client.c	2009-10-07 10:49:43 UTC (rev 5427)
@@ -1458,7 +1458,7 @@
 #ifdef USE_OMP
   if(!quiet_mode)
     {
-      const char *dir = prefs_get_string (Global, "nessus_dir");
+      const char *dir = prefs_get_string (Global, "openvas_dir");
       gchar *servers_dir = g_build_filename (dir, "/.Servers", NULL);
 
       if (g_mkdir_with_parents (servers_dir, 0700))

Modified: trunk/openvas-client/openvas/pdf_output.c
===================================================================
--- trunk/openvas-client/openvas/pdf_output.c	2009-10-07 10:37:26 UTC (rev 5426)
+++ trunk/openvas-client/openvas/pdf_output.c	2009-10-07 10:49:43 UTC (rev 5427)
@@ -265,7 +265,7 @@
                             NULL, "bin\\htmldoc.exe");
 #endif /* CYGWIN */
 
- const char *openvas_dir = estrdup (prefs_get_string(Global, "nessus_dir"));
+ const char *openvas_dir = estrdup (prefs_get_string(Global, "openvas_dir"));
 
  snprintf(tmpfname, PATH_MAX, "%s/.openvas_%d_pdf", openvas_dir, getpid());
 

Modified: trunk/openvas-client/openvas/preferences.c
===================================================================
--- trunk/openvas-client/openvas/preferences.c	2009-10-07 10:37:26 UTC (rev 5426)
+++ trunk/openvas-client/openvas/preferences.c	2009-10-07 10:49:43 UTC (rev 5427)
@@ -659,7 +659,7 @@
     return (void *)OPENVAS_IANA_OTP_PORT;
   else if (!strcmp(name, "ssl_version"))
     return SSL_VER_DEF_NAME;
-  else if (!strcmp(name, "nessus_dir"))
+  else if (!strcmp(name, "openvas_dir"))
     {
       static char *openvas_dir;
       if (!openvas_dir)

Modified: trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c
===================================================================
--- trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c	2009-10-07 10:37:26 UTC (rev 5426)
+++ trunk/openvas-client/openvas/prefs_dialog/prefs_scope_tree.c	2009-10-07 10:49:43 UTC (rev 5427)
@@ -940,7 +940,7 @@
   gchar* file_name;
   gboolean ok;
 
-  servers_dir_name = g_build_filename (prefs_get_string (context, "nessus_dir"),
+  servers_dir_name = g_build_filename (prefs_get_string (context, "openvas_dir"),
                                        ".Servers",
                                        NULL);
   if (check_is_dir (servers_dir_name))



More information about the Openvas-commits mailing list