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

+Thu Dec  1 15:07:49 CET 2011 (tk)

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

+ * libclamav/readdb.c: allow comments in all db files (bb#3930)

+

 Fri Nov 18 15:23:50 CET 2011 (tk)

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

  * libclamav/scanners.c: use lsigs when scanning vba data (bb#3922)

@@ -538,6 +538,8 @@ static int cli_loaddb(FILE *fs, struct cl_engine *engine, unsigned int *signo, u

     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {

 	line++;

+	if(buffer[0] == '#')

+	    continue;

 	cli_chomp(buffer);

 	if(engine->ignored)

 	    strcpy(buffer_cpy, buffer);

@@ -884,6 +886,8 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo,

     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {

 	line++;

+	if(buffer[0] == '#')

+	    continue;

 	if(!phish)

 	    if(!strncmp(buffer, "HTML.Phishing", 13) || !strncmp(buffer, "Email.Phishing", 14))

@@ -1375,6 +1379,8 @@ static int cli_loadldb(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 	    return CL_EMEM;

     while(cli_dbgets(buffer, sizeof(buffer), fs, dbio)) {

 	line++;

+	if(buffer[0] == '#')

+	    continue;

 	sigs++;

 	cli_chomp(buffer);

@@ -1557,6 +1563,8 @@ static int cli_loadftm(FILE *fs, struct cl_engine *engine, unsigned int options,

 	} else {

 	    if(!cli_dbgets(buffer, FILEBUFF, fs, dbio))

 		break;

+	    if(buffer[0] == '#')

+		continue;

 	    cli_chomp(buffer);

 	}

 	line++;

@@ -1794,6 +1802,8 @@ static int cli_loadign(FILE *fs, struct cl_engine *engine, unsigned int options,

     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {

 	line++;

+	if(buffer[0] == '#')

+	    continue;

 	cli_chomp(buffer);

 	tokens_count = cli_strtokenize(buffer, ':', IGN_MAX_TOKENS + 1, tokens);

@@ -1883,6 +1893,8 @@ static int cli_loadhash(FILE *fs, struct cl_engine *engine, unsigned int *signo,

     while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {

 	line++;

+	if(buffer[0] == '#')

+	    continue;

 	cli_chomp(buffer);

 	if(engine->ignored)

 	    strcpy(buffer_cpy, buffer);