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

+Wed Feb 11 11:08:55 CET 2009 (tk)

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

+ * libclamav/cvd.c: fix warning when cvd timestamp is in the future (bb#1381)

+

 Wed Feb 11 09:38:19 CET 2009 (tk)

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

  * libclamav/filetypes_int.h: sync with daily.ftm

@@ -519,7 +519,14 @@ int cli_cvdload(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigne

     if(cvd.stime && daily) {

 	time(&s_time);

-	if((int) s_time - cvd.stime > 604800) {

+	if(cvd.stime > s_time) {

+	    if(cvd.stime - (unsigned int ) s_time > 3600) {

+		cli_warnmsg("******************************************************\n");

+		cli_warnmsg("***      Virus database timestamp in the future!   ***\n");

+		cli_warnmsg("***  Please check the timezone and clock settings  ***\n");

+		cli_warnmsg("******************************************************\n");

+	    }

+	} else if((unsigned int) s_time - cvd.stime > 604800) {

 	    cli_warnmsg("**************************************************\n");

 	    cli_warnmsg("***  The virus database is older than 7 days!  ***\n");

 	    cli_warnmsg("***   Please update it as soon as possible.    ***\n");