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

+Tue Sep 14 22:32:50 CEST 2004 (tk)

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

+  * libclamav: do not print outdate warning for main.cvd

+

 Tue Sep 14 13:10:38 BST 2004 (njh)

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

   * libclamav/mbox.c:	FOLLOWURL: include the text of the old HTML 

@@ -328,7 +328,7 @@ int cl_cvdverify(const char *file)

     return ret;

 }

-int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo)

+int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo, short warn)

 {

         char *dir, *tmp, *buffer;

 	struct cl_cvd cvd;

@@ -345,7 +345,7 @@ int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo)

     if((ret = cli_cvdverify(fd, &cvd)))

 	return ret;

-    if(cvd.stime) {

+    if(cvd.stime && warn) {

 	time(&stime);

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

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

@@ -22,7 +22,7 @@

 #include <stdio.h>

 #include "clamav.h"

-int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo);

+int cli_cvdload(FILE *fd, struct cl_node **root, unsigned int *signo, short warn);

 int cli_untgz(int fd, const char *destdir);

 #endif

@@ -658,7 +658,12 @@ int cl_loaddb(const char *filename, struct cl_node **root, unsigned int *signo)

 	ret = cli_loaddb(fd, root, signo);

     } else if(cli_strbcasestr(filename, ".cvd")) {

-	ret = cli_cvdload(fd, root, signo);

+	    int warn = 0;

+

+	if(!strcmp(filename, "daily.cvd"))

+	    warn = 1;

+

+	ret = cli_cvdload(fd, root, signo, warn);

     } else if(cli_strbcasestr(filename, ".hdb")) {

 	ret = cli_loadhdb(fd, root, signo);