honour --unrar when libclamunrar is not compiled in

git-svn: trunk@3685
18 years ago · 6ae82a4893
parent eb0757aaa8
commit 6ae82a4893
2 changed files with 8 additions and 0 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Thu Feb 28 19:36:55 CET 2008 (tk)
+---------------------------------
+  * clamscan/manager.c: honour --unrar when libclamunrar is not compiled in
+
 Wed Feb 27 19:53:18 EET 2008 (edwin)
 -----------------------------------
  * libclamav/htmlnorm.c: more improvements to script end tag detection
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@ -1020,6 +1020,10 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd
     */

    if((cli_strbcasestr(filename, ".zip") || cli_strbcasestr(filename, ".rar")) && (options & CL_SCAN_ARCHIVE)) {
+
+#ifndef ENABLE_UNRAR
+      if(cli_strbcasestr(filename, ".zip"))
+#endif
 	/* try to use internal archivers */
 	if((ret = checkfile(filename, engine, limits, options, 1)) == CL_VIRUS) {
 	    if(opt_check(opt, "remove")) {