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

+Wed Dec  1 21:05:07 CET 2004 (tk)

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

+  * libclamav/scanners.c: improved recursion limits (thanks to Maxim Dounin)

+

 Wed Dec  1 13:14:33 GMT 2004 (njh)

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

   * libclamav/mbox.c:	Decode text/plain parts marked as being encoded,

@@ -1305,6 +1305,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	} else if(nret >= CL_TYPENO) {

 	    lseek(desc, 0, SEEK_SET);

+	    nret == CL_TYPE_MAIL ? (*mrec)++ : (*arec)++;

 	    switch(nret) {

 		case CL_TYPE_HTML:

 		    if(SCAN_HTML)

@@ -1318,6 +1319,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 			    return CL_VIRUS;

 		    break;

 	    }

+	    nret == CL_TYPE_MAIL ? (*mrec)-- : (*arec)--;

 	}

     }

@@ -1338,7 +1340,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

     (*arec)--;

     if(ret == CL_EFORMAT) {

-	cli_warnmsg("Descriptor[%d]: %s\n", desc, cl_strerror(CL_EFORMAT));

+	cli_dbgmsg("Descriptor[%d]: %s\n", desc, cl_strerror(CL_EFORMAT));

 	return CL_CLEAN;

     } else {

 	return ret;

@@ -45,17 +45,15 @@ const char *freshdbdir(void)

     dbdir = cl_retdbdir();

     if((copt = parsecfg(CONFDIR"/clamd.conf", 0))) {

 	if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory"))) {

-	    if(strcmp(cl_retdbdir(), cpt->strarg)) {

-		    char *daily = (char *) mmalloc(strlen(cpt->strarg) + strlen(cl_retdbdir()) + 15);

+	    if(strcmp(dbdir, cpt->strarg)) {

+		    char *daily = (char *) mmalloc(strlen(cpt->strarg) + strlen(dbdir) + 15);

 		sprintf(daily, "%s/daily.cvd", cpt->strarg);

 		if((d1 = cl_cvdhead(daily))) {

-		    sprintf(daily, "%s/daily.cvd", cl_retdbdir());

+		    sprintf(daily, "%s/daily.cvd", dbdir);

 		    if((d2 = cl_cvdhead(daily))) {

 			free(daily);

 			if(d1->version > d2->version)

 			    dbdir = cpt->strarg;

-			else

-			    dbdir = cl_retdbdir();

 			cl_cvdfree(d2);

 		    } else {

 			free(daily);

@@ -64,7 +62,6 @@ const char *freshdbdir(void)

 		    cl_cvdfree(d1);

 		} else {

 		    free(daily);

-		    dbdir = cl_retdbdir();

 		}

 	    }

 	}