rename options

git-svn: trunk@2380

clamav-devel/ChangeLog

@@ -1,3 +1,8 @@
+Sun Oct 15 01:56:34 CEST 2006 (tk)
+----------------------------------
+  * clamd: s/PhishingScanAllDomains/PhishingStrictURLCheck
+  * clamscan: s/--phish-scan-alldomains/--phishing-strict-url-check
+
 Sun Oct 15 01:49:55 CEST 2006 (tk)
 ----------------------------------
   * libclamav: anti-phish code cleanup (Edwin)

clamav-devel/clamscan/clamscan.c

@@ -254,7 +254,7 @@ void help(void)
     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");
+    mprintf("    --phishing-strict-url-check          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");

clamav-devel/clamscan/clamscan_opt.h

@@ -78,7 +78,7 @@ static struct option clamscan_longopt[] = {
     {"no-phishing", 0, 0, 0},
 #ifdef CL_EXPERIMENTAL
     {"no-phishing-scan-urls",0,0,0},
-    {"phish-scan-alldomains",0,0,0},
+    {"phishing-strict-url-check",0,0,0},
 #endif
     {"no-algorithmic", 0, 0, 0},
     {"unzip", 2, 0, 0},

clamav-devel/etc/clamd.conf

@@ -212,11 +212,11 @@ LocalSocket /tmp/clamd
 # Default: yes
 #DetectPhishing yes
 
-# Use phishing detection for all domains (not just those listed in database).
+# 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.
 # (available in experimental builds only)
 # Default: no
-#PhishingScanAllDomains no
+#PhishingStrictURLCheck no
 
 # Scan urls found in mails for phishing attempts.
 # (available in experimental builds only) 

clamav-devel/shared/cfgparser.c

@@ -50,7 +50,7 @@ struct cfgoption cfg_options[] = {
     {"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},
+    {"PhishingStrictURLCheck", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},
 #endif
     {"AlgorithmicDetection", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
     {"ScanHTML", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},