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

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit 9995c517336d414253bc28f2b15ab76740484fa1
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Tue Sep 1 19:44:42 2009 +0200

    drop obsolete stuff

diff --git a/libclamav/default.h b/libclamav/default.h
index 24e226d..8641fe9 100644
--- a/libclamav/default.h
+++ b/libclamav/default.h
@@ -25,11 +25,6 @@
 #define CLI_DEFAULT_AC_MAXDEPTH	    3
 #define CLI_DEFAULT_AC_TRACKLEN	    8
 
-#define CLI_DEFAULT_MOVETOAC_LEN    8 /* all static sigs shorter than
-				       * this value will automatically
-				       * go to AC instead of BM
-				       */
-
 #define CLI_DEFAULT_LSIG_BUFSIZE    32768
 #define CLI_DEFAULT_DBIO_BUFSIZE    CLI_DEFAULT_LSIG_BUFSIZE + 1
 
diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index 9cc7cc2..5e1e5f8 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -246,7 +246,7 @@ int cli_parse_add(struct cli_matcher *root, const char *virname, const char *hex
 	    free(pt);
 	}
 
-    } else if(root->ac_only || type || lsigid /* || (hexlen / 2 < CLI_DEFAULT_MOVETOAC_LEN) FIXME: unit tests */ || strpbrk(hexsig, "?(") || (root->bm_offmode && (!strcmp(offset, "*") || strchr(offset, ',')))) {
+    } else if(root->ac_only || type || lsigid || strpbrk(hexsig, "?(") || (root->bm_offmode && (!strcmp(offset, "*") || strchr(offset, ',')))) {
 	if((ret = cli_ac_addsig(root, virname, hexsig, 0, 0, 0, rtype, type, 0, 0, offset, lsigid, options))) {
 	    cli_errmsg("cli_parse_add(): Problem adding signature (3).\n");
 	    return ret;
@@ -322,7 +322,7 @@ static int cli_initroots(struct cl_engine *engine, unsigned int options)
 	    }
 	}
     }
-    /* engine->root[1]->bm_offmode = 1; */ /* BM offset mode for PE files */
+    engine->root[1]->bm_offmode = 1; /* BM offset mode for PE files */
     return CL_SUCCESS;
 }
 

-- 
Debian repository for ClamAV