@@ -9,10 +9,11 @@ Author of clamav-milter and the whole mbox code.

 Database developers:

+aCaB <acab@digitalfuture.it>

 Diego D'Ambra <da@softcom.dk>

 Jason Englander <jason@englanders.cc>

 Tomasz Kojm <zolw@konarski.edu.pl>

-

+Tomasz Papszun <tomek@lodz.tpsa.pl>

 TrashScan was written by Trashware <trashware@gmx.net>.

@@ -28,13 +29,16 @@ David Ford <david+cert@blue-labs.org>

 Nigel Horne <njh@smsltd.demon.co.uk>

 Hrvoje Habjanic <hrvoje.habjanic@zg.hinet.hr>

 Robbert Kouprie <robbert@exx.nl>

+Thomas Lamy <Thomas.Lamy@in-online.net>

 Peter N Lewis <peter@stairways.com.au>

+Mark Mielke <mark@mark.mielke.cc>

 Arkadiusz Miskiewicz <misiek@pld.org.pl>

 Hendrik Muhs <Hendrik.Muhs@student.uni-magdeburg.de>

 Masaki Ogawa <proc@mac.com>

 Ed Phillips <ed@UDel.Edu>

 Andreas Piesk <Andreas.Piesk@heise.de>

 Ant La Porte <ant@dvere.net>

-Gernot Tenchio <g.tenchio@telco-tech.de>

 Thomas Quinot <thomas@cuivre.fr.eu.org>

+Gernot Tenchio <g.tenchio@telco-tech.de>

+David Woakes <david@mitredata.co.uk>

 Andoni Zubimendi <andoni@lpsat.net>

@@ -1,6 +1,44 @@

-Wed Aug  6 23:20:08 CEST 2003

+Fri Aug 29 06:00:01 CEST 2003

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

-  * libclamav: updated mbox code (Nigel)

+  * clamav-milter: 0.60d: Removed superflous buffer and unneeded strerror

+		   call (Nigel)

+  * libclamav: enabled support for Maildir files (thanks to Tomasz Papszun

+	       for samples and to Nigel for making his code so flexible)

+  * libclamav: mbox: fixed a problem in saveFile() - extremely long file names

+	       were causing snprintf() to truncate the last XXXXXX characters

+	       required for mkstemp(). As a result the file was not scanned -

+	       I found the problem in the old sample from Wash Odhiambo.

+

+Wed Aug 27 23:25:52 CEST 2003

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

+  * libclamav: message.c/h - allow any number of arguments to mime

+	       commands (Nigel)

+  * libclamav: mbox - parseMimeHeader() potential memory problem fixed (Nigel)

+  * clamd, clamscan: removed duplicated rndnum() and switched to cl_rndnum()

+  * clamd: new directive FixStaleSocket by Thomas Lamy and Mark Mielke

+

+Sat Aug 23 21:17:33 CEST 2003

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

+  * freshclam: fixed --on-error-execute (don't run a command on "no update"

+	       event). Fixed by David Woakes.

+

+Wed Aug 20 02:30:37 CEST 2003

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

+  * libclamav: mbox - support for "raw" messages (Nigel)

+  * sigtool: fixed a segmentation fault when a signature reaches end

+	     of file (thanks to Tomasz Papszun for an example)

+

+Tue Aug 19 02:33:48 CEST 2003

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

+  * clamav-milter: 0.60b - support for CC bounces to an e-mail address other

+		   than. Now compiles out of the box on FreeBSD 4.x (Nigel)

+  * Various fixes for Tru64 support (5.1a tested) by Hrvoje Habjanic

+

+Wed Aug 13 16:07:39 CEST 2003

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

+  * clamav-milter: 0.60a - tidied up message when sender is unknown (Nigel)

+  * libclamav: mbox updates: fixed an assertion error with some mail

+	       files (Nigel)

 Wed Aug  6 03:01:51 CEST 2003

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

@@ -21,7 +59,7 @@ Sat Jul 26 17:11:46 CEST 2003

 Thu Jul 24 13:29:39 CEST 2003

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

   * libclamav: mbox: fixed detection of the Gibe virus (bug reported

-	       by Rene Bellora); support for log file names (problem

+	       by Rene Bellora); support for long file names (problem

 	       reported by Tomasz Papszun)

 Sun Jul 20 23:43:38 CEST 2003

@@ -68,7 +68,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: acinclude.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

+dnl @version: $Id: acinclude.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4110,7 +4110,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: acinclude.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

+dnl @version $Id: acinclude.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.4 2003/08/06 03:05:50 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.5 2003/08/29 14:27:14 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -18,20 +18,29 @@ Fails to build on Linux/x86 with icc7.1 with -ipo (fails on libclamav.a - keeps

 Tested with Electric Fence 2.2.2

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

-I haven't tested it further on this platform yet.

 	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

+I haven't tested it further on this platform yet.

+YDL3.0 should compile out of the box

 Sendmail on MacOS/X (10.1) is provided without a development package so this

 can't be run "out of the box"

-Solaris 8 needs -lresolv to link, and doesn't have strerror_r, so you'll

-need to replace strerror_r with strerror.

+Solaris 8 doesn't have milter support so clamav-milter won't work unless you

+rebuild sendmail from source.

+Solaris 9 has milter support in the supplied sendmail, but doesn't include

+libmilter so you can't develop milter applications on it. Go to sendmail.org,

+download the lastest sendmail, cd to libmilter and "make install" there.

+Needs -lresolv

 FreeBSD4.7 use /usr/local/bin/gcc30. GCC3.0 is an optional extra on

 FreeBSD. It comes with getopt.h which is handy. To link you need

 -lgnugetopt

 	gcc30 -O3 -DCONFDIR=\"/usr/local/etc\" -I. -I.. -I../clamd -I../libclamav -pedantic -Wuninitialized -Wall -pipe -mcpu=pentium -march=pentium -fomit-frame-pointer -ffast-math -finline-functions -funroll-loops clamav-milter.c -pthread -lmilter ../libclamav/.libs/libclamav.a ../clamd/cfgfile.o ../clamd/others.o -lgnugetopt

+FreeBSD4.8: should compile out of the box

+OpenBSD3.3: the supplied sendmail does not come with Milter support. You

+will need to rebuild sendmail from source

+

 INSTALLATION

 Install into /usr/local/sbin/clamav-milter, mode 744

@@ -98,6 +107,12 @@ Changes

 		Thanks to Krzysztof Olędzki <ole@ans.pl>

 0.60	11/7/03	Some TODOs done by Nigel Kukard <nkukard@lbsd.net>

 		Should stop a couple of remote chances of crashes

+0.60a	22/7/03	Tidied up message when sender is unknown

+0.60b	17/8/03	Optionally set postmaster address. Usually one uses

+		/etc/aliases, but not everyone want's to...

+0.60c	22/8/03	Another go at Solaris support

+0.60d	26/8/03	Removed superflous buffer and unneeded strerror call

+		ETIMEDOUT isn't an error, but should give a warning

 BUG REPORTS

@@ -23,7 +23,7 @@ sbin_PROGRAMS = clamav-milter

 clamav_milter_SOURCES = clamav-milter.c

-clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o

+clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o ../clamscan/getopt.o

 man_MANS = ../docs/clamav-milter.1

@@ -33,5 +33,5 @@ endif

 DEFS = @DEFS@

 # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

 LIBS = -L../libclamav -L/usr/lib/libmilter -lmilter @CLAMD_LIBS@

-INCLUDES = -I../clamd -I../libclamav

+INCLUDES = -I../clamd -I../libclamav -I../clamscan

 EXTRA_DIST = clamav-milter.c clamd.sh clamav-milter.sh INSTALL

@@ -120,14 +120,14 @@ install_sh = @install_sh@

 @HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@clamav_milter_SOURCES = clamav-milter.c

-@HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o

+@HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o ../clamscan/getopt.o

 @HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@man_MANS = ../docs/clamav-milter.1

 DEFS = @DEFS@

 # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd

 LIBS = -L../libclamav -L/usr/lib/libmilter -lmilter @CLAMD_LIBS@

-INCLUDES = -I../clamd -I../libclamav

+INCLUDES = -I../clamd -I../libclamav -I../clamscan

 EXTRA_DIST = clamav-milter.c clamd.sh clamav-milter.sh INSTALL

 subdir = clamav-milter

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

@@ -146,7 +146,8 @@ clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)

 @HAVE_MILTER_FALSE@@USE_PTHREAD_FALSE@clamav_milter_DEPENDENCIES =

 @HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@clamav_milter_DEPENDENCIES = \

 @HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@	../clamd/cfgfile.o \

-@HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@	../clamd/others.o

+@HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@	../clamd/others.o \

+@HAVE_MILTER_TRUE@@USE_PTHREAD_TRUE@	../clamscan/getopt.o

 @HAVE_MILTER_TRUE@@USE_PTHREAD_FALSE@clamav_milter_DEPENDENCIES =

 clamav_milter_LDFLAGS =

 DEFAULT_INCLUDES =  -I. -I$(srcdir)

@@ -23,34 +23,29 @@

  * See http://www.nmt.edu/~wcolburn/sendmail-8.12.5/libmilter/docs/sample.html

  *

  * Installations for RedHat Linux and it's derivatives such as YellowDog:

- *

- * Add to /etc/mail/sendmail.mc:

+ * 1) Ensure that you have the sendmail-devel RPM installed

+ * 2) Add to /etc/mail/sendmail.mc:

  *	INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav.sock, F=, T=S:4m;R:4m')dnl

  *	define(`confINPUT_MAIL_FILTERS', `clamav')

- *

- * Check entry in /usr/local/etc/clamav.conf of the form:

+ * 3) Check entry in /usr/local/etc/clamav.conf of the form:

  *	LocalSocket /var/run/clamd.sock

  *	StreamSaveToDisk

- *

- * If you already have a filter (such as spamassassin-milter from

+ * 4) If you already have a filter (such as spamassassin-milter from

  * http://savannah.nongnu.org/projects/spamass-milt) add it thus:

  *	INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav.sock, F=, T=S:4m;R:4m')dnl

  *	INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')

  *	define(`confINPUT_MAIL_FILTERS', `spamassassin,clamav')dnl

- *

- * You may find INPUT_MAIL_FILTERS is not needed on your machine, however it

- * is recommended by the Sendmail documentation and I recommend going along

+ * 5) You may find INPUT_MAIL_FILTERS is not needed on your machine, however it

+ * is recommended by the Sendmail documentation and I suggest going along

  * with that.

- *

- * I suggest putting SpamAssassin first since you're more likely to get spam

+ * 6) I suggest putting SpamAssassin first since you're more likely to get spam

  * than a virus/worm sent to you.

- *

- * Add to /etc/sysconfig/clamav-milter

+ * 7) Add to /etc/sysconfig/clamav-milter

  *	CLAMAV_FLAGS="--max-children=2 local:/var/run/clamav.sock"

  * or if clamd is on a different machine

  *	CLAMAV_FLAGS="--max-children=2 --server=192.168.1.9 local:/var/run/clamav.sock"

- *

- * You should have received a script to put into /etc/init.d with this software.

+ * 8) You should have received a script to put into /etc/init.d with this

+ * software.

  *

  * Tested OK on Linux/x86 (RH8.0) with gcc3.2.

  *	cc -O3 -pedantic -Wuninitialized -Wall -pipe -mcpu=pentium -march=pentium -fomit-frame-pointer -ffast-math -finline-functions -funroll-loops clamav-milter.c -pthread -lmilter ../libclamav/.libs/libclamav.a ../clamd/cfgfile.o ../clamd/others.o

@@ -65,19 +60,28 @@

  * 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

  * I haven't tested it further on this platform yet.

+ * YDL3.0 should compile out of the box

+	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

  *

  * Sendmail on MacOS/X (10.1) is provided without a development package so this

  * can't be run "out of the box"

  *

- * Solaris 8 needs -lresolv to link, and doesn't have strerror_r, so you'll

- * need to replace strerror_r with strerror.

- *	-Dstrerror_r=strerror at compile time.

+ * Solaris 8 doesn't have milter support so clamav-milter won't work unless

+ * you rebuild sendmail from source.

+ * Solaris 9 has milter support in the supplied sendmail, but doesn't include

+ * libmilter so you can't develop milter applications on it. Go to sendmail.org,

+ * download the lastest sendmail, cd to libmilter and "make install" there.

+ * Needs -lresolv

  *

  * FreeBSD4.7 use /usr/local/bin/gcc30. GCC3.0 is an optional extra on

  * FreeBSD. It comes with getopt.h which is handy. To link you need

  * -lgnugetopt

  *	gcc30 -O3 -DCONFDIR=\"/usr/local/etc\" -I. -I.. -I../clamd -I../libclamav -pedantic -Wuninitialized -Wall -pipe -mcpu=pentium -march=pentium -fomit-frame-pointer -ffast-math -finline-functions -funroll-loops clamav-milter.c -pthread -lmilter ../libclamav/.libs/libclamav.a ../clamd/cfgfile.o ../clamd/others.o -lgnugetopt

  *

+ * FreeBSD4.8: should compile out of the box

+ * OpenBSD3.3: the supplied sendmail does not come with Milter support. You

+ * will need to rebuild sendmail from source

+ *

  * Changes

  *	0.2:	4/3/03	clamfi_abort() now always calls pthread_mutex_unlock

  *		5/3/03	Only send a bounce if -b is set

@@ -107,9 +111,15 @@

  *			Thanks to Krzysztof Olędzki <ole@ans.pl>

  *	0.60	11/7/03	Added suggestions by Nigel Kukard <nkukard@lbsd.net>

  *			Should stop a couple of remote chances of crashes

+ *	0.60a	22/7/03	Tidied up message when sender is unknown

+ *	0.60b	17/8/03	Optionally set postmaster address. Usually one uses

+ *			/etc/aliases, but not everyone want's to...

+ *	0.60c	22/8/03	Another go at Solaris support

+ *	0.60d	26/8/03	Removed superflous buffer and unneeded strerror call

+ *			ETIMEDOUT isn't an error, but should give a warning

  */

-#define	CM_VERSION	"0.60"

+#define	CM_VERSION	"0.60d"

 /*#define	CONFDIR	"/usr/local/etc"*/

@@ -145,7 +155,7 @@

 #include <regex.h>	// njh@bandsman.co.uk

 #define _GNU_SOURCE

-#include <getopt.h>

+#include "getopt.h"

 /*

  * TODO: optional: xmessage on console when virus stopped (SNMP would be real nice!)

@@ -158,6 +168,7 @@

  * TODO: Support ThreadTimeout, LogTime and Logfile from the conf

  *	 file

  * TODO: Allow more than one clamdscan server to be given

+ * TODO: Optionally quanrantine infected e-mails

  */

 /*

@@ -211,6 +222,7 @@ static	struct	cfgstruct	*copt;

 static	const	char	*localSocket;

 static	in_port_t	tcpSocket;

 static	const	char	*serverIP = "127.0.0.1";

+static	const	char	*postmaster = "postmaster";

 static void

 help(void)

@@ -225,6 +237,7 @@ help(void)

 	puts("\t--outgoing\t\t-o\tScan outgoing messages from this machine.");

 	puts("\t--server=ADDRESS\t-s ADDRESS\tIP address of server running clamd (when using TCPsocket).");

 	puts("\t--version\t\t-V\tPrint the version number of this software.");

+	puts("\t--postmaster\t\t-p\tPostmaster address [default=postmaster].");

 #ifdef	CL_DEBUG

 	puts("\t--debug-level=n\t\t-x n\tSets the debug level to 'n'.");

 #endif

@@ -279,6 +292,9 @@ main(int argc, char **argv)

 				"outgoing", 0, NULL, 'o'

 			},

 			{

+				"postmaster", 0, NULL, 'p'

+			},

+			{

 				"max-children", 1, NULL, 'm'

 			},

 			{

@@ -317,11 +333,14 @@ main(int argc, char **argv)

 			case 'l':	/* scan mail from the lan */

 				lflag++;

 				break;

+			case 'm':	/* maximum number of children */

+				max_children = atoi(optarg);

+				break;

 			case 'o':	/* scan outgoing mail */

 				oflag++;

 				break;

-			case 'm':	/* maximum number of children */

-				max_children = atoi(optarg);

+			case 'p':	/* postmaster e-mail address */

+				postmaster = optarg;

 				break;

 			case 's':	/* server running clamd */

 				serverIP = optarg;

@@ -633,13 +652,25 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 					"hit max-children limit (%u >= %u): waiting for some to exit",

 					n_children, max_children);

 			rc = pthread_cond_timedwait(&n_children_cond, &n_children_mutex, &timeout);

+#ifdef	CL_DEBUG

 			if(rc != 0) {

-				char message[64], buf[64];

+#else

+			if((rc != 0) && use_syslog) {

+#endif

+				char message[64];

+#ifdef TARGET_OS_SOLARIS        /* no strerror_r */

+				snprintf(message, sizeof(message), "pthread_cond_timedwait: %s", strerror(rc));

+#else

 				strerror_r(rc, buf, sizeof(buf));

 				snprintf(message, sizeof(message), "pthread_cond_timedwait: %s", buf);

-				if(use_syslog)

-					syslog(LOG_ERR, message);

+#endif

+				if(use_syslog) {

+					if(rc == ETIMEDOUT)

+						syslog(LOG_NOTICE, message);

+					else

+						syslog(LOG_ERR, message);

+				}

 #ifdef	CL_DEBUG

 				puts(message);

 #endif

@@ -777,11 +808,12 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 		/* 0.4 - use better error message */

 		if(use_syslog) {

-			char buf[64];

-

+#ifdef TARGET_OS_SOLARIS        /* no strerror_r */

+			syslog(LOG_ERR, "Failed to connect to port %d given by clamd: %s", port, strerror(rc));

+#else

 			strerror_r(rc, buf, sizeof(buf));

-

 			syslog(LOG_ERR, "Failed to connect to port %d given by clamd: %s", port, buf);

+#endif

 		}

 		return SMFIS_TEMPFAIL;

@@ -926,28 +958,27 @@ clamfi_eom(SMFICTX *ctx)

 		 * me might consider bouncing it...

 		 */

 		if(use_syslog)

-			syslog(LOG_NOTICE, "clean message from %s", privdata->from);

+			syslog(LOG_NOTICE, "clean message from %s",

+				(privdata->from) ? privdata->from : "an unknown sender");

 	} else {

 		int i;

 		char **to, *err;

 		FILE *sendmail;

-		/*

-		 * TODO: check that clamd didn't crash (WIFSIGNALED(status))

-		 */

 		if(use_syslog)

 			syslog(LOG_NOTICE, mess);

 		/*

 		 * Setup err as a list of recipients

 		 */

-		i = 1024;

-		err = (char *)malloc(i);

+		err = (char *)malloc(1024);

-		snprintf(err, i, "Intercepted virus from: %s to:", privdata->from);

+		sprintf(err, "Intercepted virus from %s to", privdata->from);

 		ptr = strchr(err, '\0');

+		i = 1024;

+

 		for(to = privdata->to; *to; to++) {

 			/*

 			 * Re-alloc if we are about run out of buffer space

@@ -959,7 +990,7 @@ clamfi_eom(SMFICTX *ctx)

 			ptr = strrcpy(ptr, " ");

 			ptr = strrcpy(ptr, *to);

 		}

-		(void)strrcpy(ptr, "\n");

+		(void)strcpy(ptr, "\n");

 		if(use_syslog)

 			syslog(LOG_NOTICE, err);

@@ -972,9 +1003,9 @@ clamfi_eom(SMFICTX *ctx)

 			fputs("From: MAILER-DAEMON\n", sendmail);

 			if(bflag) {

 				fprintf(sendmail, "To: %s\n", privdata->from);

-				fputs("Cc: postmaster\n", sendmail);

+				fprintf(sendmail, "Cc: %s\n", postmaster);

 			} else

-				fputs("To: postmaster\n", sendmail);

+				fprintf(sendmail, "To: %s\n", postmaster);

 			for(to = privdata->to; *to; to++)

 				fprintf(sendmail, "Cc: %s\n", *to);

@@ -63,6 +63,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"FollowFileSymlinks", OPT_NOARG},

 	    {"Foreground", OPT_NOARG},

 	    {"Debug", OPT_NOARG},

+	    {"FixStaleSocket", OPT_NOARG},

 	    {"User", OPT_STR},

 	    {"AllowSupplementaryGroups", OPT_NOARG},

 	    {"SelfCheck", OPT_NUM},

@@ -175,8 +175,8 @@ void clamd(struct optstruct *opt)

     logg("Reading databases from %s\n", dbdir);

     if((ret = cl_loaddbdir(dbdir, &root, &virnum))) {

-	fprintf(stderr, "ERROR: %s\n", cl_perror(ret));

-	logg("!%s\n", cl_perror(ret));

+	fprintf(stderr, "ERROR: %s\n", cl_strerror(ret));

+	logg("!%s\n", cl_strerror(ret));

 	exit(1);

     }

@@ -46,23 +46,41 @@ int localserver(const struct optstruct *opt, const struct cfgstruct *copt, struc

     if((sockfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

 	//fprintf(stderr, "ERROR: socket() error: %s\n", estr);

-	logg("!socket() error: %s\n", estr);

+	logg("!Socket allocation error: %s\n", estr);

 	exit(1);

     }

     if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) == -1) {

-	if(stat(server.sun_path, &foo) != -1) {

-	    //fprintf(stderr, "ERROR: Socket file %s already exists. Please remove it or use another one.\n", server.sun_path);

-	    logg("!Socket file %s already exists. Please remove it or use another one.\n", server.sun_path);

+	if(errno == EADDRINUSE) {

+	    if(connect(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) >= 0) {

+		close(sockfd);

+		logg("!Socket file %s is in use by another process.\n", server.sun_path);

+		exit(1);

+	    }

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

+		logg("^Socket file %s exists. Unclean shutdown? Removing...\n", server.sun_path);

+		if(unlink(server.sun_path) == -1) {

+		    estr = strerror(errno);

+		    logg("!Socket file %s could not be removed: %s\n", server.sun_path, estr);

+		    exit(1);

+		}

+		if(bind(sockfd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) == -1) {

+		    estr = strerror(errno);

+		    logg("!Socket file %s could not be bound: %s (unlink tried)\n", server.sun_path, estr);

+		    exit(1);

+		}

+	    } else if(stat(server.sun_path, &foo) != -1) {

+		logg("!Socket file %s exists. Either remove it, or configure a different one.\n", server.sun_path);

+		exit(1);

+	    }

+	} else {

+	    estr = strerror(errno);

+	    logg("!Socket file %s could not be bound: %s\n", server.sun_path, estr);

 	    exit(1);

 	}

+    }

-	estr = strerror(errno);

-	//fprintf(stderr, "ERROR: can't bind(): %s\n", estr);

-	logg("!bind() error: %s\n", estr);

-	exit(1);

-    } else

-	logg("Unix socket file %s\n", server.sun_path);

+    logg("Unix socket file %s\n", server.sun_path);

     if((cpt = cfgopt(copt, "MaxConnectionQueueLength")))

 	backlog = cpt->numarg;

@@ -132,6 +132,14 @@ int logg(const char *str, ...)

       /* SYSLOG logging - no need for locking, mutexes, times & stuff ... :-) */

+#ifndef vsyslog

+#define vsyslog(a,b,c)	{ \

+	char my_tmp[4096]; \

+	vsnprintf(my_tmp,4095,b,c); \

+	my_tmp[4095]=0; \

+	syslog(a,my_tmp); }

+#endif

+

 	va_start(args, str);

 	if(*str == '!') {

@@ -198,66 +206,18 @@ void chomp(char *string)

 	*pt = 0;

 }

-#ifndef C_URANDOM

-/* it's very weak */

-

-int rndnum(unsigned int max)

-{

-    struct timeval tv;

-

-  gettimeofday(&tv, (struct timezone *) 0);

-  srand(tv.tv_usec+clock());

-

-  return rand() % max;

-}

-

-#else

-

-int rndnum(unsigned int max)

-{

-	static FILE *fd = NULL;

-	unsigned int generated;

-	char *byte;

-	int size;

-

-    pthread_mutex_lock(&rand_mutex);

-

-    if(fd == NULL) {

-	if((fd = fopen("/dev/urandom", "rb")) == NULL) {

-	    printf("ERROR: Can't open /dev/urandom.\n");

-	    pthread_mutex_unlock(&rand_mutex);

-	    return -1;

-	}

-    }

-

-    byte = (char *) &generated;

-    size = sizeof(generated);

-    do {

-	int bread;

-	bread = fread(byte, 1, size, fd);

-	size -= bread;

-	byte += bread;

-    } while(size > 0);

-

-    pthread_mutex_unlock(&rand_mutex);

-    return generated % max;

-}

-#endif

-

 void virusaction(const char *filename, const char *virname, const struct cfgstruct *copt)

 {

 	char *buffer, *pt, *cmd;

 	struct cfgstruct *cpt;

-    logg("InVirusAction\n", cmd);

     if(!(cpt = cfgopt(copt, "VirusEvent")))

 	return;

     cmd = strdup(cpt->strarg);

-    logg("COMMAND: %s\n", cmd);

-    buffer = (char *) cli_malloc(strlen(cmd) + strlen(filename) + strlen(virname) + 10, sizeof(char));

+    buffer = (char *) mcalloc(strlen(cmd) + strlen(filename) + strlen(virname) + 10, sizeof(char));

     if((pt = strstr(cmd, "%f"))) {

 	*pt = 0; pt += 2;

@@ -279,7 +239,6 @@ void virusaction(const char *filename, const char *virname, const struct cfgstru

     free(buffer);

-    logg("Executing: %s\n", cmd);

     /* WARNING: this is uninterruptable ! */

     system(cmd);

@@ -32,7 +32,6 @@ short int logverbose, logcompressed, loglock, logtime;

 int logsize;

 const char *logfile;

 int logg(const char *str, ...);

-int rndnum(unsigned int max);

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

 short use_syslog;

@@ -151,8 +151,8 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 		logg("%s: %s FOUND\n", filename, virname);

 		virusaction(filename, virname, copt);

 	    } else if(ret != CL_CLEAN) {

-		mdprintf(odesc, "%s: %s ERROR\n", filename, cl_perror(ret));

-		logg("%s: %s ERROR\n", filename, cl_perror(ret));

+		mdprintf(odesc, "%s: %s ERROR\n", filename, cl_strerror(ret));

+		logg("%s: %s ERROR\n", filename, cl_strerror(ret));

 	    } 

 	    break;

 	case S_IFDIR:

@@ -181,7 +181,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

     while(!binded && portscan--) {

-	if((port = rndnum(60000)) < 1024)

+	if((port = cl_rndnum(60000)) < 1024)

 	    port += 2139;

 	memset((char *) &server, 0, sizeof(server));

@@ -266,8 +266,8 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	logg("stream: %s FOUND\n", virname);

 	virusaction("InputStream", virname, copt);

     } else if(ret != CL_CLEAN) {

-	mdprintf(odesc, "stream: %s ERROR\n", cl_perror(ret));

-	logg("stream: %s ERROR\n", cl_perror(ret));

+	mdprintf(odesc, "stream: %s ERROR\n", cl_strerror(ret));

+	logg("stream: %s ERROR\n", cl_strerror(ret));

     } else

 	mdprintf(odesc, "stream: OK\n");

@@ -327,7 +327,7 @@ void *threadwatcher(void *arg)

 	    logg("Reading databases from %s\n", dbdir);

 	    if((ret = cl_loaddbdir(dbdir, &*thwarg->root, &virnum))) {

-		logg("!%s\n", cl_perror(ret));

+		logg("!%s\n", cl_strerror(ret));

 		kill(progpid, SIGTERM);

 		/* we stay in reload == 1, so all threads are waiting */

 		continue;

@@ -82,13 +82,13 @@ int scanmanager(const struct optstruct *opt)

 	switch(sb.st_mode & S_IFMT) {

 	    case S_IFREG:

 		if((ret = cl_loaddb(getargc(opt, 'd'), &trie, &claminfo.signs))) {

-		    mprintf("@%s\n", cl_perror(ret));

+		    mprintf("@%s\n", cl_strerror(ret));

 		    return 50;

 		}

 		break;

             case S_IFDIR:

 		if((ret = cl_loaddbdir(getargc(opt, 'd'), &trie, &claminfo.signs))) {

-		    mprintf("@%s\n", cl_perror(ret));

+		    mprintf("@%s\n", cl_strerror(ret));

 		    return 50;

 		}

 		break;

@@ -99,7 +99,7 @@ int scanmanager(const struct optstruct *opt)

     } else {

 	if((ret = cl_loaddbdir(cl_retdbdir(), &trie, &claminfo.signs))) {

-	    mprintf("@%s\n", cl_perror(ret));

+	    mprintf("@%s\n", cl_strerror(ret));

 	    return 50;

 	}

     }

@@ -750,7 +750,7 @@ int checkfile(const char *filename, const struct cl_node *root, const struct cl_

 	    mprintf("%s: OK\n", filename);

     } else

 	if(!printinfected)

-	    mprintf("%s: %s\n", filename, cl_perror(ret));

+	    mprintf("%s: %s\n", filename, cl_strerror(ret));

     close(fd);

     return ret;

@@ -772,7 +772,7 @@ int checkstdin(const struct cl_node *root, const struct cl_limits *limits)

 	    mprintf("stdin: OK\n");

     } else

 	if(!printinfected)

-	    mprintf("stdin: %s\n", cl_perror(ret));

+	    mprintf("stdin: %s\n", cl_strerror(ret));

     return ret;

 }

@@ -232,50 +232,6 @@ int fileinfo(const char *filename, short i)

 /* these functions return pseudo random number from [0, max) */

-#ifndef C_URANDOM

-/* it's very weak */

-

-unsigned int rndnum(unsigned int max)

-{

-    struct timeval tv;

-

-  gettimeofday(&tv, (struct timezone *) 0);

-  srand(tv.tv_usec+clock());

-

-  return rand() % max;

-}

-

-#else

-

-int rndnum(unsigned int max)

-{

-	static FILE *fd = NULL;

-	unsigned int generated;

-	char *byte;

-	int size;

-

-

-    if(fd == NULL) {

-	if((fd = fopen("/dev/urandom", "rb")) == NULL) {

-	    mprintf("!Can't open /dev/urandom.\n");

-	    return -1;

-	}

-    }

-

-    byte = (char *) &generated;

-    size = sizeof(generated);

-    do {

-	int bread;

-	bread = fread(byte, 1, size, fd);

-	size -= bread;

-	byte += bread;

-    } while(size > 0);

-

-    return generated % max;

-}

-

-#endif

-

 /*

 #ifdef C_LINUX

 int detectcpu(void)

@@ -480,7 +436,7 @@ char *gentemp(const char *dir)

     do {

 	for(i = 0; i < 32; i++)

-	    salt[i] = rndnum(255);

+	    salt[i] = cl_rndnum(255);

 	tmp = cl_md5buff(salt, 32);

 	strncat(name, tmp, 16);

@@ -1901,7 +1901,7 @@ fi

 # Define the identity of the package.

  PACKAGE=clamav

- VERSION=20030806

+ VERSION=20030829

 cat >>confdefs.h <<_ACEOF

@@ -9072,7 +9072,7 @@ _ACEOF

     fi

     ;;

 solaris*)

-    FRESHCLAM_LIBS="-lsocket -lnsl"

+    FRESHCLAM_LIBS="-lsocket -lnsl -lresolv"

     if test "$have_pthreads" = "yes"; then

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

 	CLAMD_LIBS="-lpthread -lsocket -lnsl"

@@ -19,7 +19,7 @@ AC_INIT(clamscan/clamscan.c)

 AC_CREATE_TARGET_H(target.h)

 AC_CANONICAL_SYSTEM

-AM_INIT_AUTOMAKE(clamav, 20030806)

+AM_INIT_AUTOMAKE(clamav, 20030829)

 dnl AM_INIT_AUTOMAKE(clamav, `date +%Y%m%d`)

 LC_CURRENT=1

 LC_REVISION=3

@@ -223,7 +223,7 @@ cygwin*)

     fi

     ;;

 solaris*)

-    FRESHCLAM_LIBS="-lsocket -lnsl"

+    FRESHCLAM_LIBS="-lsocket -lnsl -lresolv"

     if test "$have_pthreads" = "yes"; then

 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"

 	CLAMD_LIBS="-lpthread -lsocket -lnsl"

@@ -24,8 +24,8 @@ CLAMAVGROUP = @CLAMAVGROUP@

 install:

 	$(mkinstalldirs) $(DESTDIR)$(DBINST)

-	@$(INSTALL_DATA) viruses.db $(DESTDIR)$(DBINST)

-	@$(INSTALL_DATA) viruses.db2 $(DESTDIR)$(DBINST)

+#	@$(INSTALL_DATA) viruses.db $(DESTDIR)$(DBINST)

+#	@$(INSTALL_DATA) viruses.db2 $(DESTDIR)$(DBINST)

 	@$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)

 	@if test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

 	    chmod 775 $(DESTDIR)$(DBINST); \

@@ -246,8 +246,8 @@ uninstall-am: uninstall-info-am

 install:

 	$(mkinstalldirs) $(DESTDIR)$(DBINST)

-	@$(INSTALL_DATA) viruses.db $(DESTDIR)$(DBINST)

-	@$(INSTALL_DATA) viruses.db2 $(DESTDIR)$(DBINST)

+#	@$(INSTALL_DATA) viruses.db $(DESTDIR)$(DBINST)

+#	@$(INSTALL_DATA) viruses.db2 $(DESTDIR)$(DBINST)

 	@$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)

 	@if test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \

 	    chmod 775 $(DESTDIR)$(DBINST); \

@@ -1,8715 +0,0 @@

-_0017_0001_000=40cd21b8004233c999cd218bd6b90300b440cd218b4c198b541bb80157cd21b43ecd2132ed8a4c18

-_0017_0001_001=e8b3005a8b4e27b440cd21e8c2045a59b440cd21e81902b440cd21b8004233c999cd218bd6b90300

-_0017_0001_002=8bfd83c72d515757e8b3005a8b4e27b440cd21e8c2045a59b440cd21e81902b440cd21b8004233

-_0017_0001_003=cd2172ee50f7d8250f008bc85803c150b440cd21582d0300c604e98944018bd6b985092bd1050301

-_0017_0001_004=b440cd21e8c2045a59b440cd21e81902b440cd21b8004233c999cd218bd6b90300b440cd218b4c19

-_0023_0004_003=2150558becc7460200405d58b90400ba4a08cd21e90001803e6208407411803e5c086b740aa14a08

-_0023_0004_004=ea0550558becc7460200405d5833d2b98700cd2150558becc7460200405d58ba9a10b91310cd21bf

-_0023_0005_000=ea0450558becc7460200405d5833d2b98700cd2150558becc7460200405d58ba9a10b91310cd21b8

-_0023_0005_001=2150558becc7460200405d58ba9a10b91310cd21bf4a08b0e9aa58abb06baab80042505833c933d2

-_0023_0005_002=2150558becc7460200405d58ba9a10b91310cd21b80042505833c933d2cd2150558becc746020040

-_0025_0006_000=1126894515505657551e0653e84c005bb440cd213bc8071f5d5f5e587519c7044de92d0400894402

-_0025_0006_001=040089440233c026894515b904008bd6b440cd21061f8f4515804d0640b43e9c0ee8d8fe804d0540

-_0026_0006_000=f8005ab440cd21e80d00b91800baa702b440cd21e952ff32c0eb02b002b44233c933d2cd21c3bf02

-_0030_0001_006=0733c98bd1b802422e8b1e390f9cfa2eff1ee80dc38becb80057e8ebffbb630f890f895702e8c802

-_0034_0001_003=8b45118be8b904002bc1a3160ab440ba140acd2126896d1506570e07be0001bf040db98b04f3a5b8

-_0034_0001_004=0bbfe40a5253568bddfec7e8d4f7b4405a5bcd21b440b916095acd215f0726804d0640b43ecd21c3

-_0037_0001_000=bea1068db60801e86b005d5b8d96a106b440cd218f860402b80042e82b008d96ff01b90500b440cd

-_0037_0001_001=860402b80042e82b008d96ff01b90500b440cd21fe8606025a59b80157cd21b43ecd2180be060201