@@ -1,3 +1,9 @@

+Sat Aug 19 22:37:28 BST 2006 (njh)

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

+  * clamav-milter:	Use HAVE_CTIME_R_2 for older daily.cvd files -

+				interim implementation of a patch suggestion by

+				Mark Pizzolato

+

 Fri Aug 18 15:40:30 BST 2006 (njh)

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

   * clamav-milter:	Handle load balancing better when one machine of the

@@ -23,9 +23,9 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.277 2006/08/18 14:40:18 njh Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.278 2006/08/19 21:35:11 njh Exp $";

-#define	CM_VERSION	"devel-180806"

+#define	CM_VERSION	"devel-190806"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -5236,9 +5236,16 @@ loadDatabase(void)

 	if(d) {

 		char *ptr;

 		time_t t = d->stime;

+#ifdef	HAVE_CTIME_R_2

+		char buf[26];

 		snprintf(clamav_version, VERSION_LENGTH,

+			"ClamAV %s/%d/%s", VERSION, d->version,

+			ctime_r(&t, buf));

+#else

+		snprintf(clamav_version, VERSION_LENGTH,

 			"ClamAV %s/%d/%s", VERSION, d->version, ctime(&t));

+#endif

 		/* Remove ctime's trailing \n */

 		if((ptr = strchr(clamav_version, '\n')) != NULL)