[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 486fd3daf51ebce9af0abe224370f668e3e66d64
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Feb 17 16:25:56 2010 +0100

    clean up some checks

diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index 9cdfc04..c2b4e2a 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -867,9 +867,6 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo,
     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {
 	line++;
 
-	if(!strncmp(buffer, "Exploit.JPEG.Comment", 20)) /* temporary */
-	    continue;
-
 	if(!phish)
 	    if(!strncmp(buffer, "HTML.Phishing", 13) || !strncmp(buffer, "Email.Phishing", 14))
 		continue;
@@ -879,8 +876,7 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo,
 	    strcpy(buffer_cpy, buffer);
 
 	tokens_count = cli_strtokenize(buffer, ':', NDB_TOKENS + 1, tokens);
-	/* FIXME: re-enable after fixing invalid sig @ main.ndb:53467 */
-	if(tokens_count < 4 /*|| tokens_count > 6*/) {
+	if(tokens_count < 4 || tokens_count > 6) {
 	    ret = CL_EMALFDB;
 	    break;
 	}

-- 
Debian repository for ClamAV