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

+Mon Aug  8 11:32:31 CEST 2011 (tk)

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

+ * freshclam: add new option --update-db

+

 Wed Aug  3 15:41:28 CEST 2011 (tk)

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

  * sigtool/sigtool.c: fix calculation of max signature length

@@ -73,6 +73,9 @@ Print mirror details from mirrors.dat (cache file for the mirror manager).

 .TP

 \fB\-\-submit\-stats[=/path/to/clamd.conf]\fR

 Upload detection statistics to the ClamAV Project (see freshclam.conf(5):SubmitDetectionStats for more details). No database update will be performed. This option only works in the interactive mode.

+.TP

+\fB\-\-update\-db=DBNAME\fR

+With this option you can limit updates to a subset of database files. The DBNAME should be "main", "daily", "bytecode", "safebrowsing" or one of the 3rd party database names. This option can be used multiple times.

 .SH "EXAMPLES"

 .LP 

 .TP 

@@ -160,6 +160,7 @@ static void help(void)

     mprintf("    --on-outdated-execute=COMMAND        execute COMMAND when software is outdated\n");

     mprintf("    --list-mirrors                       print mirrors from mirrors.dat\n");

     mprintf("    --submit-stats[=/path/clamd.conf]    only submit detection statistics\n");

+    mprintf("    --update-db=DBNAME                   only update database DBNAME\n");

     mprintf("\n");

 }

@@ -2173,112 +2173,133 @@ int downloadmanager(const struct optstruct *opts, const char *hostname, int loge

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

-    if((ret = updatedb("main", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

-	if(dnsreply)

-	    free(dnsreply);

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

+	    const char *u_dnsreply;

+	    int u_extra;

-	if(newver)

-	    free(newver);

-

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

-	mirman_free(&mdat);

-	cli_rmdirs(updtmpdir);

-	return ret;

-

-    } else if(ret == 0)

-	updated = 1;

-

-    /* if ipaddr[0] != 0 it will use it to connect to the web host */

-    if((ret = updatedb("daily", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

-	if(dnsreply)

-	    free(dnsreply);

-

-	if(newver)

-	    free(newver);

-

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

-	mirman_free(&mdat);

-	cli_rmdirs(updtmpdir);

-	return ret;

+	while(opt) {

+	    if(!strcmp(opt->strarg, "main") || !strcmp(opt->strarg, "daily") || !strcmp(opt->strarg, "safebrowsing") || !strcmp(opt->strarg, "bytecode")) {

+		u_dnsreply = dnsreply;

+		u_extra = 0;

+	    } else {

+		u_dnsreply = NULL;

+		u_extra = 1;

+	    }

+	    if((ret = updatedb(opt->strarg, hostname, ipaddr, &signo, opts, u_dnsreply, localip, outdated, &mdat, logerr, u_extra)) > 50) {

+		if(dnsreply)

+		    free(dnsreply);

+		if(newver)

+		    free(newver);

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

+		mirman_free(&mdat);

+		cli_rmdirs(updtmpdir);

+		return ret;

+	    } else if(ret == 0)

+		updated = 1;

-    } else if(ret == 0)

-	updated = 1;

+	    opt = opt->nextarg;

+	}

-    /* if ipaddr[0] != 0 it will use it to connect to the web host */

-    if(!optget(opts, "SafeBrowsing")->enabled) {

-	    const char *safedb = NULL;

+    } else {

+	if((ret = updatedb("main", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

+	    if(dnsreply)

+		free(dnsreply);

+	    if(newver)

+		free(newver);

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

+	    mirman_free(&mdat);

+	    cli_rmdirs(updtmpdir);

+	    return ret;

+	} else if(ret == 0)

+	    updated = 1;

-	if(!access("safebrowsing.cvd", R_OK))

-	    safedb = "safebrowsing.cvd";

-	else if(!access("safebrowsing.cld", R_OK))

-            safedb = "safebrowsing.cld";

+	/* if ipaddr[0] != 0 it will use it to connect to the web host */

+	if((ret = updatedb("daily", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

+	    if(dnsreply)

+		free(dnsreply);

+	    if(newver)

+		free(newver);

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

+	    mirman_free(&mdat);

+	    cli_rmdirs(updtmpdir);

+	    return ret;

+	} else if(ret == 0)

+	    updated = 1;

-	if(safedb) {

-	    if(unlink(safedb))

-		logg("^SafeBrowsing is disabled but can't remove old %s\n", safedb);

-	    else

-		logg("*%s removed\n", safedb);

-	}

-    } else if((ret = updatedb("safebrowsing", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

-	if(dnsreply)

-	    free(dnsreply);

+	if(!optget(opts, "SafeBrowsing")->enabled) {

+		const char *safedb = NULL;

-	if(newver)

-	    free(newver);

+	    if(!access("safebrowsing.cvd", R_OK))

+		safedb = "safebrowsing.cvd";

+	    else if(!access("safebrowsing.cld", R_OK))

+		safedb = "safebrowsing.cld";

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

-	mirman_free(&mdat);

-	cli_rmdirs(updtmpdir);

-	return ret;

-    } else if(ret == 0)

-	updated = 1;

+	    if(safedb) {

+		if(unlink(safedb))

+		    logg("^SafeBrowsing is disabled but can't remove old %s\n", safedb);

+		else

+		    logg("*%s removed\n", safedb);

+	    }

+	} else if((ret = updatedb("safebrowsing", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

+	    if(dnsreply)

+		free(dnsreply);

+	    if(newver)

+		free(newver);

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

+	    mirman_free(&mdat);

+	    cli_rmdirs(updtmpdir);

+	    return ret;

+	} else if(ret == 0)

+	    updated = 1;

-    if(!optget(opts, "Bytecode")->enabled) {

-	    const char *dbname = NULL;

+	if(!optget(opts, "Bytecode")->enabled) {

+		const char *dbname = NULL;

-	if(!access("bytecode.cvd", R_OK))

-	    dbname = "bytecode.cvd";

-	else if(!access("bytecode.cld", R_OK))

-            dbname = "bytecode.cld";

+	    if(!access("bytecode.cvd", R_OK))

+		dbname = "bytecode.cvd";

+	    else if(!access("bytecode.cld", R_OK))

+		dbname = "bytecode.cld";

-	if(dbname) {

-	    if(unlink(dbname))

-		logg("^Bytecode is disabled but can't remove old %s\n", dbname);

-	    else

-		logg("*%s removed\n", dbname);

+	    if(dbname) {

+		if(unlink(dbname))

+		    logg("^Bytecode is disabled but can't remove old %s\n", dbname);

+		else

+		    logg("*%s removed\n", dbname);

+	    }

+	} else if((ret = updatedb("bytecode", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

+	    if(dnsreply)

+		free(dnsreply);

+	    if(newver)

+		free(newver);

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

+	    mirman_free(&mdat);

+	    cli_rmdirs(updtmpdir);

+	    return ret;

+	} else if(ret == 0)

+	    updated = 1;

+

+	/* handle extra dbs */

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

+	    while(opt) {

+		if((ret = updatedb(opt->strarg, hostname, ipaddr, &signo, opts, NULL, localip, outdated, &mdat, logerr, 1)) > 50) {

+		    if(dnsreply)

+			free(dnsreply);

+		    if(newver)

+			free(newver);

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

+		    mirman_free(&mdat);

+		    cli_rmdirs(updtmpdir);

+		    return ret;

+		} else if(ret == 0)

+		    updated = 1;

+		opt = opt->nextarg;

+	    }

 	}

-    } else if((ret = updatedb("bytecode", hostname, ipaddr, &signo, opts, dnsreply, localip, outdated, &mdat, logerr, 0)) > 50) {

-	if(dnsreply)

-	    free(dnsreply);

-

-	if(newver)

-	    free(newver);

+    }

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

-	mirman_free(&mdat);

-	cli_rmdirs(updtmpdir);

-	return ret;

-    } else if(ret == 0)

-	updated = 1;

     if(dnsreply)

 	free(dnsreply);

-    /* handle extra dbs */

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

-	while(opt) {

-	    if((ret = updatedb(opt->strarg, hostname, ipaddr, &signo, opts, NULL, localip, outdated, &mdat, logerr, 1)) > 50) {

-		if(newver)

-		    free(newver);

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

-		mirman_free(&mdat);

-		cli_rmdirs(updtmpdir);

-		return ret;

-	    } else if(ret == 0)

-		updated = 1;

-	    opt = opt->nextarg;

-	}

-    }

-

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

     mirman_free(&mdat);

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

     { NULL, "no-dns", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "", "" },

     { NULL, "list-mirrors", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "", "" },

     { NULL, "submit-stats", 0, TYPE_STRING, NULL, 0, CONFDIR_CLAMD, 0, OPT_FRESHCLAM, "", "" }, /* Don't merge this one with SubmitDetectionStats */

+    { NULL, "update-db", 0, TYPE_STRING, NULL, -1, NULL, FLAG_MULTIPLE, OPT_FRESHCLAM, "", "" },

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

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

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