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

+Thu Sep 14 19:36:25 CEST 2006 (acab)

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

+  * clamscan: added phishing module command line options

+

 Thu Sep 14 19:07:21 CEST 2006 (acab)

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

   * libclamav/mbox.c: Fixing a fragment of code left behind during the merge

@@ -252,6 +252,10 @@ void help(void)

     mprintf("\n");

     mprintf("    --no-mail                            Disable mail file support\n");

     mprintf("    --no-phishing                        Disable phishing detection\n");

+#ifdef CL_EXPERIMENTAL

+    mprintf("    --no-phishing-scan-urls              Disable url-based phishing detection\n");

+    mprintf("    --phish-scan-alldomains              Enable phishing detection for all domains (might lead to false positives!)\n");

+#endif

     mprintf("    --no-algorithmic                     Disable algorithmic detection\n");

     mprintf("    --no-pe                              Disable PE analysis\n");

     mprintf("    --no-ole2                            Disable OLE2 support\n");

@@ -76,6 +76,10 @@ static struct option clamscan_longopt[] = {

     {"no-mail", 0, 0, 0},

     {"mail-follow-urls", 0, 0, 0},

     {"no-phishing", 0, 0, 0},

+#ifdef CL_EXPERIMENTAL

+    {"no-phishing-scan-urls",0,0,0},

+    {"phish-scan-alldomains",0,0,0},

+#endif

     {"no-algorithmic", 0, 0, 0},

     {"unzip", 2, 0, 0},

     {"unrar", 2, 0, 0},

@@ -92,6 +92,13 @@ int scanmanager(const struct optstruct *opt)

     if(opt_check(opt, "no-phishing"))

 	dboptions |= CL_DB_NOPHISHING;

+#ifdef CL_EXPERIMENTAL

+    if(opt_check(opt,"no-phishing-scan-urls"))

+	options |= CL_SCAN_NOPHISHING;

+    if(opt_check(opt,"phish-scan-alldomains"))

+	options |= CL_PHISH_NO_DOMAINLIST;

+#endif

+

     if(opt_check(opt, "dev-ac-only")) {

 	dboptions |= CL_DB_ACONLY;

@@ -48,6 +48,10 @@ struct cfgoption cfg_options[] = {

     {"ScanMail", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},

     {"MailFollowURLs", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},

     {"DetectPhishing", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},

+#ifdef CL_EXPERIMENTAL

+    {"PhishingScanURLs",OPT_BOOL, 1, NULL, 0, OPT_CLAMD},

+    {"PhishingScanAllDomains", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},

+#endif

     {"AlgorithmicDetection", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},

     {"ScanHTML", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},

     {"ScanOLE2", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},