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

+Thu Nov 23 01:05:30 CET 2006 (tk)

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

+  * libclamav: store db options in cl_engine for further reference,

+	       requested by Edvin (see bb#147)

+

 Mon Nov 20 00:58:57 CET 2006 (tk)

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

   * libclamav: cache target file info in pattern matchers

@@ -162,6 +162,7 @@ struct cl_engine {

     unsigned int refcount; /* reference counter */

     unsigned short ncore;

     unsigned short sdb;

+    unsigned int dboptions;

     /* Roots table */

     struct cli_matcher **root;

@@ -477,7 +477,10 @@ int cli_parse_add(struct cli_matcher *root, const char *virname, const char *hex

 static int cli_initengine(struct cl_engine **engine, unsigned int options)

 {

-    int rc;

+#ifdef CL_EXPERIMENTAL

+	int rc;

+#endif

+

     if(!*engine) {

 	cli_dbgmsg("Initializing the engine structure\n");

@@ -1321,6 +1324,8 @@ int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, un

 	return ret;

     }

+    (*engine)->dboptions = options;

+

     switch(sb.st_mode & S_IFMT) {

 	case S_IFREG: 

 	    return cli_load(path, engine, signo, options);