@@ -1,3 +1,9 @@

+Fri Sep 16 12:47:10 CEST 2011 (acab)

+------------------------------------

+ * libclamav: properly pass custom flag to sigload_cb

+ * c4w: honor custom sigs in mindefs

+   (bb#3509 + bb#3510)

+

 Thu Sep 15 14:44:11 CEST 2011 (tk)

 ----------------------------------

  * freshclam: fix pidfile removal (bb#3499)

@@ -573,7 +573,7 @@ static int cli_loaddb(FILE *fs, struct cl_engine *engine, unsigned int *signo, u

 	if(engine->ignored && cli_chkign(engine->ignored, start, buffer_cpy))

 	    continue;

-	if(engine->cb_sigload && engine->cb_sigload("db", start, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+	if(engine->cb_sigload && engine->cb_sigload("db", start, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	    cli_dbgmsg("cli_loaddb: skipping %s due to callback\n", start);

 	    continue;

 	}

@@ -652,7 +652,7 @@ static int cli_loadidb(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 	if(engine->ignored && cli_chkign(engine->ignored, tokens[0], buffer_cpy))

 	    continue;

-	if(engine->cb_sigload && engine->cb_sigload("idb", tokens[0], options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+	if(engine->cb_sigload && engine->cb_sigload("idb", tokens[0], ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	    cli_dbgmsg("cli_loadidb: skipping %s due to callback\n", tokens[0]);

 	    continue;

 	}

@@ -926,7 +926,7 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 	if(engine->ignored && cli_chkign(engine->ignored, virname, buffer_cpy))

 	    continue;

-	if(!sdb && engine->cb_sigload && engine->cb_sigload("ndb", virname, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+	if(!sdb && engine->cb_sigload && engine->cb_sigload("ndb", virname, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	    cli_dbgmsg("cli_loadndb: skipping %s due to callback\n", virname);

 	    continue;

 	}

@@ -1235,7 +1235,7 @@ static int load_oneldb(char *buffer, int chkpua, int chkign, struct cl_engine *e

     if (chkign && cli_chkign(engine->ignored, virname, buffer_cpy))

 	return CL_SUCCESS;

-    if(engine->cb_sigload && engine->cb_sigload("ldb", virname, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+    if(engine->cb_sigload && engine->cb_sigload("ldb", virname, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	cli_dbgmsg("cli_loadldb: skipping %s due to callback\n", virname);

 	(*sigs)--;

 	return CL_SUCCESS;

@@ -1443,7 +1443,7 @@ static int cli_loadcbc(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 	return CL_SUCCESS;

     }

-    if(engine->cb_sigload && engine->cb_sigload("cbc", dbname, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+    if(engine->cb_sigload && engine->cb_sigload("cbc", dbname, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	cli_dbgmsg("cli_loadcbc: skipping %s due to callback\n", dbname);

 	return CL_SUCCESS;

     }

@@ -1948,7 +1948,7 @@ static int cli_loadhash(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 		dot = dbname;

 	    else

 		dot++;

-	    if(engine->cb_sigload(dot, pt, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+	    if(engine->cb_sigload(dot, pt, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 		cli_dbgmsg("cli_loadhash: skipping %s (%s) due to callback\n", pt, dot);

 	        continue;

 	    }

@@ -2090,7 +2090,7 @@ static int cli_loadmd(FILE *fs, struct cl_engine *engine, unsigned int *signo, i

 	    continue;

 	}

-	if(engine->cb_sigload && engine->cb_sigload("md", new->virname, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+	if(engine->cb_sigload && engine->cb_sigload("md", new->virname, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	    cli_dbgmsg("cli_loadmd: skipping %s due to callback\n", new->virname);

 	    mpool_free(engine->mempool, new->virname);

 	    mpool_free(engine->mempool, new);

@@ -2230,7 +2230,7 @@ static int cli_loadcdb(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 	    continue;

 	}

-	if(engine->cb_sigload && engine->cb_sigload("cdb", new->virname, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+	if(engine->cb_sigload && engine->cb_sigload("cdb", new->virname, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 	    cli_dbgmsg("cli_loadcdb: skipping %s due to callback\n", new->virname);

 	    mpool_free(engine->mempool, new->virname);

 	    mpool_free(engine->mempool, new);

@@ -441,7 +441,7 @@ int load_regex_matcher(struct cl_engine *engine,struct regex_matcher* matcher,FI

 		if(functionality_level_check(buffer))

 			continue;

-		if(engine->cb_sigload && engine->cb_sigload("phishing", buffer, options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

+		if(engine->cb_sigload && engine->cb_sigload("phishing", buffer, ~options & CL_DB_OFFICIAL, engine->cb_sigload_ctx)) {

 			cli_dbgmsg("load_regex_matcher: skipping %s due to callback\n", buffer);

 			continue;

 		}

@@ -306,11 +306,14 @@ BOOL interface_setup(void) {

 }

 static int sigload_callback(const char *type, const char *name, unsigned int custom, void *context) {

-    if(minimal_definitions && (custom || strcmp(type, "fp")))

+    logg("*in Sigload_cb(%s, %s, %u, %p) - MinDef:%u, Off: %u, Cust: %u\n", type, name, custom, context, minimal_definitions, official_sigs, custom_sigs);

+    if(!strcmp(type, "fp"))

+	return 0;

+    if(minimal_definitions && !custom)

 	return 1;

     if(custom)

 	custom_sigs++;

-    else if(strcmp(type, "fp"))

+    else

 	official_sigs++;

     return 0;

 }

@@ -392,11 +395,12 @@ static int load_db(void) {

 int CLAMAPI Scan_HaveSigs(unsigned int *official, unsigned int *custom) {

     int ret;

     if(lock_engine())

-	FAIL(-1, "failed to lock engine");

+	FAIL(CL_ELOCK, "failed to lock engine");

     if(!engine) {

 	unlock_engine();

-	FAIL(-1, "No engine available");

+	FAIL(CL_ESTATE, "Engine unavailable");

     }

+    logg("*in HaveSigs - Off: %u, Cst: %u\n", official_sigs, custom_sigs); 

     ret = ((official_sigs + custom_sigs) > 0);

     if(official) *official = official_sigs;

     if(custom) *custom = custom_sigs;