@@ -1,3 +1,8 @@

+Mon Aug  2 16:08:04 CEST 2010 (tk)

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

+ * freshclam/manager.c: don't call cli_bytecode_prepare() when Bytecode is

+			disabled in freshclam.conf (bb#2149)

+

 Mon Aug  2 15:37:19 CEST 2010 (tk)

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

  * libclamav/matcher: make icon sigs work with bytecode (bb#2137)

@@ -1768,7 +1768,7 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	    cl_engine_free(engine);

 	    return 55;

 	}

-	if((ret = cli_bytecode_prepare(engine, &engine->bcs, engine->dconf->bytecode/*FIXME: dconf has no sense here*/))) {

+	if(optget(opts, "Bytecode")->enabled && (ret = cli_bytecode_prepare(engine, &engine->bcs, engine->dconf->bytecode/*FIXME: dconf has no sense here*/))) {

 	    logg("!Failed to compile/load bytecode: %s\n", cl_strerror(ret));

 	    unlink(newfile);

 	    free(newfile);