@@ -25,11 +25,6 @@

 #define CLI_DEFAULT_AC_MAXDEPTH	    3

 #define CLI_DEFAULT_AC_TRACKLEN	    8

-#define CLI_DEFAULT_MOVETOAC_LEN    8 /* all static sigs shorter than

-				       * this value will automatically

-				       * go to AC instead of BM

-				       */

-

 #define CLI_DEFAULT_LSIG_BUFSIZE    32768

 #define CLI_DEFAULT_DBIO_BUFSIZE    CLI_DEFAULT_LSIG_BUFSIZE + 1

@@ -246,7 +246,7 @@ int cli_parse_add(struct cli_matcher *root, const char *virname, const char *hex

 	    free(pt);

 	}

-    } else if(root->ac_only || type || lsigid /* || (hexlen / 2 < CLI_DEFAULT_MOVETOAC_LEN) FIXME: unit tests */ || strpbrk(hexsig, "?(") || (root->bm_offmode && (!strcmp(offset, "*") || strchr(offset, ',')))) {

+    } else if(root->ac_only || type || lsigid || strpbrk(hexsig, "?(") || (root->bm_offmode && (!strcmp(offset, "*") || strchr(offset, ',')))) {

 	if((ret = cli_ac_addsig(root, virname, hexsig, 0, 0, 0, rtype, type, 0, 0, offset, lsigid, options))) {

 	    cli_errmsg("cli_parse_add(): Problem adding signature (3).\n");

 	    return ret;

@@ -322,7 +322,7 @@ static int cli_initroots(struct cl_engine *engine, unsigned int options)

 	    }

 	}

     }

-    /* engine->root[1]->bm_offmode = 1; */ /* BM offset mode for PE files */

+    engine->root[1]->bm_offmode = 1; /* BM offset mode for PE files */

     return CL_SUCCESS;

 }