[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 e293229df0a27544013a427376331b61ef85675d
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Tue Feb 2 17:13:44 2010 +0100

    don't count lsig associated with bc

diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index 3bf2aae..d746b72 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -1356,7 +1356,7 @@ static int cli_loadcbc(FILE *fs, struct cl_engine *engine, unsigned int *signo,
 	return rc;
     }
     bc->id = bcs->count;/* must set after _load, since load zeroes */
-    sigs += 2;/* the bytecode itself and the logical sig */
+    sigs++;
     if (bc->kind == BC_LOGICAL || bc->lsig) {
 	if (!bc->lsig) {
 	    cli_errmsg("Bytecode %s has logical kind, but missing logical signature!\n", dbname);
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index da44d05..621921f 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -707,7 +707,7 @@ static int build(const struct optstruct *opts)
 			}
 			lspt->next = dblist2;
 			dblist2 = lspt;
-			entries += 2; /* bytecode + lsig */
+			entries++;
 		    }
 		}
 	    }

-- 
Debian repository for ClamAV