rename some phishing options

git-svn: trunk@2592

clamav-devel/ChangeLog

@@ -1,3 +1,8 @@
+Sat Jan  6 17:45:49 CET 2007 (tk)
+---------------------------------
+  * clamd: s/DetectPhishing/PhishingSignatures
+  * clamscan: s/--no-phishing/--no-phishing-sigs
+
 Sat Jan  6 17:22:30 CET 2007 (tk)
 ---------------------------------
   * libclamav: fix stack corruption on win32 (bb#201), patch from NJH

clamav-devel/README

@@ -82,7 +82,7 @@ Detailed list of changes (to be finished):
       configured individually)
   + TCP and local sockets can be operated simultaneously
   + New command: MULTISCAN (scan directory with multiple threads)
-  + New option DetectPhishing
+  + New option PhishingSignatures
   + New option AlgorithmicDetection
   + New option NodalCore
   + New option PhishingStrictURLCheck
@@ -98,7 +98,7 @@ Detailed list of changes (to be finished):
   + Improved load balancing for scanning with clusters
 
 -) clamscan:
-  + New options: --no-phishing, --no-algorithmic (disable phishing and
+  + New options: --no-phishing-sigs, --no-algorithmic (disable phishing and
     algorithmic detection respectively)
   + New option: --ncore
   + New option: --no-elf

clamav-devel/clamd/clamd.c

@@ -308,7 +308,7 @@ int main(int argc, char **argv)
     dbdir = cfgopt(copt, "DatabaseDirectory")->strarg;
     logg("#Reading databases from %s\n", dbdir);
 
-    if(cfgopt(copt, "DetectPhishing")->enabled)
+    if(cfgopt(copt, "PhishingSignatures")->enabled)
 	dboptions |= CL_DB_PHISHING;
     else
 	logg("Not loading phishing signatures.\n");

clamav-devel/clamscan/clamscan.c

@@ -260,7 +260,7 @@ void help(void)
 #endif
     mprintf("\n");
     mprintf("    --no-mail                            Disable mail file support\n");
-    mprintf("    --no-phishing                        Disable signature-based phishing detection\n");
+    mprintf("    --no-phishing-sigs                   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");

clamav-devel/clamscan/clamscan_opt.h

@@ -78,7 +78,7 @@ static struct option clamscan_longopt[] = {
     {"mbox", 0, 0, 'm'},	    /* not used */
     {"no-mail", 0, 0, 0},
     {"mail-follow-urls", 0, 0, 0},
-    {"no-phishing", 0, 0, 0},
+    {"no-phishing-sigs", 0, 0, 0},
 #ifdef CL_EXPERIMENTAL
     {"no-phishing-scan-urls",0,0,0},
     {"phishing-strict-url-check",0,0,0},

clamav-devel/clamscan/manager.c

@@ -89,7 +89,7 @@ int scanmanager(const struct optstruct *opt)
     if(opt_check(opt, "ncore"))
 	dboptions |= CL_DB_NCORE;
 
-    if(!opt_check(opt, "no-phishing"))
+    if(!opt_check(opt, "no-phishing-sigs"))
 	dboptions |= CL_DB_PHISHING;
 
 #ifdef CL_EXPERIMENTAL

clamav-devel/docs/man/clamd.conf.5.in

@@ -234,8 +234,8 @@ Recursion level limit for the mail scanner.
 .br
 Default: 64
 .TP 
-\fBDetectPhishing\fR
-With this option enabled ClamAV will try to detect phishing attempts.
+\fBPhishingSignatures\fR
+With this option enabled ClamAV will try to detect phishing attempts by using signatures.
 .br 
 Default: enabled
 .TP 

clamav-devel/etc/clamd.conf

@@ -217,9 +217,10 @@ LocalSocket /tmp/clamd
 # Default: 64
 #MailMaxRecursion 128
 
-# With this option enabled ClamAV will try to detect phishing attempts (using signatures).
+# With this option enabled ClamAV will try to detect phishing attempts by using
+# signatures.
 # Default: yes
-#DetectPhishing yes
+#PhishingSignatures yes
 
 # Use phishing detection for all domains (not just those listed in the .pdb database).
 # It is not recommended to turn this option on, it is mean for internal use.

clamav-devel/shared/cfgparser.c

@@ -49,7 +49,7 @@ struct cfgoption cfg_options[] = {
     {"ScanMail", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
     {"MailFollowURLs", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},
     {"MailMaxRecursion", OPT_NUM, 64, NULL, 0, OPT_CLAMD},
-    {"DetectPhishing", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
+    {"PhishingSignatures", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
 #ifdef CL_EXPERIMENTAL
     {"PhishingScanURLs",OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
     {"PhishingStrictURLCheck", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},