@@ -1,3 +1,7 @@

+Wed Aug 11 12:32:37 CEST 2010 (acab)

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

+ * libclamav: fix callback_sigload

+

 Tue Aug 10 14:01:27 CEST 2010 (tk)

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

  * clamdscan: fix parsing of virus names in extended mode and --stream (bb#2184)

@@ -830,7 +830,7 @@ static int cli_loadwdb(FILE *fs, struct cl_engine *engine, unsigned int options,

 	}

     }

-    if((ret = load_regex_matcher(engine->whitelist_matcher, fs, NULL, options, 1, dbio, engine->dconf->other&OTHER_CONF_PREFILTERING))) {

+    if((ret = load_regex_matcher(engine, engine->whitelist_matcher, fs, NULL, options, 1, dbio, engine->dconf->other&OTHER_CONF_PREFILTERING))) {

 	return ret;

     }

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

 	}

     }

-    if((ret = load_regex_matcher(engine->domainlist_matcher, fs, signo, options, 0, dbio, engine->dconf->other&OTHER_CONF_PREFILTERING))) {

+    if((ret = load_regex_matcher(engine, engine->domainlist_matcher, fs, signo, options, 0, dbio, engine->dconf->other&OTHER_CONF_PREFILTERING))) {

 	return ret;

     }

@@ -385,7 +385,7 @@ static int add_hash(struct regex_matcher *matcher, char* pattern, const char fl,

 /* Load patterns/regexes from file */

-int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int *signo,unsigned int options,int is_whitelist,struct cli_dbio *dbio, uint8_t dconf_prefiltering)

+int load_regex_matcher(struct cl_engine *engine,struct regex_matcher* matcher,FILE* fd,unsigned int *signo,unsigned int options,int is_whitelist,struct cli_dbio *dbio, uint8_t dconf_prefiltering)

 {

 	int rc,line=0,entry=0;

 	char buffer[FILEBUFF];

@@ -441,6 +441,11 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int *sign

 		if(functionality_level_check(buffer))

 			continue;

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

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

+			continue;

+		}

+

 		entry++;

 		pattern = strchr(buffer,':');

 		if(!pattern) {

@@ -62,7 +62,7 @@ int cli_build_regex_list(struct regex_matcher* matcher);

 int regex_list_add_pattern(struct regex_matcher *matcher, char *pattern);

 int regex_list_match(struct regex_matcher* matcher, char* real_url,const char* display_url,const struct pre_fixup_info* pre_fixup, int hostOnly,const char **info, int is_whitelist);

 int init_regex_list(struct regex_matcher* matcher, uint8_t dconf_prefiltering);

-int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int *signo,unsigned int options,int is_whitelist,struct cli_dbio *dbio,uint8_t dconf_prefiltering);

+int load_regex_matcher(struct cl_engine *engine,struct regex_matcher* matcher,FILE* fd,unsigned int *signo,unsigned int options,int is_whitelist,struct cli_dbio *dbio,uint8_t dconf_prefiltering);

 void regex_list_cleanup(struct regex_matcher* matcher);

 void regex_list_done(struct regex_matcher* matcher);

 int is_regex_ok(struct regex_matcher* matcher);