@@ -1,3 +1,8 @@

+Mon Oct 16 01:12:36 CEST 2006 (tk)

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

+  * libclamav/readdb.c: use different field order for .mdb files

+			(requested by signature maintainers)

+

 Sun Oct 15 21:15:58 CEST 2006 (tk)

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

   * libclamav: allow loading multiple .pdb/.wdb files (Edwin)

@@ -812,6 +812,7 @@ static int cli_loadhdb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 {

 	char buffer[FILEBUFF], *pt;

 	int line = 0, ret = 0;

+	unsigned int md5f = 0, sizef = 1;

 	struct cli_md5_node *new, *mpt, *last;

@@ -820,6 +821,11 @@ static int cli_loadhdb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 	return ret;

     }

+    if(mode == 2) {

+	md5f = 1;

+	sizef = 0;

+    }

+

     while(fgets(buffer, FILEBUFF, fd)) {

 	line++;

 	cli_chomp(buffer);

@@ -833,7 +839,7 @@ static int cli_loadhdb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 	if(mode == 1) /* fp */

 	    new->fp = 1;

-	if(!(pt = cli_strtok(buffer, 0, ":"))) {

+	if(!(pt = cli_strtok(buffer, md5f, ":"))) {

 	    free(new);

 	    ret = CL_EMALFDB;

 	    break;

@@ -848,7 +854,7 @@ static int cli_loadhdb(FILE *fd, struct cl_engine **engine, unsigned int *signo,

 	}

 	free(pt);

-	if(!(pt = cli_strtok(buffer, 1, ":"))) {

+	if(!(pt = cli_strtok(buffer, sizef, ":"))) {

 	    free(new->md5);

 	    free(new);

 	    ret = CL_EMALFDB;