...
|
...
|
@@ -867,9 +867,6 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo,
|
867
|
867
|
while(cli_dbgets(buffer, FILEBUFF, fs, dbio)) {
|
868
|
868
|
line++;
|
869
|
869
|
|
870
|
|
- if(!strncmp(buffer, "Exploit.JPEG.Comment", 20)) /* temporary */
|
871
|
|
- continue;
|
872
|
|
-
|
873
|
870
|
if(!phish)
|
874
|
871
|
if(!strncmp(buffer, "HTML.Phishing", 13) || !strncmp(buffer, "Email.Phishing", 14))
|
875
|
872
|
continue;
|
...
|
...
|
@@ -879,8 +876,7 @@ static int cli_loadndb(FILE *fs, struct cl_engine *engine, unsigned int *signo,
|
879
|
879
|
strcpy(buffer_cpy, buffer);
|
880
|
880
|
|
881
|
881
|
tokens_count = cli_strtokenize(buffer, ':', NDB_TOKENS + 1, tokens);
|
882
|
|
- /* FIXME: re-enable after fixing invalid sig @ main.ndb:53467 */
|
883
|
|
- if(tokens_count < 4 /*|| tokens_count > 6*/) {
|
|
882
|
+ if(tokens_count < 4 || tokens_count > 6) {
|
884
|
883
|
ret = CL_EMALFDB;
|
885
|
884
|
break;
|
886
|
885
|
}
|