@@ -1,3 +1,8 @@

+Fri Mar 25 18:47:34 CET 2005 (tk)

+---------------------------------

+  * freshclam: fork before system() call in daemon mode (patch by Per Jessen

+	       <per*computer.org>)

+

 Tue Mar 22 22:54:46 CET 2005 (tk)

 ---------------------------------

   * libclamav/scanners.c: fix encrypted zip detecion (patch by Dirk Mueller

@@ -38,3 +38,4 @@

 #define CL_DEFAULT_CHECKS 12

 #define CL_DEFAULT_MAXATTEMPTS 3

+#define CL_MAX_CHILDREN 5

new file mode 100644

@@ -0,0 +1,57 @@

+/*

+ *  By Per Jessen <per@computer.org>

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+ */

+

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <unistd.h>

+#include <string.h>

+#include <errno.h>

+

+#include "defaults.h"

+#include "freshclam.h"

+#include "output.h"

+

+int active_children;

+

+void execute( const char *type, const char *text )

+{

+	pid_t pid;

+

+	if ( active_children<CL_MAX_CHILDREN )

+	switch( pid=fork() ) {

+	case 0:

+		if ( -1==system(text) )

+		{

+		mprintf("@%s: couldn't execute \"%s\".\n", type, text);

+		}

+		exit(0);

+	case -1:

+		mprintf("@%s::fork() failed, %s.\n", type, strerror(errno));

+		break;

+	default:

+		active_children++;

+	}

+	else

+	{

+		mprintf("@%s: already %d processes active.\n", type, active_children);

+	}

+}

new file mode 100644

@@ -0,0 +1,25 @@

+/*

+ *  By Per Jessen <per@computer.org>

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

+ */

+

+

+#ifndef __EXECUTE_H

+#define __EXECUTE_H

+

+void execute( const char *type, const char *text );

+

+#endif

@@ -29,6 +29,7 @@

 #include <signal.h>

 #include <time.h>

 #include <sys/types.h>

+#include <sys/wait.h>

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <pwd.h>

@@ -45,13 +46,19 @@

 #include "output.h"

 #include "target.h"

 #include "misc.h"

+#include "execute.h"

 static short terminate = 0;

-

+extern int active_children;

 static void daemon_sighandler(int sig) {

     switch(sig) {

+	case SIGCHLD:

+	    waitpid(-1, NULL, WNOHANG);

+	    active_children--;

+	    break;

+

 	case SIGALRM:

 	case SIGUSR1:

 	    terminate = -1;

@@ -291,23 +298,28 @@ int freshclam(struct optstruct *opt)

 	    writepid(pidfile);

 	}

+	active_children = 0;

+

 	logg("freshclam daemon "VERSION" (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n");

 	sigaction(SIGTERM, &sigact, NULL);

 	sigaction(SIGHUP, &sigact, NULL);

 	sigaction(SIGINT, &sigact, NULL);

+        sigaction(SIGCHLD, &sigact, NULL);

 	while(!terminate) {

 	    ret = download(copt, opt);

+            if(ret > 1) {

+		    const char *arg = NULL;

-	    if(optl(opt, "on-error-execute")) {

-		if(ret > 1)

-		    system(getargl(opt, "on-error-execute"));

+	        if(optl(opt, "on-error-execute"))

+		    arg = getargl(opt, "on-error-execute");

+		else if((cpt = cfgopt(copt, "OnErrorExecute")))

+		    arg = cpt->strarg;

-	    } else if((cpt = cfgopt(copt, "OnErrorExecute"))) {

-		if(ret > 1)

-		    system(cpt->strarg);

+		if(arg)

+		    execute("OnErrorExecute", arg);

 	    }

 	    logg("--------------------------------------\n");

@@ -1,5 +1,5 @@

 /*

- *  Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>

+ *  Copyright (C) 2002 - 2005 Tomasz Kojm <tkojm@clamav.net>

  *

  *  This program is free software; you can redistribute it and/or modify

  *  it under the terms of the GNU General Public License as published by

@@ -20,6 +20,7 @@

 #define __FRESHCLAM_H

 #include "cfgparser.h"

+#include "options.h"

 void help(void);

 void daemonize(void);

@@ -58,6 +58,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	char ipaddr[16], *dnsreply = NULL, *pt;

 	struct cfgstruct *cpt;

 	char *localip = NULL;

+	const char *arg = NULL;

 #ifdef HAVE_RESOLV_H

 	const char *dnsdbinfo;

 #endif

@@ -189,9 +190,16 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 #endif

 	if(optl(opt, "on-update-execute"))

-	    system(getargl(opt, "on-update-execute"));

+	    arg = getargl(opt, "on-update-execute");

 	else if((cpt = cfgopt(copt, "OnUpdateExecute")))

-	    system(cpt->strarg);

+	    arg = cpt->strarg;

+

+	if(arg) {

+	    if(optc(opt, 'd'))

+		execute( "OnUpdateExecute", pt );

+            else

+		system(pt);

+	}

 	return 0;