@@ -1,3 +1,9 @@

+Tue Feb 17 18:29:27 EET 2009 (edwin)

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

+ * clamd/, shared/, unit_tests/: Introduce '$' in logg, it is active

+ when logg_verbose=2, i.e. when Debug yes.  Fix leak reported by

+ valgrind.

+

 Tue Feb 17 17:33:06 EET 2009 (edwin)

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

  * clamd/server-th.c, unit_tests/check_clamd.c: make sending

@@ -236,8 +236,10 @@ int main(int argc, char **argv)

 	break;

     }

-    if(optget(opts, "Debug")->enabled) /* enable debug messages in libclamav */

+    if(optget(opts, "Debug")->enabled) /* enable debug messages in libclamav */ {

 	cl_debug();

+	logg_verbose = 2;

+    }

 #if defined(USE_SYSLOG) && !defined(C_AIX)

     if(optget(opts, "LogSyslog")->enabled) {

@@ -247,7 +247,7 @@ void fds_cleanup(struct fd_data *data)

     for (i = j ; i < data->nfds; i++)

 	data->buf[i].fd = -1;

     data->nfds = j;

-    logg("*CLEANUP_FDS: %u fds\n", data->nfds);

+    logg("$Number of file descriptors polled: %u fds\n", data->nfds);

     /* Shrink buffer */

     newbuf = realloc(data->buf, j*sizeof(*newbuf));

     if (newbuf)

@@ -277,6 +277,7 @@ static int read_fd_data(struct fd_buf *buf)

       struct iovec iov[1];

       if (buf->recvfd != -1) {

+	  logg("$Closing unclaimed FD: %d\n", buf->recvfd);

 	  close(buf->recvfd);

 	  buf->recvfd = -1;

       }

@@ -292,7 +293,7 @@ static int read_fd_data(struct fd_buf *buf)

       if (n < 0)

 	  return -1;

       if ((msg.msg_flags & MSG_TRUNC) || (msg.msg_flags & MSG_CTRUNC)) {

-	  logg("!control message truncated");

+	  logg("^Control message truncated");

 	  return -1;

       }

       if (msg.msg_controllen) {

@@ -302,11 +303,11 @@ static int read_fd_data(struct fd_buf *buf)

 		  cmsg->cmsg_level == SOL_SOCKET &&

 		  cmsg->cmsg_type == SCM_RIGHTS) {

 		  if (buf->recvfd != -1) {

-		      logg("^Unclaimed file descriptor received. closing\n");

+		      logg("$Unclaimed file descriptor received. closing: %d\n");

 		      close(buf->recvfd);

 		  }

 		  buf->recvfd = *(int *)CMSG_DATA(cmsg);

-		  logg("*RECVMSG: got FD %d\n", buf->recvfd);

+		  logg("$Receveived a file descriptor: %d\n", buf->recvfd);

 	      }

 	  }

       }

@@ -458,6 +459,8 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

 	timeout = closest_timeout - now;

     else

 	timeout = -1;

+    if (timeout > 0)

+	logg("$fds_poll_recv: timeout after %d seconds\n", timeout);

 #ifdef HAVE_POLL

     /* Use poll() if available, preferred because:

      *  - can poll any number of FDs

@@ -500,7 +503,7 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

 		}

 		revents = data->poll_data[i].revents;

 		if (revents & (POLLIN|POLLHUP)) {

-		    logg("*POLL: POLLIN|POLLHUP on fd %d\n",data->poll_data[i].fd);

+		    logg("$Received POLLIN|POLLHUP on fd %d\n",data->poll_data[i].fd);

 		}

 		if (revents & POLLIN) {

 		    int ret = read_fd_data(&data->buf[i]);

@@ -514,11 +517,11 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

 		if (revents & (POLLHUP | POLLERR | POLLNVAL)) {

 		    if (revents & (POLLHUP| POLLNVAL)) {

 			/* remote disconnected */

-			logg("^poll_recv_fds: Client disconnected (FD %d)\n",

+			logg("*Client disconnected (FD %d)\n",

 			     data->poll_data[i].fd);

 		    } else {

 			/* error on file descriptor */

-			logg("!poll_recv_fds: Error condition on fd %d\n",

+			logg("^Error condition on fd %d\n",

 			     data->poll_data[i].fd);

 		    }

 		    data->buf[i].got_newdata = -1;

@@ -536,7 +539,7 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

     for (i=0;i < data->nfds; i++) {

 	int fd = data->buf[i].fd;

 	if (fd >= FD_SETSIZE) {

-	    logg ("!poll_recv_fds: file descriptor is not valid for FD_SET\n");

+	    logg ("!File descriptor is too high for FD_SET\n");

 	    return -1;

 	}

@@ -567,10 +570,10 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals)

 		    int ret = read_fd_data(&data->buf[i]);

 		    if (ret == -1 || !ret) {

 			if (ret == -1)

-			    logg("!poll_recv_fds: Error condition on fd %d\n",

+			    logg("!Error condition on fd %d\n",

 				 data->buf[i].fd);

 			else

-			    logg("^poll_recv_fds: Client disconnected\n");

+			    logg("*Client disconnected\n");

 			data->buf[i].got_newdata = -1;

 		    }

 		}

@@ -115,7 +115,7 @@ int scan_callback(struct stat *sb, char *filename, const char *msg, enum cli_ftw

 		     msg);

 	    return CL_SUCCESS;

 	case warning_skipped_link:

-	    logg("*Skipping symlink: %s\n", msg);

+	    logg("$Skipping symlink: %s\n", msg);

 	    return CL_SUCCESS;

 	case warning_skipped_special:

 	    if (msg == scandata->toplevel_path)

@@ -118,10 +118,10 @@ static void scanner_thread(void *arg)

     if (conn->filename)

 	free(conn->filename);

-    logg("*SCANTH: finished\n");

+    logg("$Finished scanthread\n");

     if (thrmgr_group_finished(conn->group, virus ? EXIT_OTHER :

 			      errors ? EXIT_ERROR : EXIT_OK)) {

-	logg("*SCANTH: connection shut down\n");

+	logg("$Scanthread: connection shut down\n");

 	/* close connection if we were last in group */

 	shutdown(conn->sd, 2);

 	closesocket(conn->sd);

@@ -848,17 +848,19 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 	    if (buf->got_newdata == -1) {

 		if (buf->mode == MODE_WAITREPLY) {

-		    logg("*RECVTH: mode WAIT_REPLY -> closed\n");

+		    logg("$mode WAIT_REPLY -> closed\n");

 		    buf->fd = -1;

+		    thrmgr_group_terminate(buf->group);

+		    thrmgr_group_finished(buf->group, EXIT_ERROR);

 		    continue;

 		} else {

-		    logg("*RECVTH: client read error or EOF on read\n");

+		    logg("$client read error or EOF on read\n");

 		    error = 1;

 		}

 	    }

 	    if (buf->fd != -1 && buf->got_newdata == -2) {

-		logg("*RECVTH: client read timed out\n");

+		logg("$Client read timed out\n");

 		mdprintf(buf->fd, "COMMAND READ TIMED OUT\n");

 		error = 1;

 	    }

@@ -866,7 +868,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 	    rr_last = i;

 	    if (buf->mode == MODE_WAITANCILL) {

 		buf->mode = MODE_COMMAND;

-		logg("*RECVTH: mode -> MODE_COMMAND\n");

+		logg("$mode -> MODE_COMMAND\n");

 	    }

 	    while (!error && buf->fd != -1 && buf->buffer && pos < buf->off &&

 		   buf->mode != MODE_WAITANCILL) {

@@ -896,7 +898,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 		       (cmd = get_cmd(buf, pos, &cmdlen, &term)) != NULL) {

 		    const char *argument;

 		    enum commands cmdtype = parse_command(cmd, &argument);

-		    logg("*RECVTH: got command %s (%u, %u), argument: %s\n",

+		    logg("$got command %s (%u, %u), argument: %s\n",

 			 cmd, (unsigned)cmdlen, (unsigned)cmdtype, argument ? argument : "");

 		    if (cmdtype == COMMAND_FILDES) {

 			if (buf->buffer + buf->off <= cmd + strlen("FILDES\n")) {

@@ -906,12 +908,12 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 			    /* put term back */

 			    buf->buffer[pos + cmdlen] = term;

 			    cmdlen = 0;

-			    logg("*RECVTH: mode -> MODE_WAITANCILL\n");

+			    logg("$RECVTH: mode -> MODE_WAITANCILL\n");

 			    break;

 			}

 			/* eat extra \0 for controlmsg */

 			cmdlen++;

-			logg("*RECVTH: FILDES command complete\n");

+			logg("$RECVTH: FILDES command complete\n");

 		    }

 		    conn.term = term;

@@ -927,20 +929,20 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 			error = 1;

 		    }

 		    if (thrmgr_group_need_terminate(conn.group)) {

-			logg("*RECVTH: have to terminate group\n");

+			logg("$Receive thread: have to terminate group\n");

 			error = CL_ETIMEOUT;

 			break;

 		    }

 		    if (error || !conn.group || rc) {

 			if (rc && thrmgr_group_finished(conn.group, EXIT_OK)) {

-			    logg("*RECVTH: closing conn, group finished\n");

+			    logg("$Receive thread: closing conn, group finished\n");

 			    /* if there are no more active jobs */

 			    shutdown(conn.sd, 2);

 			    closesocket(conn.sd);

 			    buf->fd = -1;

 			    conn.group = NULL;

 			} else if (conn.mode != MODE_STREAM) {

-			    logg("*RECVTH: mode -> MODE_WAITREPLY\n");

+			    logg("$mode -> MODE_WAITREPLY\n");

 			    /* no more commands are accepted */

 			    conn.mode = MODE_WAITREPLY;

 			    /* Stop monitoring this FD, it will be closed either

@@ -978,26 +980,26 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 			/* TODO: this doesn't belong here */

 			buf->dumpname = conn.filename;

 			buf->dumpfd = conn.scanfd;

-			logg("*RECVTH: STREAM: %s fd %u\n", buf->dumpname, buf->dumpfd);

+			logg("$Receive thread: INSTREAM: %s fd %u\n", buf->dumpname, buf->dumpfd);

 		    }

 		    if (conn.mode != MODE_COMMAND) {

-			logg("*RECVTH: breaking command loop, mode is no longer MODE_COMMAND\n");

+			logg("$Breaking command loop, mode is no longer MODE_COMMAND\n");

 			break;

 		    }

 		    conn.id++;

 		}

+		buf->mode = conn.mode;

+		buf->id = conn.id;

+		buf->group = conn.group;

+		buf->quota = conn.quota;

 		if (conn.scanfd != -1 && conn.scanfd != buf->dumpfd) {

-		    logg("*Unclaimed file descriptor received, closing: %d\n", conn.scanfd);

+		    logg("$Unclaimed file descriptor received, closing: %d\n", conn.scanfd);

 		    close(conn.scanfd);

 		    /* protocol error */

 		    conn_reply_error(&conn, "PROTOCOL ERROR: ancillary data sent without FILDES.");

 		    error = 1;

 		    break;

 		}

-		buf->mode = conn.mode;

-		buf->id = conn.id;

-		buf->group = conn.group;

-		buf->quota = conn.quota;

 		if (!error) {

 		    /* move partial command to beginning of buffer */

 		    if (pos < buf->off) {

@@ -1006,9 +1008,9 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 		    } else

 			buf->off = 0;

 		    if (buf->off)

-			logg("*RECVTH: moved partial command: %lu\n", (unsigned long)buf->off);

+			logg("$Moved partial command: %lu\n", (unsigned long)buf->off);

 		    else

-			logg("*RECVTH: consumed entire command\n");

+			logg("$Consumed entire command\n");

 		}

 		if (conn.mode == MODE_COMMAND && !cmd)

 		    break;

@@ -1016,24 +1018,24 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 		    /* Client is not supposed to send anything more */

 		    logg("^Client sent garbage after last command: %lu bytes\n", (unsigned long)buf->off);

 		    buf->buffer[buf->off] = '\0';

-		    logg("*RECVTH: garbage: %s\n", buf->buffer);

+		    logg("$Garbage: %s\n", buf->buffer);

 		    error = 1;

 		}

 		if (!error && buf->mode == MODE_STREAM) {

-		    logg("*RECVTH: mode == MODE_STREAM\n");

+		    logg("$mode == MODE_STREAM\n");

 		    if (!buf->chunksize) {

 			/* read chunksize */

 			if (buf->off >= 4) {

 			    uint32_t cs = *(uint32_t*)buf->buffer;

 			    buf->chunksize = ntohl(cs);

-			    logg("*RECVTH: chunksize: %u\n", buf->chunksize);

+			    logg("$Got chunksize: %u\n", buf->chunksize);

 			    if (!buf->chunksize) {

 				/* chunksize 0 marks end of stream */

 				conn.scanfd = buf->dumpfd;

 				conn.term = buf->term;

 				buf->dumpfd = -1;

 				buf->mode = buf->group ? MODE_COMMAND : MODE_WAITREPLY;

-				logg("*RECVTH: chunks complete\n");

+				logg("$Chunks complete\n");

 				buf->dumpname = NULL;

 				if ((rc = execute_or_dispatch_command(&conn, COMMAND_INSTREAMSCAN, NULL)) < 0) {

 				    logg("!Command dispatch failed\n");

@@ -1061,7 +1063,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 			    } else {

 				buf->quota -= buf->chunksize;

 			    }

-			    logg("*RECVTH: quota: %lu\n", buf->quota);

+			    logg("$Quota: %lu\n", buf->quota);

 			    pos = 4;

 			} else

 			    break;

@@ -1077,7 +1079,7 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 			logg("!INSTREAM: Can't write to temporary file.\n");

 			error = 1;

 		    }

-		    logg("*RECVTH: processed %lu bytes of chunkdata\n", cmdlen);

+		    logg("$Processed %lu bytes of chunkdata\n", cmdlen);

 		    pos += cmdlen;

 		    if (pos == buf->off) {

 			buf->off = 0;

@@ -1098,11 +1100,11 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 		}

 		thrmgr_group_terminate(buf->group);

 		if (thrmgr_group_finished(buf->group, EXIT_ERROR)) {

-		    logg("*RECVTH: shutting down socket after error\n");

+		    logg("$Shutting down socket after error\n");

 		    shutdown(buf->fd, 2);

 		    closesocket(buf->fd);

 		} else

-		    logg("*RECVTH: socket not shut down due to active tasks\n");

+		    logg("$Socket not shut down due to active tasks\n");

 		buf->fd = -1;

 	    }

 	}

@@ -98,13 +98,13 @@ enum commands parse_command(const char *cmd, const char **argument)

 	    const char *arg = cmd + len;

 	    if (commands[i].need_arg) {

 		if (!*arg) {/* missing argument */

-		    logg("*Command %s missing argument!\n", commands[i].cmd);

+		    logg("$Command %s missing argument!\n", commands[i].cmd);

 		    return COMMAND_UNKNOWN;

 		}

 		*argument = arg+1;

 	    } else {

 		if (*arg) {/* extra stuff after command */

-		    logg("*Command %s has trailing garbage!\n", commands[i].cmd);

+		    logg("$Command %s has trailing garbage!\n", commands[i].cmd);

 		    return COMMAND_UNKNOWN;

 		}

 		*argument = NULL;

@@ -183,7 +183,7 @@ int command(client_conn_t *conn, int *virus)

     jobgroup_t *group = NULL;

     if (thrmgr_group_need_terminate(conn->group)) {

-	logg("*Client disconnected while command was active\n");

+	logg("$Client disconnected while command was active\n");

 	if (conn->scanfd != -1)

 	    close(conn->scanfd);

 	return 1;

@@ -246,7 +246,7 @@ int command(client_conn_t *conn, int *virus)

 		} else

 		    ret = 0;

 	    }

-	    logg("*SESSION: closed fd %d\n", conn->scanfd);

+	    logg("$Closed fd %d\n", conn->scanfd);

 	    close(conn->scanfd);

 	    return ret;

 #else

@@ -409,7 +409,7 @@ int execute_or_dispatch_command(client_conn_t *conn, enum commands cmd, const ch

 	    default:

 		/* these commands are not recognized inside an IDSESSION */

 		conn_reply_error(conn, "Command invalid inside IDSESSION.");

-		logg("*SESSION: command is not valid inside IDSESSION: %d\n", cmd);

+		logg("$SESSION: command is not valid inside IDSESSION: %d\n", cmd);

 		conn->group = NULL;

 		return 1;

 	}

@@ -577,7 +577,7 @@ static void *thrmgr_pop(threadpool_t *pool)

     }

     if (!thrmgr_contended(pool)) {

-	logg("*THRMGR: queue crossed low threshold -> signaling\n");

+	logg("$THRMGR: queue crossed low threshold -> signaling\n");

 	pthread_cond_signal(&pool->queueable_cond);

     }

@@ -682,9 +682,9 @@ static int thrmgr_dispatch_internal(threadpool_t *threadpool, void *user_data, i

 		queue = threadpool->single_queue;

 	    while (thrmgr_contended(threadpool)) {

-		logg("*THRMGR: contended, sleeping\n");

+		logg("$THRMGR: contended, sleeping\n");

 		pthread_cond_wait(&threadpool->queueable_cond, &threadpool->pool_mutex);

-		logg("*THRMGR: contended, woken\n");

+		logg("$THRMGR: contended, woken\n");

 	    }

 	    if (!work_queue_add(queue, user_data)) {

@@ -725,11 +725,13 @@ int thrmgr_group_dispatch(threadpool_t *threadpool, jobgroup_t *group, void *use

     if (group) {

 	pthread_mutex_lock(&group->mutex);

 	group->jobs++;

+	logg("$THRMGR: active jobs for %p: %d\n", group, group->jobs);

 	pthread_mutex_unlock(&group->mutex);

     }

     if (!(ret = thrmgr_dispatch_internal(threadpool, user_data, 1)) && group) {

 	pthread_mutex_lock(&group->mutex);

 	group->jobs--;

+	logg("$THRMGR: active jobs for %p: %d\n", group, group->jobs);

 	pthread_mutex_unlock(&group->mutex);

     }

     return ret;

@@ -747,7 +749,7 @@ int thrmgr_group_finished(jobgroup_t *group, enum thrmgr_exit exitc)

 	return 1;

     }

     pthread_mutex_lock(&group->mutex);

-    logg("*THRMGR: group_finished: %p, %d\n", group, group->jobs);

+    logg("$THRMGR: group_finished: %p, %d\n", group, group->jobs);

     group->exit_total++;

     switch (exitc) {

 	case EXIT_OK:

@@ -760,13 +762,14 @@ int thrmgr_group_finished(jobgroup_t *group, enum thrmgr_exit exitc)

     if (group->jobs) {

 	if (!--group->jobs) {

 	    ret = 1;

-	}

+	} else

+	    logg("$THRMGR: active jobs for %p: %d\n", group, group->jobs);

 	if (group->jobs == 1)

 	    pthread_cond_signal(&group->only);

     }

     pthread_mutex_unlock(&group->mutex);

     if (ret) {

-	logg("*THRMGR: group_finished: freeing %p\n", group);

+	logg("$THRMGR: group_finished: freeing %p\n", group);

 	free(group);

     }

     return ret;

@@ -793,9 +796,11 @@ void thrmgr_group_waitforall(jobgroup_t *group, unsigned *ok, unsigned *error, u

     *total = group->exit_total;

     if(!--group->jobs)

 	needfree = 1;

+    else

+	logg("$THRMGR: active jobs for %p: %d\n", group, group->jobs);

     pthread_mutex_unlock(&group->mutex);

     if (needfree) {

-	logg("*THRMGR: freeing %p\n", group);

+	logg("$THRMGR: group finished freeing %p\n", group);

 	free(group);

     }

 }

@@ -810,6 +815,7 @@ jobgroup_t *thrmgr_group_new(void)

     if (!group)

 	return NULL;

     memcpy(group, &dummy, sizeof(dummy));

+    logg("$THRMGR: new group: %p\n", group);

     return group;

 }

@@ -189,7 +189,7 @@ const struct clam_option clam_options[] = {

     { "CommandReadTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 5, NULL, 0, OPT_CLAMD, "This option specifies the time (in seconds) after which clamd should\ntimeout if a client doesn't provide any initial command after connecting.", "5" },

-    { "SendBufTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 200, NULL, 0, OPT_CLAMD, "This option specifies how long to wait (in miliseconds) if the send buffer is full. Keep this value to prevent clamd hanging\n", "200"},

+    { "SendBufTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 500, NULL, 0, OPT_CLAMD, "This option specifies how long to wait (in miliseconds) if the send buffer is full. Keep this value to prevent clamd hanging\n", "200"},

     { "ReadTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 120, NULL, 0, OPT_MILTER, "Waiting for data from clamd will timeout after this time (seconds).\nValue of 0 disables the timeout.", "300" },

@@ -223,6 +223,9 @@ int logg(const char *str, ...)

 	mode_t old_umask;

 	int len;

+    if ((*str == '$' && logg_verbose < 2) ||

+	(*str == '*' && !logg_verbose))

+	return 0;

     ARGLEN(args, str, len);

     if(len <= sizeof(buffer)) {

@@ -306,8 +309,7 @@ int logg(const char *str, ...)

 	    } else if(*buff == '^') {

 		if(!logg_nowarn)

 		    fprintf(logg_fp, "WARNING: %s", buff + 1);

-	    } else if(*buff == '*') {

-		if(logg_verbose)

+	    } else if(*buff == '*' || *buff == '$') {

 		    fprintf(logg_fp, "%s", buff + 1);

 	    } else if(*buff == '#' || *buff == '~') {

 		fprintf(logg_fp, "%s", buff + 1);

@@ -325,10 +327,8 @@ int logg(const char *str, ...)

 	} else if(buff[0] == '^') {

 	    if(!logg_nowarn)

 		syslog(LOG_WARNING, "%s", buff + 1);

-	} else if(buff[0] == '*') {

-	    if(logg_verbose) {

-		syslog(LOG_DEBUG, "%s", buff + 1);

-	    }

+	} else if(buff[0] == '*' || buff[0] == '$') {

+	    syslog(LOG_DEBUG, "%s", buff + 1);

 	} else if(buff[0] == '#' || buff[0] == '~') {

 	    syslog(LOG_INFO, "%s", buff + 1);

 	} else syslog(LOG_INFO, "%s", buff);

@@ -51,13 +51,13 @@ scan_failed() {

 start_clamd()

 {

-	rm -f clamd-test.log

-	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 --help >clamd-test.log || 

-		{ error "Failed to start clamd --help!"; die 1; }

+	rm -f clamd-test.log clamd-test1.log clamd-test2.log

+	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 --help >clamd-test.log 2>&1 || 

+		{ error "Failed to start clamd --help!"; cat clamd-test.log; die 1; }

 	grep "Clam AntiVirus Daemon" clamd-test.log >/dev/null ||

 		{ error "Wrong --help reply from clamd!"; die 1; }

-	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 || 

-		{ error "Failed to start clamd!"; die 1; }

+	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 >clamd-test.log 2>&1 || 

+		{ error "Failed to start clamd!"; cat clamd-test.log; die 1; }

 }

 run_clamdscan_fileonly() {

@@ -1,6 +1,8 @@

 # script will fill in CWD and X

-LogFile CWD/clamd-test.log

+LogFile CWD/clamd-testX.log

+LogFileMaxSize 0

 LogTime yes

+Debug yes

 LogClean yes

 LogVerbose yes

 PidFile CWD/clamd-test.pid