@@ -2,6 +2,11 @@ Fri May 28 13:24:21 CEST 2010 (tk)

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

  * freshclam/manager.c: randomize getaddrinfo()'s results (bb#2021)

+Tue May 25 14:36:41 CEST 2010 (tk)

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

+ * clamscan: add support for loading multiple dbs at command line with

+	     -d (bb#2033)

+

 Wed May 19 12:21:02 CEST 2010 (acab)

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

  * libclamav/7z/Archive/7z/7zIn.c: fix possible(?) null dereference reported

@@ -414,12 +414,14 @@ int scanmanager(const struct optstruct *opts)

     }

     if((opt = optget(opts, "database"))->active) {

-	if((ret = cl_load(opt->strarg, engine, &info.sigs, dboptions))) {

-	    logg("!%s\n", cl_strerror(ret));

-	    cl_engine_free(engine);

-	    return 2;

+	while(opt) {

+	    if((ret = cl_load(opt->strarg, engine, &info.sigs, dboptions))) {

+		logg("!%s\n", cl_strerror(ret));

+		cl_engine_free(engine);

+		return 2;

+	    }

+	    opt = opt->nextarg;

 	}

-

     } else {

 	    char *dbdir = freshdbdir();

@@ -80,7 +80,7 @@ const struct clam_option __clam_options[] = {

     { NULL, "multiscan", 'm', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

     { NULL, "fdpass", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

     { NULL, "stream", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMDSCAN, "", "" },

-    { NULL, "database", 'd', TYPE_STRING, NULL, -1, DATADIR, FLAG_REQUIRED, OPT_CLAMSCAN, "", "" }, /* merge it with DatabaseDirectory (and fix conflict with --datadir */

+    { NULL, "database", 'd', TYPE_STRING, NULL, -1, DATADIR, FLAG_REQUIRED | FLAG_MULTIPLE, OPT_CLAMSCAN, "", "" }, /* merge it with DatabaseDirectory (and fix conflict with --datadir */

     { NULL, "recursive", 'r', TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "", "" },

     { NULL, "bell", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN, "", "" },

     { NULL, "no-summary", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMSCAN | OPT_CLAMDSCAN, "", "" },