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

+Wed Sep 15 21:44:01 CEST 2004 (tk)

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

+  * freshclam: add support for version verification and additional protection

+	       against invalid DNS replies

+  * libclamav/others.c: add cl_retver()

+

 Wed Sep 15 19:09:56 BST 2004 (njh)

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

   * libclamav:	Handle e-mails where the attachment misleads the type of

@@ -158,6 +158,23 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 		logg("WARNING: Unknown database name (%s) passed.\n", remotename);

 	    }

+	    if(field && (pt = cli_strtok(dnsreply, 3, ":"))) {

+		    int rt;

+		    time_t ct;

+

+		rt = atoi(pt);

+		free(pt);

+		time(&ct);

+		if((int) ct - rt > 10800) {

+		    mprintf("WARNING: DNS record is older than 3 hours.\n");

+		    logg("WARNING: DNS record is older than 3 hours.\n");

+		    field = 0;

+		}

+

+	    } else {

+		field = 0;

+	    }

+

 	    if(field && (pt = cli_strtok(dnsreply, field, ":"))) {

 		if(!isnumb(pt)) {

 		    mprintf("WARNING: Broken database version in TXT record.\n");

@@ -168,8 +185,21 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 		}

 		free(pt);

 	    } else {

-		mprintf("WARNING: Broken DNS reply.\n");

-		logg("WARNING: Broken DNS reply.\n");

+		mprintf("WARNING: Invalid DNS reply.\n");

+		logg("WARNING: Invalid DNS reply.\n");

+	    }

+

+	    if((pt = cli_strtok(dnsreply, 0, ":"))) {

+		mprintf("*Software version from DNS: %s\n", pt);

+		if(!strstr(pt, "devel")) {

+		    if(strcmp(cl_retver(), pt)) {

+			mprintf("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");

+			mprintf("WARNING: Local version: %s, Recommended version: %s\n", cl_retver(), pt);

+			logg("WARNING: Your ClamAV installation is OUTDATED - please update immediately !\n");

+			logg("WARNING: Local version: %s, Recommended version: %s\n", cl_retver(), pt);

+		    }

+		}

+		free(pt);

 	    }

 	    free(dnsreply);

@@ -171,11 +171,14 @@ extern int cl_scandesc(int desc, const char **virname, unsigned long int *scanne

 extern int cl_scanfile(const char *filename, const char **virname, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options);

+/* software versions */

+extern int cl_retflevel(void);

+const char *cl_retver(void);

+

 /* database */

 extern int cl_loaddb(const char *filename, struct cl_node **root, unsigned int *signo);

 extern int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo);

 extern const char *cl_retdbdir(void);

-extern int cl_retflevel(void);

 /* CVD */

 extern struct cl_cvd *cl_cvdhead(const char *file);

@@ -100,6 +100,11 @@ int cl_retflevel(void)

     return CL_FLEVEL;

 }

+const char *cl_retver(void)

+{

+    return VERSION;

+}

+

 const char *cl_strerror(int clerror)

 {

     switch(clerror) {