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

+Thu May 10 15:45:56 CEST 2012 (tk)

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

+ * freshclam: give custom dbs higher priority during update

+

 Tue May  8 15:31:51 CEST 2012 (acab)

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

  * libclamav: detect read races and abort the scan with an error

@@ -2194,6 +2194,15 @@ int downloadmanager(const struct optstruct *opts, const char *hostname, unsigned

     memset(ipaddr, 0, sizeof(ipaddr));

+    /* custom dbs */

+    if((opt = optget(opts, "DatabaseCustomURL"))->enabled) {

+	while(opt) {

+	    if(updatecustomdb(opt->strarg, &signo, opts, localip, logerr) == 0)

+		updated = 1;

+	    opt = opt->nextarg;

+	}

+    }

+

     if((opt = optget(opts, "update-db"))->enabled) {

 	    const char *u_dnsreply;

 	    int u_extra;

@@ -2324,15 +2333,6 @@ int downloadmanager(const struct optstruct *opts, const char *hostname, unsigned

     mirman_write("mirrors.dat", dbdir, &mdat);

     mirman_free(&mdat);

-    /* custom dbs */

-    if((opt = optget(opts, "DatabaseCustomURL"))->enabled) {

-	while(opt) {

-	    if(updatecustomdb(opt->strarg, &signo, opts, localip, logerr) == 0)

-		updated = 1;

-	    opt = opt->nextarg;

-	}

-    }

-

     cli_rmdirs(updtmpdir);

     if(checkdbdir() < 0) {