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

+Tue Jul 15 17:30:01 CEST 2008 (tk)

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

+  * libclamav, clamd: prune old lockdb code

+

 Tue Jul 15 18:25:53 EEST 2008 (edwin)

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

   * configure.in:

@@ -201,7 +201,7 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

 {

 	const char *dbdir;

 	int retval;

-	unsigned int sigs = 0, attempt = 1;

+	unsigned int sigs = 0;

     *ret = 0;

     if(do_check) {

@@ -246,10 +246,10 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

 	return NULL;

     }

-    while((retval = cl_load(dbdir, &engine, &sigs, dboptions)) == CL_ELOCKDB) {

-	logg("!reload db failed: %s (attempt %u/3)\n", cl_strerror(retval), attempt);

-	if(++attempt > 3)

-	    break;

+    if((retval = cl_load(dbdir, &engine, &sigs, dboptions))) {

+	logg("!reload db failed: %s\n", cl_strerror(retval));

+	*ret = 1;

+	return NULL;

     }

     if(retval) {

@@ -63,7 +63,6 @@ extern "C"

 #define CL_EIO		-123 /* general I/O error */

 #define CL_EFORMAT	-124 /* (internal) bad format or broken file */

 #define CL_ESUPPORT	-125 /* not supported data format */

-#define CL_ELOCKDB	-126 /* can't lock DB directory */

 #define CL_EARJ         -127 /* ARJ handler error */

 /* db options */

@@ -191,8 +191,6 @@ const char *cl_strerror(int clerror)

 	    return "Bad format or broken data";

 	case CL_ESUPPORT:

 	    return "Not supported data format";

-	case CL_ELOCKDB:

-	    return "Unable to lock database directory";

 	case CL_EARJ:

 	    return "ARJ module failure";

 	default: