[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 e1accb1cc3dea99322523ff70f67b89fdf531f3f
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:43 2008 +0100

    Revert "print information about clean files when the RAR code is not compiled-in (bb#999)"
    
    This reverts commit a84fbeb358d8b63fb98b9f8e9f7b7cea85910294.

diff --git a/ChangeLog b/ChangeLog
index f671b14..9c2b1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Mon Apr 28 13:48:36 CEST 2008 (tk)
-----------------------------------
-  * clamscan/manager.c: print information about clean files when the RAR
-			code is not compiled-in (bb#999)
-
 Mon Apr 28 12:37:31 CEST 2008 (tk)
 ----------------------------------
   * libclamav/unzip.c: remove detection of Suspect.Zip and
diff --git a/clamscan/manager.c b/clamscan/manager.c
index dcc53d1..4fe60a0 100644
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@@ -949,7 +949,7 @@ static int scandenied(const char *filename, struct cl_engine *engine, const stru
 
 int scanfile(const char *filename, struct cl_engine *engine, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, unsigned int options)
 {
-	int ret = 0, included, printclean = 1;
+	int ret, included, printclean = 1;
 	const struct optnode *optnode;
 	char *argument;
 #ifdef C_LINUX
@@ -1046,6 +1046,7 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd
 
 	/* in other case try to continue with external archivers */
 	options &= ~CL_SCAN_ARCHIVE; /* and disable decompression for the checkfile() below */
+	printclean = 0;
     }
 
     if((cli_strbcasestr(filename, ".zip") && opt_check(opt, "unzip"))

-- 
Debian repository for ClamAV