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

+Wed Apr 30 12:35:29 CEST 2008 (tk)

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

+  * clamav-milter: retrieve db version from daily.cld (bb#942)

+

 Mon Apr 28 16:13:33 CEST 2008 (tk)

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

   * libclamav/scanners.c: don't return CL_EMAX* error codes to

@@ -5760,10 +5760,10 @@ loadDatabase(void)

 			dbdir = cl_retdbdir();

 	}

-	daily = cli_malloc(strlen(dbdir) + 22);

+	daily = cli_malloc(strlen(dbdir) + 11);

 	sprintf(daily, "%s/daily.cvd", dbdir);

 	if(access(daily, R_OK) < 0)

-		sprintf(daily, "%s/daily.inc/daily.info", dbdir);

+		sprintf(daily, "%s/daily.cld", dbdir);

 	cli_dbgmsg("loadDatabase: check %s for updates\n", daily);

@@ -5784,7 +5784,6 @@ loadDatabase(void)

 		cl_cvdfree(d);

 	} else

-		/* TODO: use dbdir/daily.inc/daily.info */

 		snprintf(clamav_version, VERSION_LENGTH,

 			"ClamAV version %s, clamav-milter version %s",

 			VERSION, CM_VERSION);