git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1099 77e5149b-7576-45b1-b177-96237e5ba77b
Tomasz Kojm authored on 2004/11/17 00:21:06... | ... |
@@ -1,3 +1,9 @@ |
1 |
+Tue Nov 16 16:15:38 CET 2004 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * clamscan/manager.c: fix duplicate reporting of failure to open some |
|
4 |
+ archive types (patch by Robert Hogan |
|
5 |
+ <robert*roberthogan.net>) |
|
6 |
+ |
|
1 | 7 |
Mon Nov 15 23:55:50 CET 2004 (tk) |
2 | 8 |
--------------------------------- |
3 | 9 |
* libclamav/scanners.c: mscab: pass duplicated descriptor to cabd->dsearch() |
... | ... |
@@ -394,8 +394,12 @@ int scanfile(const char *filename, struct cl_node *root, const struct passwd *us |
394 | 394 |
|
395 | 395 |
return 1; |
396 | 396 |
|
397 |
- } else if(ret == CL_CLEAN) |
|
397 |
+ } else if(ret == CL_CLEAN) { |
|
398 | 398 |
return 0; |
399 |
+ } else if(ret == 54) { |
|
400 |
+ return ret; |
|
401 |
+ } |
|
402 |
+ |
|
399 | 403 |
/* in other case try to continue with external archivers */ |
400 | 404 |
options &= ~CL_SCAN_ARCHIVE; /* and disable decompression for the below checkfile() */ |
401 | 405 |
} |