@@ -1,3 +1,7 @@

+Mon Sep 27 04:00:14 CEST 2004 (tk)

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

+  * libclamav: ignore ndb signatures in cl_scanbuff()

+

 Sun Sep 26 03:11:48 CEST 2004 (tk)

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

   * docs/MacOSX: update (Dale Enterprise L.L.C)

@@ -156,7 +156,7 @@ This option supports tar.gz and .tgz files. You need GNU tar, on non\-Linux syst

 .TP 

 (5) Scan mail spool directory:

-\fBclamscan \-r \-\-mbox /var/spool/mail\fR

+\fBclamscan \-r /var/spool/mail\fR

 .SH "RETURN CODES"

 .LP 

 Note: some return codes may only appear in a one file mode (clamscan is started with file argument). Those are marked with \fB(ofm)\fR.

@@ -296,7 +296,7 @@ int cli_ac_scanbuff(const char *buffer, unsigned int length, const char **virnam

 			    t = type;

 			else

 			    t = ftype;

-			if(!cli_validatesig(pt->target, t, pt->offset, offset + position, fd, pt->virname)) {

+			if(fd == -1 || !cli_validatesig(pt->target, t, pt->offset, offset + position, fd, pt->virname)) {

 			    pt = pt->next;

 			    continue;

 			}

@@ -169,7 +169,7 @@ int cli_bm_scanbuff(const char *buffer, unsigned int length, const char **virnam

 		    if(p->target || p->offset) {

 			    int off = offset + i - BM_MIN_LENGTH + BM_BLOCK_SIZE;

-			if(!cli_validatesig(p->target, ftype, p->offset, off, fd, p->virname)) {

+			if(fd == -1 || !cli_validatesig(p->target, ftype, p->offset, off, fd, p->virname)) {

 			    p = p->next;

 			    continue;

 			}