@@ -371,6 +371,8 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

 			    char *e_msg_id = strdup(msg_id);

 			    pid_t pid;

+			    logg("*VirusEvent: about to execute '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s'\n", viraction, vir, e_id, e_from, e_to, e_msg_subj, e_msg_id, e_msg_date);

+

 			    pthread_mutex_lock(&virusaction_lock);

 			    pid = fork();

 			    if(!pid) {

@@ -384,14 +386,19 @@ sfsistat clamfi_eom(SMFICTX *ctx) {

 				args[6] = e_msg_id;

 				args[7] = e_msg_date;

 				args[8] = NULL;

-				logg("*Executing: '%s' '%s' '%s' '%s' '%s' '%s' '%s' '%s'\n", viraction, vir, e_id, e_from, e_to, e_msg_subj, e_msg_id, e_msg_date);

-				if((ret = execvp(viraction, args)) < 0) {

-				    logg("!VirusEvent: exec failed: %s\n", cli_strerror(errno, er, sizeof(er)));

-				}

-				exit(ret);

+				exit(execvp(viraction, args));

 			    } else if(pid > 0) {

 				pthread_mutex_unlock(&virusaction_lock);

-				waitpid(pid, NULL, 0);

+				if(waitpid(pid, &ret, 0)<0)

+				    logg("!VirusEvent: waitpid() failed: %s\n", cli_strerror(errno, er, sizeof(er)));

+				else {

+				    if(WIFEXITED(ret))

+					logg("*VirusEvent: child exited with code %d\n", WEXITSTATUS(ret));

+				    else if(WIFSIGNALED(ret))

+					logg("*VirusEvent: child killed by signal %d\n", WTERMSIG(ret));

+				    else

+					logg("*VirusEvent: child lost\n");

+				}

 			    } else {

 				logg("!VirusEvent: fork failed: %s\n", cli_strerror(errno, er, sizeof(er)));

 			    }

@@ -187,10 +187,13 @@ Example

 # Default: disabled

 #ReportHostname my.mail.server.name

-# Execute a command when an infected message is processed.

+# Execute a command (possibly searching PATH) when an infected message is found.

 # The following parameters are passed to the invoked program in this order:

 # virus name, queue id, sender, destination, subject, message id, message date.

-# Note: this requires MTA macroes to be available (see LogInfected below)

+# Note #1: this requires MTA macroes to be available (see LogInfected below)

+# Note #2: the process is invoked in the context of clamav-milter

+# Note #3: clamav-milter will wait for the process to exit. Be quick or fork to

+# avoid unnecessary delays in email delievery

 # Default: disabled

 #VirusAction /usr/local/bin/my_infected_message_handler

@@ -420,7 +420,7 @@ const struct clam_option __clam_options[] = {

     { "ReportHostname", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "When AddHeader is in use, this option allows to arbitrary set the reported\nhostname. This may be desirable in order to avoid leaking internal names.\nIf unset the real machine name is used.", "my.mail.server.name" },

-    { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote: this requires MTA macroes to be available (see LogInfected below)", "/usr/local/bin/my_infected_message_handler" },

+    { "VirusAction", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Execute a command when an infected message is processed.\nThe following parameters are passed to the invoked program in this order:\nvirus name, queue id, sender, destination, subject, message id, message date.\nNote #1: this requires MTA macroes to be available (see LogInfected below)\nNote #2: the process is invoked in the context of clamav-milter\nNote #3: clamav-milter will wait for the process to exit. Be quick or fork to\navoid unnecessary delays in email delievery", "/usr/local/bin/my_infected_message_handler" },

     { "Chroot", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Chroot to the specified directory.\nChrooting is performed just after reading the config file and before\ndropping privileges.", "/newroot" },