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

+Wed Dec 22 12:10:06 CET 2010 (tk)

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

+ * freshclam: fix again handling of relative db paths (bb#2240)

+

 Tue Dec 21 16:00:26 CET 2010 (acab)

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

  * clamav-milter: add LogClean option (bb#2442)

@@ -63,7 +63,7 @@ static short terminate = 0;

 extern int active_children;

 static short foreground = 1;

-char updtmpdir[512];

+char updtmpdir[512], dbdir[512];

 int sigchld_wait = 1;

 static void sighandler(int sig) {

@@ -164,7 +164,7 @@ static void help(void)

     mprintf("\n");

 }

-static int download(const struct optstruct *opts, const char *datadir, const char *cfgfile)

+static int download(const struct optstruct *opts, const char *cfgfile)

 {

 	int ret = 0, try = 0, maxattempts = 0;

 	const struct optstruct *opt;

@@ -178,7 +178,7 @@ static int download(const struct optstruct *opts, const char *datadir, const cha

 	return 56;

     } else {

 	while(opt) {

-	    ret = downloadmanager(opts, opt->strarg, datadir, try == maxattempts - 1);

+	    ret = downloadmanager(opts, opt->strarg, try == maxattempts - 1);

 #ifndef _WIN32

 	    alarm(0);

 #endif

@@ -224,7 +224,7 @@ int main(int argc, char **argv)

 {

 	int ret = 52, retcl;

 	const char *cfgfile, *arg = NULL, *pidfile = NULL;

-	char *pt, dbdir[512];

+	char *pt;

 	struct optstruct *opts;

 	const struct optstruct *opt;

 #ifndef	_WIN32

@@ -471,7 +471,7 @@ int main(int argc, char **argv)

 	logg("#freshclam daemon %s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")\n", get_version());

 	while(!terminate) {

-	    ret = download(opts, dbdir, cfgfile);

+	    ret = download(opts, cfgfile);

 	    if(ret <= 1) {

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

@@ -529,7 +529,7 @@ int main(int argc, char **argv)

 		logg(" *** Virus databases are not updated in this mode ***\n");

 	    ret = submitstats(opt->strarg, opts);

 	} else {

-	    ret = download(opts, dbdir, cfgfile);

+	    ret = download(opts, cfgfile);

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

 		submitstats(opt->strarg, opts);

@@ -83,7 +83,7 @@

 #include "libclamav/cvd.h"

 #include "libclamav/regex_list.h"

-extern char updtmpdir[512];

+extern char updtmpdir[512], dbdir[512];

 #define CHDIR_ERR(x)				\

 	if(chdir(x) == -1)			\

@@ -1132,7 +1132,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     if(mdat) {

 	mirman_update_sf(mdat->currip, mdat->af, mdat, 0, 1);

-	mirman_write("mirrors.dat", optget(opts, "DatabaseDirectory")->strarg, mdat);

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

     }

     ret = getfile_mirman(srcfile, destfile, hostname, ip, localip, proxy, port, user, pass, uas, ctimeout, rtimeout, mdat, logerr, can_whitelist, ims, ipaddr, sd);

@@ -1140,7 +1140,7 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     if(mdat) {

 	mirman_update_sf(mdat->currip, mdat->af, mdat, 0, -1);

-	mirman_write("mirrors.dat", optget(opts, "DatabaseDirectory")->strarg, mdat);

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

     }

     return ret;

@@ -2047,7 +2047,7 @@ static int updatecustomdb(const char *url, int *signo, const struct optstruct *o

     return 0;

 }

-int downloadmanager(const struct optstruct *opts, const char *hostname, const char *dbdir, int logerr)

+int downloadmanager(const struct optstruct *opts, const char *hostname, int logerr)

 {

 	time_t currtime;

 	int ret, updated = 0, outdated = 0, signo = 0;

@@ -25,7 +25,7 @@

 #include "shared/optparser.h"

-int downloadmanager(const struct optstruct *opts, const char *hostname, const char *dbdir, int logerr);

+int downloadmanager(const struct optstruct *opts, const char *hostname, int logerr);

 int submitstats(const char *clamdcfg, const struct optstruct *opts);