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

+Mon Mar  2 19:54:41 CET 2009 (tk)

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

+ * libclamav: introduce cl_engine_settings_* API calls for copying settings

+	      between engines

+ * clamd/server-th.c: respect original engine settings after db reload (bb#1380)

+

 Mon Mar  2 17:37:15 CET 2009 (acab)

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

  * build system: update to autoconf 2.63 (bb#1443)

@@ -171,9 +171,8 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

 	const char *dbdir;

 	int retval;

 	unsigned int sigs = 0;

-	char pua_cats[128];

+	struct cl_settings *settings = NULL;

-    pua_cats[0] = 0;

     *ret = 0;

     if(do_check) {

 	if(!dbstat.entries) {

@@ -192,9 +191,10 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

     /* release old structure */

     if(engine) {

-	if(dboptions & (CL_DB_PUA_INCLUDE | CL_DB_PUA_EXCLUDE))

-	    if(cl_engine_get(engine, CL_ENGINE_PUA_CATEGORIES, pua_cats))

-		logg("^Can't make a copy of pua_cats\n");

+	/* copy current settings */

+	settings = cl_engine_settings_copy(engine);

+	if(!settings)

+	    logg("^Can't make a copy of the current engine settings\n");

 	thrmgr_setactiveengine(NULL);

 	cl_engine_free(engine);

@@ -210,22 +210,26 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

     if((retval = cl_statinidir(dbdir, &dbstat))) {

 	logg("!cl_statinidir() failed: %s\n", cl_strerror(retval));

 	*ret = 1;

+	if(settings)

+	    cl_engine_settings_free(settings);

 	return NULL;

     }

     if(!(engine = cl_engine_new())) {

 	logg("!Can't initialize antivirus engine\n");

 	*ret = 1;

+	if(settings)

+	    cl_engine_settings_free(settings);

 	return NULL;

     }

-    if(strlen(pua_cats)) {

-	if((retval = cl_engine_set(engine, CL_ENGINE_PUA_CATEGORIES, pua_cats))) {

-	    logg("!cl_engine_set(CL_ENGINE_PUA_CATEGORIES): %s\n", cl_strerror(retval));

-	    cl_engine_free(engine);

-	    *ret = 1;

-	    return NULL;

+    if(settings) {

+	retval = cl_engine_settings_apply(engine, settings);

+	if(retval != CL_SUCCESS) {

+	    logg("^Can't apply previous engine settings: %s\n", cl_strerror(retval));

+	    logg("^Using default engine settings\n");

 	}

+	cl_engine_settings_free(settings);

     }

     if((retval = cl_load(dbdir, engine, &sigs, dboptions))) {

@@ -107,6 +107,7 @@ typedef enum {

 #define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF)

 struct cl_engine;

+struct cl_settings;

 #define CL_INIT_DEFAULT	0x0

 extern int cl_init(unsigned int options);

@@ -134,6 +135,12 @@ extern int cl_engine_set(struct cl_engine *engine, enum cl_engine_field field, c

 extern int cl_engine_get(const struct cl_engine *engine, enum cl_engine_field field, void *val);

+extern struct cl_settings *cl_engine_settings_copy(const struct cl_engine *engine);

+

+extern int cl_engine_settings_apply(struct cl_engine *engine, const struct cl_settings *settings);

+

+extern int cl_engine_settings_free(struct cl_settings *settings);

+

 extern int cl_engine_compile(struct cl_engine *engine);

 extern int cl_engine_addref(struct cl_engine *engine);

@@ -9,6 +9,9 @@ CLAMAV_PUBLIC {

     cl_engine_new;

     cl_engine_set;

     cl_engine_get;

+    cl_engine_settings_copy;

+    cl_engine_settings_apply;

+    cl_engine_settings_free;

     cl_engine_compile;

     cl_engine_addref;

     cl_engine_free;

@@ -377,6 +377,77 @@ int cl_engine_get(const struct cl_engine *engine, enum cl_engine_field field, vo

     return CL_SUCCESS;

 }

+struct cl_settings *cl_engine_settings_copy(const struct cl_engine *engine)

+{

+	struct cl_settings *settings;

+

+    settings = (struct cl_settings *) malloc(sizeof(struct cl_settings));

+    if(!settings)

+	return NULL;

+

+    settings->ac_only = engine->ac_only;

+    settings->ac_mindepth = engine->ac_mindepth;

+    settings->ac_maxdepth = engine->ac_maxdepth;

+    settings->tmpdir = engine->tmpdir ? strdup(engine->tmpdir) : NULL;

+    settings->keeptmp = engine->keeptmp;

+    settings->maxscansize = engine->maxscansize;

+    settings->maxfilesize = engine->maxfilesize;

+    settings->maxreclevel = engine->maxreclevel;

+    settings->maxfiles = engine->maxfiles;

+    settings->min_cc_count = engine->min_cc_count;

+    settings->min_ssn_count = engine->min_ssn_count;

+    settings->pua_cats = engine->pua_cats ? strdup(engine->pua_cats) : NULL;

+

+    return settings;

+}

+

+int cl_engine_settings_apply(struct cl_engine *engine, const struct cl_settings *settings)

+{

+    engine->ac_only = settings->ac_only;

+    engine->ac_mindepth = settings->ac_mindepth;

+    engine->ac_maxdepth = settings->ac_maxdepth;

+    engine->keeptmp = settings->keeptmp;

+    engine->maxscansize = settings->maxscansize;

+    engine->maxfilesize = settings->maxfilesize;

+    engine->maxreclevel = settings->maxreclevel;

+    engine->maxfiles = settings->maxfiles;

+    engine->min_cc_count = settings->min_cc_count;

+    engine->min_ssn_count = settings->min_ssn_count;

+

+    if(engine->tmpdir)

+	mpool_free(engine->mempool, engine->tmpdir);

+    if(settings->tmpdir) {

+	engine->tmpdir = cli_mpool_strdup(engine->mempool, settings->tmpdir);

+	if(!engine->tmpdir)

+	    return CL_EMEM;

+    } else {

+	engine->tmpdir = NULL;

+    }

+

+    if(engine->pua_cats)

+	mpool_free(engine->mempool, engine->pua_cats);

+    if(settings->pua_cats) {

+	engine->pua_cats = cli_mpool_strdup(engine->mempool, settings->pua_cats);

+	if(!engine->pua_cats)

+	    return CL_EMEM;

+    } else {

+	engine->pua_cats = NULL;

+    }

+

+    return CL_SUCCESS;

+}

+

+int cl_engine_settings_free(struct cl_settings *settings)

+{

+    if(!settings)

+	return CL_ENULLARG;

+

+    free(settings->tmpdir);

+    free(settings->pua_cats);

+    free(settings);

+    return CL_SUCCESS;

+}

+

 int cli_checklimits(const char *who, cli_ctx *ctx, unsigned long need1, unsigned long need2, unsigned long need3) {

     int ret = CL_SUCCESS;

     unsigned long needed;

@@ -172,6 +172,25 @@ struct cl_engine {

     mpool_t *mempool;

 };

+struct cl_settings {

+    /* don't store dboptions here; it needs to be provided to cl_load() and

+     * can be optionally obtained with cl_engine_get() or from the original

+     * settings stored by the application

+     */

+    uint32_t ac_only;

+    uint32_t ac_mindepth;

+    uint32_t ac_maxdepth;

+    char *tmpdir;

+    uint32_t keeptmp;

+    uint64_t maxscansize;

+    uint64_t maxfilesize;

+    uint32_t maxreclevel;

+    uint32_t maxfiles;

+    uint32_t min_cc_count;

+    uint32_t min_ssn_count;

+    char *pua_cats;

+};

+

 extern int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

 extern int (*cli_unrar_extract_next_prepare)(unrar_state_t *state, const char *dirname);

 extern int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);