[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 7085f42fb02cc4290c281ed94b1bbd041d5b0b21
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:34 2008 +0100

    Revert "clamav-milter: retrieve db version from daily.cld (bb#942)"
    
    This reverts commit 1e306dca2d251637d68e4334ac452d49cd697778.

diff --git a/ChangeLog b/ChangeLog
index 493e4fe..52f1426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-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
diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
index d7f4bce..b12c691 100644
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@ -5776,10 +5776,10 @@ loadDatabase(void)
 			dbdir = cl_retdbdir();
 	}
 
-	daily = cli_malloc(strlen(dbdir) + 11);
+	daily = cli_malloc(strlen(dbdir) + 22);
 	sprintf(daily, "%s/daily.cvd", dbdir);
 	if(access(daily, R_OK) < 0)
-		sprintf(daily, "%s/daily.cld", dbdir);
+		sprintf(daily, "%s/daily.inc/daily.info", dbdir);
 
 	cli_dbgmsg("loadDatabase: check %s for updates\n", daily);
 
@@ -5800,6 +5800,7 @@ 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);

-- 
Debian repository for ClamAV