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

+Tue Mar 20 18:42:00 CET 2007 (tk)

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

+  * freshclam: release dbdir write-lock before notifying clamd (bb#401)

+

 Tue Mar 20 16:21:39 CET 2007 (tk)

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

   * freshclam/manager.c: fix error handling in --no-dns mode (bb#418)

@@ -55,8 +55,6 @@

 #include "shared/output.h"

 #include "shared/misc.h"

-#include "libclamav/lockdb.h"

-

 #include "execute.h"

 #include "manager.h"

 #include "mirman.h"

@@ -163,17 +161,8 @@ static int download(const struct cfgstruct *copt, const struct optstruct *opt, c

 	logg("^You must specify at least one database mirror.\n");

 	return 56;

     } else {

-	while(cli_writelockdb(datadir, 0) == CL_ELOCKDB) {

-            logg("*Waiting to lock database directory: %s\n", datadir);

-	    sleep(5);

-	    if(++try > 12) {

-		logg("!Can't lock database directory: %s\n", datadir);

-		return 61; 

-	    }

-	}

-	try = 0;

 	while(cpt) {

-	    ret = downloadmanager(copt, opt, cpt->strarg);

+	    ret = downloadmanager(copt, opt, cpt->strarg, datadir);

 	    alarm(0);

 	    if(ret == 52 || ret == 54 || ret == 58 || ret == 59) {

@@ -192,11 +181,9 @@ static int download(const struct cfgstruct *copt, const struct optstruct *opt, c

 		}

 	    } else {

-		cli_unlockdb(datadir);

 		return ret;

 	    }

 	}

-	cli_unlockdb(datadir);

     }

     return ret;

@@ -68,6 +68,7 @@

 #include "libclamav/others.h"

 #include "libclamav/str.h"

 #include "libclamav/cvd.h"

+#include "libclamav/lockdb.h"

 #ifndef	O_BINARY

 #define	O_BINARY	0

@@ -1075,11 +1076,11 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

     return 0;

 }

-int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname)

+int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname, const char *dbdir)

 {

 	time_t currtime;

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

-	unsigned int ttl;

+	unsigned int ttl, try = 0;

 	char ipaddr[16], *dnsreply = NULL, *pt, *localip = NULL, *newver = NULL;

 	const char *arg = NULL;

 	struct cfgstruct *cpt;

@@ -1167,6 +1168,19 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	localip = cpt->strarg;

     }

+    while(cli_writelockdb(dbdir, 0) == CL_ELOCKDB) {

+	logg("*Waiting to lock database directory: %s\n", dbdir);

+	sleep(5);

+	if(++try > 12) {

+	    logg("!Can't lock database directory: %s\n", dbdir);

+	    if(dnsreply)

+		free(dnsreply);

+	    if(newver)

+		free(newver);

+	    return 61; 

+	}

+    }

+

     if(cfgopt(copt, "HTTPProxyServer")->enabled)

 	mirman_read("mirrors.dat", &mdat, 0);

     else

@@ -1182,6 +1196,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	    free(newver);

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

+	cli_unlockdb(dbdir);

 	return ret;

     } else if(ret == 0)

@@ -1196,6 +1211,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	    free(newver);

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

+	cli_unlockdb(dbdir);

 	return ret;

     } else if(ret == 0)

@@ -1205,6 +1221,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	free(dnsreply);

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

+    cli_unlockdb(dbdir);

     if(updated) {

 	if(cfgopt(copt, "HTTPProxyServer")->enabled) {

@@ -1255,7 +1272,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 		    free(cmd);

 		    if(newver)

 			free(newver);

-		    return 0;

+		    return 75;

 		}

 		*pt = 0; pt += 2;

@@ -23,6 +23,6 @@

 #include "shared/cfgparser.h"

 #include "shared/options.h"

-int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname);

+int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname, const char *dbdir);

 #endif