[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit ceb05b6b3cbb33b8fbaa83e82f049604d43a8870
Author: aCaB <acab at clamav.net>
Date:   Thu Oct 1 17:24:25 2009 +0200

    re-enable machoes

diff --git a/libclamav/macho.c b/libclamav/macho.c
index c18083b..3e5e1d8 100644
--- a/libclamav/macho.c
+++ b/libclamav/macho.c
@@ -490,10 +490,9 @@ int cli_scanmacho(int fd, cli_ctx *ctx, struct cli_exe_info *fileinfo)
     }
 }
 
-int cli_machoheader(int fd, struct cli_exe_info *fileinfo)
+int cli_machoheader(struct F_MAP *map, struct cli_exe_info *fileinfo)
 {
-return CL_EFORMAT; /* FIXMEFMAP: avoids crashing on machoes for now */
-    return cli_scanmacho(fd, NULL, fileinfo);
+    return cli_scanmacho(map->fd, NULL, fileinfo);
 }
 
 int cli_scanmacho_unibin(int fd, cli_ctx *ctx)
diff --git a/libclamav/macho.h b/libclamav/macho.h
index d31a564..c80a26f 100644
--- a/libclamav/macho.h
+++ b/libclamav/macho.h
@@ -23,9 +23,10 @@
 
 #include "others.h"
 #include "execs.h"
+#include "fmap.h"
 
 int cli_scanmacho(int fd, cli_ctx *ctx, struct cli_exe_info *fileinfo);
-int cli_machoheader(int fd, struct cli_exe_info *fileinfo);
+int cli_machoheader(struct F_MAP *map, struct cli_exe_info *fileinfo);
 int cli_scanmacho_unibin(int fd, cli_ctx *ctx);
 
 #endif

-- 
Debian repository for ClamAV