[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 9981dfc43b888e8bd19d25c0a878fe3b878bba37
Author: aCaB <acab at clamav.net>
Date:   Mon Jul 13 12:45:12 2009 +0200

    add ishield DCONF

diff --git a/libclamav/dconf.c b/libclamav/dconf.c
index 88203d3..2a37b9c 100644
--- a/libclamav/dconf.c
+++ b/libclamav/dconf.c
@@ -90,6 +90,7 @@ static struct dconf_module modules[] = {
     { "ARCHIVE",    "SIS",	    ARCH_CONF_SIS,	    1 },
     { "ARCHIVE",    "NSIS",	    ARCH_CONF_NSIS,	    1 },
     { "ARCHIVE",    "AUTOIT",	    ARCH_CONF_AUTOIT,	    1 },
+    { "ARCHIVE",    "ISHIELD",	    ARCH_CONF_ISHIELD,	    1 },
 
     { "DOCUMENT",   "HTML",	    DOC_CONF_HTML,	    1 },
     { "DOCUMENT",   "RTF",	    DOC_CONF_RTF,	    1 },
diff --git a/libclamav/dconf.h b/libclamav/dconf.h
index aafa37e..3c1e676 100644
--- a/libclamav/dconf.h
+++ b/libclamav/dconf.h
@@ -75,6 +75,7 @@ struct cli_dconf {
 #define ARCH_CONF_ARJ       0x1000
 #define ARCH_CONF_AUTOIT    0x2000
 #define ARCH_CONF_CPIO	    0x4000
+#define ARCH_CONF_ISHIELD   0x8000
 
 /* Document flags */
 #define DOC_CONF_HTML		0x1
diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index 4ead9ce..cf85feb 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -1794,7 +1794,7 @@ static int cli_scanraw(int desc, cli_ctx *ctx, cli_file_t type, uint8_t typercg,
 			break;
 
 		    case CL_TYPE_ISHIELD_MSI:
-		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE /* FIXMEISHIELD && (DCONF_ARCH & ARCH_CONF_ISHIELD)*/) {
+		        if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE && (DCONF_ARCH & ARCH_CONF_ISHIELD)) {
 			    cli_dbgmsg("ISHIELD-MSI signature found at %u\n", (unsigned int) fpt->offset);
 			    nret = cli_scanishield_msi(desc, ctx, fpt->offset + 14);
 			}
@@ -1974,7 +1974,7 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)
 	    break;
 
         case CL_TYPE_ISHIELD_MSI:
-	    if(SCAN_ARCHIVE /* FIXMEISHIELD && (DCONF_ARCH & ARCH_CONF_ISHIELD)*/)
+	    if(SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_ISHIELD))
 		ret = cli_scanishield_msi(desc, ctx, 14);
 	    break;
 

-- 
Debian repository for ClamAV