Browse code

honour --unrar when libclamunrar is not compiled in

git-svn: trunk@3685

Tomasz Kojm authored on 2008/02/29 05:06:54
Showing 2 changed files
... ...
@@ -1,3 +1,7 @@
1
+Thu Feb 28 19:36:55 CET 2008 (tk)
2
+---------------------------------
3
+  * clamscan/manager.c: honour --unrar when libclamunrar is not compiled in
4
+
1 5
 Wed Feb 27 19:53:18 EET 2008 (edwin)
2 6
 -----------------------------------
3 7
   * libclamav/htmlnorm.c: more improvements to script end tag detection
... ...
@@ -1020,6 +1020,10 @@ int scanfile(const char *filename, struct cl_engine *engine, const struct passwd
1020 1020
      */
1021 1021
 
1022 1022
     if((cli_strbcasestr(filename, ".zip") || cli_strbcasestr(filename, ".rar")) && (options & CL_SCAN_ARCHIVE)) {
1023
+
1024
+#ifndef ENABLE_UNRAR
1025
+      if(cli_strbcasestr(filename, ".zip"))
1026
+#endif
1023 1027
 	/* try to use internal archivers */
1024 1028
 	if((ret = checkfile(filename, engine, limits, options, 1)) == CL_VIRUS) {
1025 1029
 	    if(opt_check(opt, "remove")) {