[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 0e66194e8f71259a0e39650f95f07c659109b39a
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:11 2008 +0100

    Revert "merged from trunk r3904, r3905"
    
    This reverts commit fbd3b864667e94159578ef66132b6a1bdf7bd4e5.

diff --git a/ChangeLog b/ChangeLog
index bdf2457..57d000b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Thu Jul  3 16:02:03 EEST 2008 (edwin)
--------------------------------------
-  * libclamav/scanners.c: add missing check for file open failure (bb #1083).
-
 Wed Jul  2 13:24:25 CEST 2008 (tk)
 ----------------------------------
   * sigtool/sigtool.c: make use of the UNLINK command in cdiffs (bb#1080)
diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index 5416b66..1f0f793 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef	HAVE_UNISTD_H
@@ -162,11 +161,6 @@ static int cli_scandir(const char *dirname, cli_ctx *ctx, cli_file_t container)
 
 				if(container == CL_TYPE_MAIL) {
 				    fd = open(fname, O_RDONLY|O_BINARY);
-				    if(fd == -1) {
-					    cli_warnmsg("Cannot open file %s: %s, mode: %x\n", fname, strerror(errno), statbuf.st_mode);
-					    free(fname);
-					    continue;
-				    }
 				    ftype = cli_filetype2(fd, ctx->engine);
 				    if(ftype >= CL_TYPE_TEXT_ASCII && ftype <= CL_TYPE_TEXT_UTF16BE) {
 					lseek(fd, 0, SEEK_SET);

-- 
Debian repository for ClamAV