@@ -6,12 +6,13 @@ Project leader.

 Nigel Horne <njh*clamav.net>

 home page : http://bandsman.co.uk

-Author of clamav-milter and the whole mbox code.

+Author of clamav-milter and the mbox code.

-Luca 'NERvOus' Gibelli <nervous*clamav.net>

+Luca 'NERvOus' Gibelli <luca*clamav.net>

 home page : http://www.nervous.it

+gpg key	  : http://www.clamav.net/gpg/nervoso.gpg

 GPG fingerprint = C782 121E 8C3A 90E3 7A87  D802 6277 8FF4 5EFC 5582

-System administrator (WWW, mailing lists, mirror mechanism, virus

+System administrator (WWW, mailing lists, mirror coordinator, virus

 submission mechanism)

 Trog <trog*clamav.net>

@@ -29,7 +30,7 @@ Database developers:

 aCaB <acab*clamav.net>

 Christoph Cordes <cc*clamav.net>

-gpg key   :

+gpg key   : http://www.clamav.net/gpg/ccordes.gpg

 GPG fingerprint = 4C6F F6A5 6034 04B1 1006  A7E1 1F1B 78CE C6DA 0F00

 Diego D'Ambra <diego*clamav.net>

@@ -61,6 +62,7 @@ Andrey Cherezov <andrey*cherezov.koenig.su>

 Tom G. Christensen <tgc*statsbiblioteket.dk>

 Damien Curtain <damien*pagefault.org>

 Michael Dankov <misha*btrc.ru>

+Maxim Dounin <mdounin*rambler-co.ru>

 Alejandro Dubrovsky <s328940*student.uq.edu.au>

 Magnus Ekdahl <magnus*debian.org>

 Jason Englander <jason*englanders.cc>

@@ -1,3 +1,10 @@

+Thu Apr 15 00:51:29 CEST 2004 (tk)

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

+  * libclamav: cli_scanmail: fix a hole in recursion limit (patch by

+	       Maxim Dounin <mdounin*rambler-co.ru>)

+  * clamscan: fix HPUX compilation error (reported by Rolf Eike Beer

+	      <eike*mail.math.uni-mannheim.de>)

+

 Wed Apr 14 09:32:50 BST 2004 (njh)

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

   * libclamav/mbox.c:	When debugging print the email number when

@@ -5,7 +12,7 @@ Wed Apr 14 09:32:50 BST 2004 (njh)

 Wed Apr 14 03:24:44 CEST 2004 (tk)

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

-  * clamd: VirusEvent: disable support for %f

+  * clamd: VirusEvent: drop support for %f

 	   (http://www.securitytracker.com/alerts/2004/Apr/1009615.html)

 Tue Apr 13 14:16:42 CEST 2004 (tk)

@@ -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.32 2004/04/06 12:14:52 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.33 2004/04/14 22:55:44 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.32 2004/04/06 12:14:52 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.33 2004/04/14 22:55:44 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -81,6 +81,9 @@

 /* have gmp installed */

 #undef HAVE_GMP

+/* Define to 1 if you have the `inet_ntop' function. */

+#undef HAVE_INET_NTOP

+

 /* Define to 1 if you have the <inttypes.h> header file. */

 #undef HAVE_INTTYPES_H

@@ -41,6 +41,7 @@

 #include <target.h>

 #include "output.h"

+#include "others.h"

 int fileinfo(const char *filename, short i)

 {

@@ -8233,7 +8233,8 @@ _ACEOF

-for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat

+

+for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop

 do

 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

 echo "$as_me:$LINENO: checking for $ac_func" >&5

@@ -57,7 +57,7 @@ AC_TYPE_OFF_T

 AC_COMPILE_CHECK_SIZEOF(short)

 AC_COMPILE_CHECK_SIZEOF(int)

 AC_COMPILE_CHECK_SIZEOF(long)

-AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat)

+AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat inet_ntop)

 # Check for broken snprintf

 if test "x$ac_cv_func_snprintf" = "xyes" ; then

@@ -110,6 +110,7 @@ cli_file_t cli_filetype(const char *buf, size_t buflen)

 }

 static int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

+static int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);

 static int cli_scandesc(int desc, const char **virname, long int *scanned, const struct 

 cl_node *root)

@@ -720,7 +721,7 @@ static int cli_scandir(char *dirname, const char **virname, long int *scanned, c

 			    cli_scandir(fname, virname, scanned, root, limits, options, reclev);

 			else

 			    if(S_ISREG(statbuf.st_mode))

-				if(cl_scanfile(fname, virname, scanned, root, limits, options) == CL_VIRUS) {

+				if(cli_scanfile(fname, virname, scanned, root, limits, options, reclev) == CL_VIRUS) {

 				    free(fname);

 				    closedir(dd);

 				    return CL_VIRUS;

@@ -747,7 +748,7 @@ static int cli_scanmail(int desc, const char **virname, long int *scanned, const

 	int ret;

-    cli_dbgmsg("Starting cli_scanmail()\n");

+    cli_dbgmsg("Starting cli_scanmail(), reclev %d\n", *reclev);

     if(*reclev > 5) /* FIXME: a temporary workaround */

 	return CL_CLEAN;

@@ -883,6 +884,21 @@ int cl_scandesc(int desc, const char **virname, unsigned long int *scanned, cons

     return cli_magic_scandesc(desc, virname, scanned, root, limits, options, &reclev);

 }

+int cli_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev)

+{

+	int fd, ret;

+

+    /* internal version of cl_scanfile with reclev preserved */

+

+    if((fd = open(filename, O_RDONLY)) == -1)

+	return CL_EOPEN;

+

+    ret = cli_magic_scandesc(fd, virname, scanned, root, limits, options, reclev);

+

+    close(fd);

+    return ret;

+}

+

 int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options)

 {

 	int fd, ret;