@@ -1,3 +1,15 @@

+Sat Jan  3 11:30:38 CET 2004 (tk)

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

+  * libclamav: fixed handling of multipart signatures (broken since Dec 2).

+	       The bug was introduced by _me_ and not by the Thomas Lamy's

+	       <rbellora*tecnoaccion.com.ar>, Jean-Christophe Heger

+	       <jcheger*acytec.com> and Tomasz Papszun <tomek*clamav.net>.

+	       Many thanks !

+

+  * freshclam: finish with a proper return code (always returned with 0).

+	       Fixed by Martin Kraft <martin.kraft*fal.de>.

+

 Wed Dec 31 14:47:13 GMT 2003 (njh)

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

   * clamav-milter: Included the sendmail queue ID in the log, from an

@@ -27,7 +27,7 @@

 #include "others.h"

 #include "shared.h"

-void freshclam(struct optstruct *opt);

+int freshclam(struct optstruct *opt);

 int main(int argc, char **argv)

 {

@@ -106,11 +106,11 @@ int main(int argc, char **argv)

     }

-    freshclam(opt);

+    ret = freshclam(opt);

     free_opt(opt);

-    return(0);

+    return ret;

 }

 void register_char_option(struct optstruct *opt, char ch)

@@ -149,8 +149,8 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 	    if(parts) /* there's always one part more */

 		parts++;

-	    for(i = 0; i < parts; i++) {

-		if((pt2 = cli_strtok(pt, i, "*")) == NULL) {

+	    for(i = 1; i <= parts; i++) {

+		if((pt2 = cli_strtok(pt, i - 1, "*")) == NULL) {

 		    cli_errmsg("Can't extract part %d of partial signature in line %d\n", i + 1, line);

 		    return CL_EMALFDB;

 		}

@@ -161,7 +161,7 @@ int cl_loaddb(const char *filename, struct cl_node **root, int *virnum)

 		    free(buffer);

 		    return ret;

 		}

-		//cli_dbgmsg("Added part %d of partial signature (id %d)\n", i, sigid);

+//		cli_dbgmsg("Added part %d of partial signature (id %d)\n", i, sigid);

 		free(pt2);

 	    }