[Openvas-commits] r2426 - in trunk/openvas-server: . openvasd

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-02-06 19:45:27 +0100 (Fri, 06 Feb 2009)
New Revision: 2426

Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/openvasd/pluginload.c
   trunk/openvas-server/openvasd/preferences.c
Log:
* openvasd/preferences.c (preferences_new): Added default for
config parameter "include_folders". It is set
to the plugins_folder to be compatible by default
with older version of openvasd.

* openvasd/pluginload.c: Added include for nasl.h.
(plugins_reload_from_dir): Initialize include paths.



Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2009-02-06 15:03:29 UTC (rev 2425)
+++ trunk/openvas-server/ChangeLog	2009-02-06 18:45:27 UTC (rev 2426)
@@ -1,3 +1,13 @@
+2009-02-06  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* openvasd/preferences.c (preferences_new): Added default for
+	config parameter "include_folders". It is set
+	to the plugins_folder to be compatible by default
+	with older version of openvasd.
+
+	* openvasd/pluginload.c: Added include for nasl.h.
+	(plugins_reload_from_dir): Initialize include paths.
+
 2009-02-05  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	Basic support for glob-style pattern definitions within the 

Modified: trunk/openvas-server/openvasd/pluginload.c
===================================================================
--- trunk/openvas-server/openvasd/pluginload.c	2009-02-06 15:03:29 UTC (rev 2425)
+++ trunk/openvas-server/openvasd/pluginload.c	2009-02-06 18:45:27 UTC (rev 2426)
@@ -36,6 +36,7 @@
 #include "log.h"
 #include "preferences.h"
 #include "users.h"
+#include "nasl.h"
 
 static pl_class_t* plugin_classes = NULL;
 
@@ -136,6 +137,10 @@
   char * name;
   int n = 0, total = 0, num_files = 0;
 
+  add_nasl_inc_dir(""); // for absolute and relative paths
+  // TODO: split up the string using ":" as separator and add all elements
+  add_nasl_inc_dir(arg_get_value(preferences, "include_folders"));
+
   init_plugin_classes(preferences);
 
   if( folder == NULL)

Modified: trunk/openvas-server/openvasd/preferences.c
===================================================================
--- trunk/openvas-server/openvasd/preferences.c	2009-02-06 15:03:29 UTC (rev 2425)
+++ trunk/openvas-server/openvasd/preferences.c	2009-02-06 18:45:27 UTC (rev 2426)
@@ -76,6 +76,11 @@
  fprintf(fd, "# Path to OpenVAS caching folder: \n");
  fprintf(fd, "cache_folder = %s\n\n", OPENVASD_CACHE);
 
+ fprintf(fd, "# Path to OpenVAS include directories: \n");
+ fprintf(fd, "# (multiple entries are separated with colon ':')\n");
+ // Default value is the same directory as the root for  the NVTs
+ fprintf(fd, "include_folders = %s\n\n", OPENVASD_PLUGINS);
+
  fprintf(fd, "# Maximum number of simultaneous hosts tested : \n");
  fprintf(fd, "max_hosts = 30\n\n");
  fprintf(fd, "# Maximum number of simultaneous checks against each host tested : \n");