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

+Fri Nov 24 02:01:48 CET 2006 (tk)

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

+  * libclamav: don't call phishing_init() if not needed (bb#147),

+	       patch from Edvin, mbox related part of the patch passed to NJH

+

 Fri Nov 24 01:15:28 CET 2006 (tk)

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

   * libclamav/matcher.c: minor code cleanup (bb#148), thanks to Christophe

@@ -301,7 +301,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

 #ifdef CL_EXPERIMENTAL

     if(!cfgopt(copt,"PhishingScanURLs")->enabled)

-	options |= CL_SCAN_NOPHISHING;

+	dboptions |= CL_DB_NOPHISHING_URLS;

     if(cfgopt(copt,"PhishingStrictURLCheck")->enabled)

 	options |= CL_PHISH_NO_DOMAINLIST;

 #endif

@@ -252,7 +252,7 @@ void help(void)

 #endif

     mprintf("\n");

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

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

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

 #ifdef CL_EXPERIMENTAL

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

     mprintf("    --phishing-strict-url-check          Enable phishing detection for all domains (might lead to false positives!)\n");

@@ -94,7 +94,7 @@ int scanmanager(const struct optstruct *opt)

 #ifdef CL_EXPERIMENTAL

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

-	options |= CL_SCAN_NOPHISHING;

+	dboptions |= CL_DB_NOPHISHING_URLS;

     if(opt_check(opt,"phishing-strict-url-check"))

 	options |= CL_PHISH_NO_DOMAINLIST;

 #endif

@@ -2,7 +2,7 @@

 from popen2 import popen4;

 import sys;

 import os;

-out = popen4("clamscan/clamscan -d database --phish-scan-alldomains --debug "+sys.argv[1])[0]

+out = popen4("clamscan/clamscan -d database --phishing-strict-url-check --debug "+sys.argv[1])[0]

 lines = out.read().split("\n")

 PHISH_FOUND="Phishing found"

 URL_CHECK="Checking url"

@@ -71,6 +71,7 @@ extern "C"

 #define CL_DB_NCORE	    0x1

 #define CL_DB_NOPHISHING    0x2

 #define CL_DB_ACONLY	    0x4 /* WARNING: only for developers */

+#define CL_DB_NOPHISHING_URLS 0x8

 /* recommended db settings */

 #define CL_DB_STDOPT	    0x0

@@ -87,7 +88,6 @@ extern "C"

 #define CL_SCAN_MAILURL		0x80

 #define CL_SCAN_BLOCKMAX	0x100

 #define CL_SCAN_ALGO		0x200

-#define CL_SCAN_NOPHISHING      0x400

 #define CL_PHISH_NO_DOMAINLIST  0x800

 #define CL_SCAN_ELF		0x1000

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

 static int cli_initengine(struct cl_engine **engine, unsigned int options)

 {

 #ifdef CL_EXPERIMENTAL

-	int rc;

+	int ret;

 #endif

@@ -502,8 +502,9 @@ static int cli_initengine(struct cl_engine **engine, unsigned int options)

     }

 #ifdef CL_EXPERIMENTAL

-    if((rc = phishing_init(*engine)))

-	return rc;

+    if(!(options & CL_DB_NOPHISHING_URLS))

+	if((ret = phishing_init(*engine)))

+	    return ret;

 #endif

     return CL_SUCCESS;

@@ -1198,12 +1199,12 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in

 	    skipped = 1;

 #ifdef CL_EXPERIMENTAL

     } else if(cli_strbcasestr(filename, ".wdb")) {

-	if(!(options & CL_SCAN_NOPHISHING))

+	if(!(options & CL_DB_NOPHISHING_URLS))

 	    ret = cli_loadwdb(fd, engine, options);

 	else

 	    skipped = 1;

     } else if(cli_strbcasestr(filename, ".pdb")) {

-	if(!(options & CL_SCAN_NOPHISHING))

+	if(!(options & CL_DB_NOPHISHING_URLS))

 	    ret = cli_loadpdb(fd, engine, options);

 	else

 	    skipped = 1;