Mailing List Archive

Update of /usr/local/cvs/nessus-core/nessusd
In directory raccoon.nessus.org:/tmp/cvs-serv94119/nessusd

Modified Files:
Tag: NESSUS_2_2
nasl_plugins.c nes_plugins.c ntp_11.c pluginscheduler.c
preferences.c
Log Message:
2.2.8

Index: nasl_plugins.c
===================================================================
RCS file: /usr/local/cvs/nessus-core/nessusd/nasl_plugins.c,v
retrieving revision 1.72.2.7
retrieving revision 1.72.2.8
diff -u -d -r1.72.2.7 -r1.72.2.8
--- nasl_plugins.c 30 Jan 2006 20:56:55 -0000 1.72.2.7
+++ nasl_plugins.c 22 May 2006 14:15:45 -0000 1.72.2.8
@@ -193,6 +193,35 @@
{
close(i);
}
+ #ifdef RLIMIT_RSS
+ {
+ struct rlimit rlim;
+ getrlimit(RLIMIT_RSS, &rlim);
+ rlim.rlim_cur = 1024*1024*512;
+ rlim.rlim_max = 1024*1024*512;
+ setrlimit(RLIMIT_RSS, &rlim);
+ }
+ #endif
+
+ #ifdef RLIMIT_AS
+ {
+ struct rlimit rlim;
+ getrlimit(RLIMIT_AS, &rlim);
+ rlim.rlim_cur = 1024*1024*512;
+ rlim.rlim_max = 1024*1024*512;
+ setrlimit(RLIMIT_AS, &rlim);
+ }
+ #endif
+
+ #ifdef RLIMIT_DATA
+ {
+ struct rlimit rlim;
+ getrlimit(RLIMIT_DATA, &rlim);
+ rlim.rlim_cur = 1024*1024*512;
+ rlim.rlim_max = 1024*1024*512;
+ setrlimit(RLIMIT_DATA, &rlim);
+ }
+ #endif
setproctitle("testing %s (%s)", (char*)arg_get_value(arg_get_value(args, "HOSTNAME"), "NAME"), (char*)arg_get_value(g_args, "name"));
signal(SIGTERM, _exit);


Index: nes_plugins.c
===================================================================
RCS file: /usr/local/cvs/nessus-core/nessusd/nes_plugins.c,v
retrieving revision 1.68.2.4
retrieving revision 1.68.2.5
diff -u -d -r1.68.2.4 -r1.68.2.5
--- nes_plugins.c 30 Jan 2006 20:56:55 -0000 1.68.2.4
+++ nes_plugins.c 22 May 2006 14:15:45 -0000 1.68.2.5
@@ -212,7 +212,10 @@

ptr = LOAD_LIBRARY(name);
if( ptr == NULL)
+ {
+ log_write("Couldn't load %s - %s\n", name, LIB_LAST_ERROR());
return -1;
+ }


func = (plugin_run_t)LOAD_FUNCTION(ptr, "plugin_run");

Index: ntp_11.c
===================================================================
RCS file: /usr/local/cvs/nessus-core/nessusd/ntp_11.c,v
retrieving revision 1.75.2.3
retrieving revision 1.75.2.4
diff -u -d -r1.75.2.3 -r1.75.2.4
--- ntp_11.c 30 Jan 2006 20:56:56 -0000 1.75.2.3
+++ ntp_11.c 22 May 2006 14:15:45 -0000 1.75.2.4
@@ -975,6 +975,9 @@
if(strlen(fname) + strlen(buf) + 6 > buf_size)
{
buf_size *= 2;
+ if(strlen(fname) + strlen(buf) + 6 > buf_size)
+ buf_size = strlen(fname) + strlen(buf) + 6;
+
buf = erealloc(buf, buf_size);
}
strncat(buf, fname, buf_size);

Index: pluginscheduler.c
===================================================================
RCS file: /usr/local/cvs/nessus-core/nessusd/pluginscheduler.c,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -d -r1.26.2.7 -r1.26.2.8
--- pluginscheduler.c 30 Jan 2006 20:56:56 -0000 1.26.2.7
+++ pluginscheduler.c 22 May 2006 14:15:45 -0000 1.26.2.8
@@ -660,7 +660,9 @@
struct list * l = ret->list[i];
while (l != NULL )
{
- if(plug_get_launch(l->plugin->arglist->value) == LAUNCH_DISABLED)
+ if(plug_get_launch(l->plugin->arglist->value) == LAUNCH_DISABLED &&
+ plug_get_category(l->plugin->arglist->value) != ACT_INIT &&
+ plug_get_category(l->plugin->arglist->value) != ACT_SETTINGS )
{
struct list * old = l->next;

@@ -702,7 +704,7 @@
l = h->list[category];

/*
- * Scanners (and DoS) must not be run in parrallel
+ * Scanners (and DoS) must not be run in parallel
*/

if((category == ACT_SCANNER) ||
@@ -802,7 +804,8 @@

/* Could not find anything */
if((category == ACT_SCANNER ||
- category == ACT_INIT) && flag != 0)
+ category == ACT_INIT ||
+ category == ACT_SETTINGS) && flag != 0)
{
pluginlaunch_wait_for_free_process();
flag = 0;

Index: preferences.c
===================================================================
RCS file: /usr/local/cvs/nessus-core/nessusd/preferences.c,v
retrieving revision 1.107.2.4
retrieving revision 1.107.2.5
diff -u -d -r1.107.2.4 -r1.107.2.5
--- preferences.c 16 Feb 2006 19:09:57 -0000 1.107.2.4
+++ preferences.c 22 May 2006 14:15:46 -0000 1.107.2.5
@@ -76,8 +76,8 @@

fprintf(fd, "# Log file : \n");
fprintf(fd, "logfile = %s\n\n", NESSUSD_MESSAGES);
- fprintf(fd, "# Shall we log every details of the attack ?\n");
- fprintf(fd, "log_whole_attack = yes\n\n");
+ fprintf(fd, "# Shall we log every details of the attack ? (disk intensive)\n");
+ fprintf(fd, "log_whole_attack = no\n\n");
fprintf(fd, "# Log the name of the plugins that are loaded by the server ?\n");
fprintf(fd, "log_plugins_name_at_load = no\n\n");
fprintf(fd, "# Dump file for debugging output, use `-' for stdout\n");

_______________________________________________
Nessus-cvs mailing list
Nessus-cvs@list.nessus.org
http://mail.nessus.org/mailman/listinfo/nessus-cvs