@@ -86,6 +86,7 @@ libclamav/mspack: Stuart Caie

 Patch submitters (in alphabetical order):

 Kamil Andrusz <wizz*mniam.net>

+Alexandre Biancalana <ale*seudns.net>

 Patrick Bihan-Faou <patrick*mindstep.com>

 Martin Blapp <mb*imp.ch>

 Igor Brezac <igor*ipass.net>

@@ -168,6 +169,7 @@ David Santinoli <david*santinoli.com>

 Vijay Sarvepalli <vssarvep*office.uncg.edu>

 Theo Schlossnagle <jesus*omniti.com>

 Matthew Seaman <m.seaman*infracaninophile.co.uk>

+GertJan Spoelman <cav*gjs.cc>

 Sven Strickroth <sstrickroth*gym-oha.de>

 Matt Sullivan <matt*sullivan.gen.nz>

 Joe Talbott <josepht*cstone.net>

@@ -1,3 +1,24 @@

+Wed May 11 17:48:27 CEST 2005

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

+  V 0.85

+  * Fixes backported from CVS:

+    - freshclam/manager.c: fix socket descriptor leak in --no-dns mode (patch

+      by GertJan Spoelman <cav*gjs.cc>) (tk)

+    - clamscan, freshclam: return with 62 (instead of 1) when logger can't be

+      initialized (tk)

+    - libclamav/matcher-ac.c, libclamav/matcher-bm.c: fix detection problem

+      with *.ndb OLE2 signatures (problem reported by Trog) (tk)

+    - fix signature offset calculation in large files (problem reported by

+      Christoph) (tk)

+    - clamav-milter: print segfault diagnostic, even if print_trace is not

+      available (njh)

+    - sigtool/sigtool.c: fix support for *.fp databases (tk)

+    - clamav-milter: Better handling of log file errors. Always send 451 when

+      loading a new database when --external is not set (njh)

+    - libclamav/tnef.c: If a parse fails and debugging is on, the file being

+      scanned is dumped to a temporary file (njh)

+    - libclamav/scanners.c: do not report I/O error with encrypted zips (tk)

+

 Fri Apr 29 14:18:18 CEST 2005

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

   V 0.84

@@ -1,86 +1,8 @@

-0.84

+0.85

 ----

-This version improves detection of JPEG (MS04-028) based exploits, introduces

-support for TNEF files and new detection mechanisms. Various bugfixes

-(including problems with scanning of digest mail files) and improvements

-have been made.

-

-

-** We encourage users to help testing the development versions, now with **

-** rewritten RAR code and support for 3.0 archives!			 **

-**		    http://www.clamav.net/snapshot/			 **

-

-

--) libclamav:

-    + JPEG exploit detector now also checks embedded Photoshop thumbnail images

-    + archive meta-data scanner (improves malware detection within encrypted

-      archives)

-    + support for TNEF (winmail.dat) decoding

-    + support for all tar archive formats

-    + MD5 implementation replaced with a slightly faster one

-    + improved database reloading with reference counter

-    + database updateable false positive eliminator

-    + speed improvements

-    + various bugfixes

-

--) clamd:

-    + VirusEvent now sets CLAM_VIRUSEVENT_FILENAME and CLAM_VIRUSEVENT_VIRUSNAME

-      environment variables

-

--) clamav-milter:

-    + improved database update detection when not --external

-

--) clamscan:

-    + new options --include-dir and exclude-dir

-    + new option --max-dir-recursion

-

--) freshclam:

-    + new directive LocalIPAddress

-

--) contrib:

-    + clamdmon 1.0 - clamdwatch replacement written in C

-

--) 3rd party software:

-    + hMailServer - open source e-mail server for Microsoft Window

-    + pop3.proxy - proxy server for the POP3 protocol

-    + HTTP Anti Virus Proxy

-    + SmarterMail Filter - ClamAV based plugin for SmarterMail Mail Server

-    + smf-clamd - small & fast virus filter for Sendmail

-    + Squidclam - replacement for SquidClamAV-Redirector.py written in C

-    + QtClamAVclient - remote clamd client based on the Qt Toolkit

-    + qpsmtp - flexible smtpd daemon written in Perl

-

-News:

-

-Palo Alto, Calif. March 31st 2005 - Clam AntiVirus, the leading Open Source

-antivirus toolkit, and Sensory Networks, the leading provider of hardware

-acceleration for network security applications, announced a partnership

-to provide hardware acceleration support for the Clam AntiVirus suite.

-[...]

-Support for Sensory Networks' NodalCore acceleration in ClamAV will be

-available in version 0.90 of the software suite in Q3 2005. For more

-information please visit:

-http://www.clamav.net/partners/partner-sn.html

-http://www.sensorynetworks.com/

-

-

-The ClamAV project announces the opening of the official merchandise store:

-

-http://www.cafepress.com/clamav/

-

-A big thank you to Finndesign (http://www.finndesign.fi) which

-volunteered to design the whole line of products, including:

-

-- t-shirts (for women and men)

-- golf shirt

-- sweatshirt

-- coffee mug

-- mousepad

-- stickers

-- scrapbook

-

-By purchasing our merchandise, you contribute to the development of ClamAV.

+Bugfixes in this release include correct signature offset calculation in large

+files, proper handling of encrypted zip archives, and others.

 --

 The ClamAV team (http://www.clamav.net/team.html)

@@ -2,6 +2,15 @@ Note: This README/NEWS file refers to the source tarball. Some things described

 here may not be available in binary packages.

 --

+0.85

+----

+

+Bugfixes in this release include correct signature offset calculation in large

+files, proper handling of encrypted zip archives, and others.

+

+--

+The ClamAV team (http://www.clamav.net/team.html)

+

 0.84

 ----

@@ -16,7 +16,8 @@ Fails to compile on Linux/x86 with icc6.0 (complains about stdio.h...)

 Fails to build on Linux/x86 with icc7.1 with -ipo (fails on libclamav.a - keeps saying run ranlib). Otherwise it builds and runs OK.

 	icc -O2 -tpp7 -xiMKW -parallel -i_dynamic -w2 -march=pentium4 -mcpu=pentium4 clamav-milter.c...

-Tested with Electric Fence 2.2.2

+Tested with Electric Fence 2.2.2, and the bounds checking C compiler from

+	http://web.inter.nl.net/hcc/Haj.Ten.Brugge/

 Compiles OK on Linux/ppc (YDL2.3) with gcc2.95.4. Needs -lsmutil to link.

 	cc -O3 -pedantic -Wuninitialized -Wall -pipe -fomit-frame-pointer -ffast-math -finline-functions -funroll-loop -pthread -lmilter ../libclamav/.libs/libclamav.a ../clamd/cfgfile.o ../clamd/others.o -lsmutil

@@ -761,6 +762,11 @@ Changes

 0.84e	18/4/05:	Fixed a multi-threading problem relating to updating

 				the database when in internal mode

 			Use HAVE_CTIME_R_[23]

+0.84f	4/5/05:		Better handling of open failures for LogFile

+			Always send 451 when reloading a database, even if

+				dont-wait isn't set

+0.84g	9/5/05:		Print an error in the log if a segfault is received

+0.85	11/5/05:	Up-issue

 4. INTERNATIONALISATION

@@ -775,6 +781,10 @@ author an e-mail.

 Please send bug reports and/or comments to Nigel Horne <njh@despammed.com> or

 bugs@clamav.net.

+Various tips will go here, for example

+	define(`confMILTER_LOG_LEVEL',`22')

+Running in the foreground, valgrind, LogSyslog, LogVerbose, LogFile etc.

+

 6. TODO

 There are several ideas marked as TODO in the source code. If anyone has

@@ -22,9 +22,9 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.192 2005/04/18 10:53:34 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.199 2005/05/11 12:26:44 nigelhorne Exp $";

-#define	CM_VERSION	"0.84e"

+#define	CM_VERSION	"0.85"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -367,11 +367,11 @@ static	int	debug_level = 0;

 static	pthread_mutex_t	n_children_mutex = PTHREAD_MUTEX_INITIALIZER;

 static	pthread_cond_t	n_children_cond = PTHREAD_COND_INITIALIZER;

-static	unsigned	int	n_children = 0;

+static	volatile	unsigned	int	n_children = 0;

 static	unsigned	int	max_children = 0;

 static	pthread_mutex_t	accept_mutex = PTHREAD_MUTEX_INITIALIZER;

 static	pthread_cond_t	accept_cond = PTHREAD_COND_INITIALIZER;

-static	int	accept_inputs;

+static	volatile	int	accept_inputs;

 static	int	child_timeout = 0;	/* number of seconds to wait for

 					 * a child to die. Set to 0 to

 					 * wait forever

@@ -441,10 +441,11 @@ static	const	char	*pidfile;

 #endif

 #endif

+static	void	sigsegv(int sig);

+

 #ifdef HAVE_BACKTRACE

 #include <execinfo.h>

-static	void	sigsegv(int sig);

 static	void	print_trace(void);

 #define	BACKTRACE_SIZE	200

@@ -1029,8 +1030,13 @@ main(int argc, char **argv)

 	if(cfgopt(copt, "LogSyslog")) {

 		int fac = LOG_LOCAL6;

-		if(cfgopt(copt, "LogVerbose"))

+		if(cfgopt(copt, "LogVerbose")) {

 			logVerbose = 1;

+#if	0

+			/* Only supported by Sendmail >= V8.13 */

+			smfi_setdbg(6);

+#endif

+		}

 		use_syslog = 1;

 		if((cpt = cfgopt(copt, "LogFacility")) != NULL)

@@ -1329,7 +1335,6 @@ main(int argc, char **argv)

 #ifndef	CL_DEBUG

 		close(1);

-		close(2);

 		if((cpt = cfgopt(copt, "LogFile"))) {

 			logFile = cpt->strarg;

@@ -1342,12 +1347,20 @@ main(int argc, char **argv)

 				fprintf(stderr, "%s: LogFile requires full path\n", argv[0]);

 				return EX_CONFIG;

 			}

-		} else

+			if(open(logFile, O_WRONLY|O_APPEND) < 0) {

+				perror(logFile);

+				return EX_CANTCREAT;

+			}

+		} else {

 			logFile = "/dev/console";

+			if(open(logFile, O_WRONLY) < 0) {

+				perror(logFile);

+				return EX_OSFILE;

+			}

+		}

-		if((open(logFile, O_WRONLY|O_APPEND) == 1) ||

-		   (open("/dev/null", O_WRONLY) == 1))

-			dup(1);

+		close(2);

+		dup(1);

 		if(cfgopt(copt, "LogTime"))

 			logTime++;

 #endif	/*!CL_DEBUG*/

@@ -1428,7 +1441,7 @@ main(int argc, char **argv)

 #ifdef	SESSION

 	/* FIXME: add localSocket support to watchdog */

-	if(localSocket == NULL)

+	if((localSocket == NULL) || external)

 #endif

 		pthread_create(&tid, NULL, watchdog, NULL);

@@ -1439,26 +1452,49 @@ main(int argc, char **argv)

 	if(pidfile) {

 		/* save the PID */

+		char *p, *q;

 		FILE *fd;

 		const mode_t old_umask = umask(0006);

+		if(pidfile[0] != '/') {

+			if(use_syslog)

+				syslog(LOG_ERR, _("pidfile: '%s' must be a full pathname"),

+					pidfile);

+			cli_errmsg(_("pidfile '%s' must be a full pathname\n"), pidfile);

+

+			return EX_CONFIG;

+		}

+		p = strdup(pidfile);

+		q = strrchr(p, '/');

+		*q = '\0';

+

+		if(chdir(p) < 0)	/* safety */

+			perror(p);

+		free(p);

+

 		if((fd = fopen(pidfile, "w")) == NULL) {

 			if(use_syslog)

 				syslog(LOG_ERR, _("Can't save PID in file %s"),

 					pidfile);

 			cli_errmsg(_("Can't save PID in file %s\n"), pidfile);

 			return EX_CONFIG;

-		} else {

+		}

 #ifdef	C_LINUX

-			/* Ensure that all threads are kill()ed */

-			fprintf(fd, "-%d\n", (int)getpgrp());

+		/* Ensure that all threads are kill()ed */

+		fprintf(fd, "-%d\n", (int)getpgrp());

 #else

-			fprintf(fd, "%d\n", (int)getpid());

+		fprintf(fd, "%d\n", (int)getpid());

 #endif

-			fclose(fd);

-		}

+		fclose(fd);

 		umask(old_umask);

-	}

+	} else if(tmpdir)

+		chdir(tmpdir);	/* safety */

+	else

+#ifdef	P_tmpdir

+		chdir(P_tmpdir);

+#else

+		chdir("/tmp");

+#endif

 	if(cfgopt(copt, "FixStaleSocket")) {

 		/*

@@ -1490,14 +1526,14 @@ main(int argc, char **argv)

 	}

 #if	0

-	/* Only supported by later libmilter */

+	/* Only supported by Sendmail >= V8.13 */

 	if(smfi_opensocket(1) == MI_FAILURE) {

 		cli_errmsg("can't open/create %s\n", port);

 		return EX_CONFIG;

 	}

 #endif

-	signal(SIGPIPE, SIG_IGN);

+	signal(SIGPIPE, SIG_IGN);	/* libmilter probably does this as well */

 #ifdef	SESSION

 	pthread_mutex_lock(&version_mutex);

@@ -1515,9 +1551,7 @@ main(int argc, char **argv)

 	pthread_mutex_unlock(&version_mutex);

 #endif

-#ifdef HAVE_BACKTRACE

 	(void)signal(SIGSEGV, sigsegv);

-#endif

 	return smfi_main();

 }

@@ -1917,7 +1951,14 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 	accepting = accept_inputs;

 	pthread_mutex_unlock(&accept_mutex);

 	if(!accepting) {

+#if	1

 		cli_warnmsg("Not accepting inputs at the moment\n");

+		/*

+		 * We must refuse here even if dont_wait isn't set, since

+		 * it could take some time, and sendmail could time us out

+		 * and refuse to have anything more to do with us until

+		 * the program is restarted

+		 */

 		if(dont_wait)

 			return SMFIS_TEMPFAIL;

 		pthread_mutex_lock(&accept_mutex);

@@ -1925,6 +1966,8 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 			pthread_cond_wait(&accept_cond, &accept_mutex);

 		pthread_mutex_unlock(&accept_mutex);

 		cli_warnmsg("Accepting inputs again\n");

+#endif

+		/*return SMFIS_TEMPFAIL;*/

 	}

 	if(ctx == NULL) {

@@ -2425,6 +2468,9 @@ clamfi_body(SMFICTX *ctx, u_char *bodyp, size_t len)

 	cli_dbgmsg(_("clamfi_envbody: %u bytes\n"), len);

 #endif

+	if(len == 0)	/* unlikely */

+		return SMFIS_CONTINUE;

+

 	nbytes = clamfi_send(privdata, len, (char *)bodyp);

 	if(streamMaxLength > 0L) {

 		if(privdata->numBytes > streamMaxLength) {

@@ -2618,8 +2664,8 @@ clamfi_eom(SMFICTX *ctx)

 #endif

 			/*

 			 * TODO: if more than one host has been specified, try

-			 * another one - setting cl_error to SMFIS_TEMPFAIL helps

-			 * by forcing a retry

+			 * another one - setting cl_error to SMFIS_TEMPFAIL

+			 * helps by forcing a retry

 			 */

 			clamfi_cleanup(ctx);

 			syslog(LOG_NOTICE, _("clamfi_eom: read nothing from clamd on %s"), hostname);

@@ -2962,10 +3008,7 @@ clamfi_eom(SMFICTX *ctx)

 					syslog(LOG_ERR, _("Can't set quarantine user %s"), quarantine);

 				else

 					cli_warnmsg(_("Can't set quarantine user %s\n"), quarantine);

-				if(privdata->discard)

-					rc = SMFIS_DISCARD;

-				else

-					rc = SMFIS_REJECT;

+				rc = (privdata->discard) ? SMFIS_DISCARD : SMFIS_REJECT;

 			} else {

 				if(use_syslog)

 					syslog(LOG_DEBUG, "Redirected virus to %s", quarantine);

@@ -4366,13 +4409,15 @@ watchdog(void *a)

 			} else if(dbstatus == 0)

 				cli_dbgmsg("Database has not changed\n");

 			else if(dbstatus == 1) {

-				cli_warnmsg("Not reloading database until idle\n");

+				cli_warnmsg("Not reloading database until idle - waiting for %d children\n", n_children);

 				pthread_mutex_lock(&accept_mutex);

 				accept_inputs = 0;

 				pthread_mutex_unlock(&accept_mutex);

-				while(n_children > 0)

+				while(n_children > 0) {

 					pthread_cond_wait(&n_children_cond, &n_children_mutex);

+					cli_warnmsg("Waiting for %d children until databae reload\n", n_children);

+				}

 				cl_statfree(&dbstat);

 				if(use_syslog)

@@ -4555,12 +4600,15 @@ watchdog(void *a)

 		} else if(dbstatus == 0)

 			cli_dbgmsg("Database has not changed\n");

 		else if(dbstatus == 1) {

-			cli_warnmsg("Not reloading database until idle\n");

+			cli_warnmsg("Not reloading database until idle - waiting for %d children\n", n_children);

 			pthread_mutex_lock(&accept_mutex);

 			accept_inputs = 0;

 			pthread_mutex_unlock(&accept_mutex);

-			while(n_children > 0)

+

+			while(n_children > 0) {

 				pthread_cond_wait(&n_children_cond, &n_children_mutex);

+				cli_warnmsg("Waiting for %d children until databae reload\n", n_children);

+			}

 			cl_statfree(&dbstat);

 			if(use_syslog)

 				syslog(LOG_WARNING, _("Loading new database"));

@@ -4571,7 +4619,8 @@ watchdog(void *a)

 			}

 			pthread_mutex_lock(&accept_mutex);

 			accept_inputs = 1;

-			pthread_cond_broadcast(&accept_cond);

+			if(pthread_cond_broadcast(&accept_cond) < 0)

+				perror("pthread_cond_broadcast");

 			pthread_mutex_unlock(&accept_mutex);

 		} else {

 			smfi_stop();

@@ -4861,19 +4910,23 @@ loadDatabase(void)

 	return cl_statinidir(dbdir, &dbstat);

 }

-#ifdef HAVE_BACKTRACE

 static void

 sigsegv(int sig)

 {

 	signal(SIGSEGV, SIG_DFL);

+

+#ifdef HAVE_BACKTRACE

 	print_trace();

+#endif

+

 	if(use_syslog)

 		syslog(LOG_ERR, "Segmentation fault :-( Bye..");

-	cli_dbgmsg("Segmentation fault :-( Bye..\n");

+	cli_errmsg("Segmentation fault :-( Bye..\n");

 	smfi_stop();

 }

+#ifdef HAVE_BACKTRACE

 static void

 print_trace(void)

 {

@@ -5038,7 +5091,7 @@ logger(const char *mess)

 #else

 		ctime_r(&currtime, buf);

 #endif

-		fprintf(fout, "%.*s -> %s\n", strlen(buf) - 1, buf, mess);

+		fprintf(fout, "%.*s -> %s\n", (int)strlen(buf) - 1, buf, mess);

 #else	/*!HAVE_CTIME_R*/

 		/* TODO */

 		fprintf(fout, "%s\n", mess);

@@ -112,7 +112,7 @@ int clamscan(struct optstruct *opt)

 	logg_file = getargc(opt, 'l');

 	if(logg("--------------------------------------\n")) {

 	    mprintf("!Problem with internal logger.\n");

-	    return 1;

+	    return 62;

 	}

     } else 

 	logg_file = NULL;

@@ -122,19 +122,19 @@ int clamscan(struct optstruct *opt)

 	if(!strchr(getargl(opt, "max-space"), 'M') && !strchr(getargl(opt, "max-space"), 'm'))

 	    if(!isnumb(getargl(opt, "max-space"))) {

 		mprintf("!--max-space requires natural number.\n");

-		exit(40);

+		return 40;

 	    }

     if(optl(opt, "max-files"))

 	if(!isnumb(getargl(opt, "max-files"))) {

 	    mprintf("!--max-files requires natural number.\n");

-	    exit(40);

+	    return 40;

 	}

     if(optl(opt, "max-recursion"))

 	if(!isnumb(getargl(opt, "max-recursion"))) {

 	    mprintf("!--max-recursion requires natural number.\n");

-	    exit(40);

+	    return 40;

 	}

@@ -2072,7 +2072,7 @@ fi

 # Define the identity of the package.

  PACKAGE=clamav

- VERSION="0.84"

+ VERSION="0.85"

 cat >>confdefs.h <<_ACEOF

@@ -2206,7 +2206,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'

 LC_CURRENT=1

-LC_REVISION=10

+LC_REVISION=11

 LC_AGE=0

 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

@@ -18,11 +18,11 @@ dnl   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 AC_INIT(clamscan/clamscan.c)

 AC_CREATE_TARGET_H(target.h)

-AM_INIT_AUTOMAKE(clamav, "0.84")

+AM_INIT_AUTOMAKE(clamav, "0.85")

 AM_CONFIG_HEADER(clamav-config.h)

 LC_CURRENT=1

-LC_REVISION=10

+LC_REVISION=11

 LC_AGE=0

 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"

 AC_SUBST(LIBCLAMAV_VERSION)

Binary files a/docs/clamdoc.pdf and b/docs/clamdoc.pdf differ

@@ -69,7 +69,7 @@

     \vspace{3cm}

     \begin{flushright}

 	\rule[-1ex]{8cm}{3pt}\\

-	\huge Clam AntiVirus 0.84\\

+	\huge Clam AntiVirus 0.85\\

 	\huge \emph{User Manual}\\

     \end{flushright}

@@ -2076,8 +2076,6 @@ level required:MD5 checksum:digital signature:builder name:build time (sec)

 				    &		   &	 & \email{<jfp*clearfield.com>}\\ \hline

 	\url{clamav.oltrelinux.com} & 194.242.226.43 & Italy & Luca Gibelli\\

 				    &		     &	     & \email{<l.gibelli*oltrelinux.com>}\\ \hline

-	\url{clamav.artcoms.ru} & 80.244.224.247 & Russia & Syrnikov Alexei\\

-				&		 &	  & \email{<san*artcoms.ru>}\\ \hline

 	\url{xarch.clamav.net} & 129.27.62.129 & Austria & Reini Urban\\

 			       &	       &	 & \email{<rurban*x-ray.at>}\\ \hline

 	\url{clamav.linux.it} & 213.92.8.5 & Italy & Marco d'Itri\\

@@ -2358,6 +2356,7 @@ level required:MD5 checksum:digital signature:builder name:build time (sec)

 	\item Sergey Smitienko \email{<hunter*comsys.com.ua>}

 	\item Solar Designer \email{<solar*openwall.com>}

 	\item Kevin Spicer \email{<kevin*kevinspicer.co.uk>}

+	\item GertJan Spoelman \email{<cav*gjs.cc>}

 	\item Ole Stanstrup \email{<ole*stanstrup.dk>}

 	\item Adam Stein \email{<adam*scan.mc.xerox.com>}

 	\item Steve \email{<steveb*webtribe.net>}

@@ -24,18 +24,18 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <BODY >

 <!--Navigation Panel-->

-<A NAME="tex2html305"

+<A NAME="tex2html304"

   HREF="node1.html">

 <IMG WIDTH="37" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="next" SRC="next.png"></A> 

 <IMG WIDTH="26" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="up" SRC="up_g.png"> 

 <IMG WIDTH="63" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="previous" SRC="prev_g.png"> 

-<A NAME="tex2html303"

+<A NAME="tex2html302"

   HREF="node1.html">

 <IMG WIDTH="65" HEIGHT="24" ALIGN="BOTTOM" BORDER="0" ALT="contents" SRC="contents.png"></A>  

 <BR>

-<B> Next:</B> <A NAME="tex2html306"

+<B> Next:</B> <A NAME="tex2html305"

   HREF="node1.html">Contents</A>

- &nbsp <B>  <A NAME="tex2html304"

+ &nbsp <B>  <A NAME="tex2html303"

   HREF="node1.html">Contents</A></B> 

 <BR>

 <BR>

@@ -59,7 +59,7 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <BR>

 <BR>

     <DIV ALIGN="RIGHT">

-<BR>	<FONT SIZE="+3">Clam AntiVirus 0.84

+<BR>	<FONT SIZE="+3">Clam AntiVirus 0.85

 <BR>	<FONT SIZE="+3"><I>User Manual</I>

 <BR>    

 </FONT></FONT></DIV>

@@ -71,366 +71,366 @@ original version by:  Nikos Drakos, CBLU, University of Leeds

 <A NAME="CHILD_LINKS"></A>

 <UL>

-<LI><A NAME="tex2html307"

+<LI><A NAME="tex2html306"

   HREF="node1.html">Contents</A>

-<LI><A NAME="tex2html308"

+<LI><A NAME="tex2html307"

   HREF="node2.html">Introduction</A>

 <UL>

-<LI><A NAME="tex2html309"

+<LI><A NAME="tex2html308"

   HREF="node3.html">Features</A>

-<LI><A NAME="tex2html310"

+<LI><A NAME="tex2html309"

   HREF="node4.html">Mailing lists</A>

-<LI><A NAME="tex2html311"

+<LI><A NAME="tex2html310"

   HREF="node5.html">Virus submitting</A>

 </UL>

-<LI><A NAME="tex2html312"

+<LI><A NAME="tex2html311"

   HREF="node6.html">Base package</A>

 <UL>

-<LI><A NAME="tex2html313"

+<LI><A NAME="tex2html312"

   HREF="node7.html">Supported platforms</A>

-<LI><A NAME="tex2html314"

+<LI><A NAME="tex2html313"

   HREF="node8.html">Binary packages</A>

-<LI><A NAME="tex2html315"

+<LI><A NAME="tex2html314"

   HREF="node9.html">Daily built snapshots</A>

 </UL>

-<LI><A NAME="tex2html316"

+<LI><A NAME="tex2html315"

   HREF="node10.html">Installation</A>

 <UL>

-<LI><A NAME="tex2html317"

+<LI><A NAME="tex2html316"

   HREF="node11.html">Requirements</A>

-<LI><A NAME="tex2html318"

+<LI><A NAME="tex2html317"

   HREF="node12.html">Installing on a shell account</A>

-<LI><A NAME="tex2html319"

+<LI><A NAME="tex2html318"

   HREF="node13.html">Adding new system user and group</A>

-<LI><A NAME="tex2html320"

+<LI><A NAME="tex2html319"

   HREF="node14.html">Compilation of base package</A>

-<LI><A NAME="tex2html321"

+<LI><A NAME="tex2html320"

   HREF="node15.html">Compilation with clamav-milter enabled</A>

 </UL>

-<LI><A NAME="tex2html322"

+<LI><A NAME="tex2html321"

   HREF="node16.html">Configuration</A>

 <UL>

-<LI><A NAME="tex2html323"

+<LI><A NAME="tex2html322"

   HREF="node17.html">clamd</A>

 <UL>

-<LI><A NAME="tex2html324"

+<LI><A NAME="tex2html323"

   HREF="node18.html">On-access scanning</A>

 </UL>

-<LI><A NAME="tex2html325"

+<LI><A NAME="tex2html324"

   HREF="node19.html">clamav-milter</A>

-<LI><A NAME="tex2html326"

+<LI><A NAME="tex2html325"

   HREF="node20.html">Testing</A>

-<LI><A NAME="tex2html327"

+<LI><A NAME="tex2html326"

   HREF="node21.html">Setting up auto-updating</A>

-<LI><A NAME="tex2html328"

+<LI><A NAME="tex2html327"

   HREF="node22.html">Closest mirrors</A>

 </UL>

-<LI><A NAME="tex2html329"

+<LI><A NAME="tex2html328"

   HREF="node23.html">Usage</A>

 <UL>

-<LI><A NAME="tex2html330"

+<LI><A NAME="tex2html329"

   HREF="node24.html">Clam daemon</A>

-<LI><A NAME="tex2html331"

+<LI><A NAME="tex2html330"

   HREF="node25.html">Clam<B>d</B>scan</A>

-<LI><A NAME="tex2html332"

+<LI><A NAME="tex2html331"

   HREF="node26.html">Clamuko</A>

-<LI><A NAME="tex2html333"

+<LI><A NAME="tex2html332"

   HREF="node27.html">Output format</A>

 <UL>

-<LI><A NAME="tex2html334"

+<LI><A NAME="tex2html333"

   HREF="node28.html">clamscan</A>

-<LI><A NAME="tex2html335"

+<LI><A NAME="tex2html334"

   HREF="node29.html">clamd</A>

 </UL>

 </UL>

-<LI><A NAME="tex2html336"

+<LI><A NAME="tex2html335"

   HREF="node30.html">LibClamAV</A>

 <UL>

-<LI><A NAME="tex2html337"

+<LI><A NAME="tex2html336"

   HREF="node31.html">Licence</A>

-<LI><A NAME="tex2html338"

+<LI><A NAME="tex2html337"

   HREF="node32.html">Features</A>

 <UL>

-<LI><A NAME="tex2html339"

+<LI><A NAME="tex2html338"

   HREF="node33.html">Archives and compressed files</A>

-<LI><A NAME="tex2html340"

+<LI><A NAME="tex2html339"

   HREF="node34.html">Mail files</A>

 </UL>

-<LI><A NAME="tex2html341"

+<LI><A NAME="tex2html340"

   HREF="node35.html">API</A>

 <UL>

-<LI><A NAME="tex2html342"

+<LI><A NAME="tex2html341"

   HREF="node36.html">Header file</A>

-<LI><A NAME="tex2html343"

+<LI><A NAME="tex2html342"

   HREF="node37.html">Database loading</A>

-<LI><A NAME="tex2html344"

+<LI><A NAME="tex2html343"

   HREF="node38.html">Error handling</A>

-<LI><A NAME="tex2html345"

+<LI><A NAME="tex2html344"

   HREF="node39.html">Database structure</A>

 </UL>

-<LI><A NAME="tex2html346"

+<LI><A NAME="tex2html345"

   HREF="node40.html">Database reloading</A>

 <UL>

-<LI><A NAME="tex2html347"

+<LI><A NAME="tex2html346"

   HREF="node41.html">Data scan functions</A>

-<LI><A NAME="tex2html348"

+<LI><A NAME="tex2html347"

   HREF="node42.html">Memory</A>

-<LI><A NAME="tex2html349"

+<LI><A NAME="tex2html348"

   HREF="node43.html">clamav-config</A>

-<LI><A NAME="tex2html350"

+<LI><A NAME="tex2html349"

   HREF="node44.html">Example</A>

 </UL>

-<LI><A NAME="tex2html351"

+<LI><A NAME="tex2html350"

   HREF="node45.html">CVD format</A>

 </UL>

-<LI><A NAME="tex2html352"

+<LI><A NAME="tex2html351"

   HREF="node46.html">Frequently Asked Questions</A>

-<LI><A NAME="tex2html353"

+<LI><A NAME="tex2html352"

   HREF="node47.html">Third party software</A>

 <UL>

-<LI><A NAME="tex2html354"

+<LI><A NAME="tex2html353"

   HREF="node48.html"><I>MTA + ClamAV</I></A>

 <UL>

-<LI><A NAME="tex2html355"

+<LI><A NAME="tex2html354"

   HREF="node49.html">amavisd-new</A>

-<LI><A NAME="tex2html356"

+<LI><A NAME="tex2html355"

   HREF="node50.html">AMaViS - "Next Generation"</A>

-<LI><A NAME="tex2html357"

+<LI><A NAME="tex2html356"

   HREF="node51.html">ClamdMail</A>

-<LI><A NAME="tex2html358"