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

    Revert "clamdscan/clamdscan.c: don't show scan summary when clamd cannot be contacted (bb#1041)"
    
    This reverts commit b0aa5be062274ca049140764f1d7cb2c398e6e43.

diff --git a/ChangeLog b/ChangeLog
index 3734bf7..6490987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Mon Jun  2 17:49:50 CEST 2008 (tk)
-----------------------------------
-  * clamdscan/clamdscan.c: don't show scan summary when clamd cannot be
-			   contacted (bb#1041)
-
 Mon Jun  2 17:59:15 EEST 2008 (edwin)
 -------------------------------------
   * libclamav/hashtab.[ch], scanners.c: avoid using C99 flexible array members
diff --git a/clamdscan/clamdscan.c b/clamdscan/clamdscan.c
index bfc8883..bd4ea4f 100644
--- a/clamdscan/clamdscan.c
+++ b/clamdscan/clamdscan.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
     ret = client(opt, &infected);
 
     /* TODO: Implement STATUS in clamd */
-    if((infected || ret != 2) && !opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
+    if(!opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
 	gettimeofday(&t2, &tz);
 	ds = t2.tv_sec - t1.tv_sec;
 	dms = t2.tv_usec - t1.tv_usec;

-- 
Debian repository for ClamAV