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

+Fri May 12 20:04:05 CEST 2006 (tk)

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

+  * clamscan: s/no-algo/no-algorithmic

+  * clamd: s/ScanAlgo/AlgorithmicDetection

+

 Fri May 12 19:35:41 CEST 2006 (tk)

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

   * libclamav/scanners.c: fix zero allocation reported by Sergey Svishchev

@@ -326,7 +326,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, const struc

 	logg("Archive support disabled.\n");

     }

-    if(cfgopt(copt, "ScanAlgo")->enabled) {

+    if(cfgopt(copt, "AlgorithmicDetection")->enabled) {

 	logg("Algorithmic detection enabled.\n");

 	options |= CL_SCAN_ALGO;

     } else {

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

     mprintf("\n");

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

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

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

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

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

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

     mprintf("    --no-html                            Disable HTML support\n");

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

 #endif

     }

-    if(optl(opt, "no-algo"))

+    if(optl(opt, "no-algorithmic"))

 	options &= ~CL_SCAN_ALGO;

     else

 	options |= CL_SCAN_ALGO;

@@ -109,7 +109,7 @@ int main(int argc, char **argv)

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

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

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

-	    {"no-algo", 0, 0, 0},

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

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

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

 	    {"unace", 2, 0, 0}, /* not used */

@@ -189,7 +189,7 @@ Limit data port range.

 .br 

 Default: 2048

 .TP 

-\fBScanAlgo\fR

+\fBAlgorithmicDetection\fR

 In some cases (eg. complex malware, exploits in graphic files, and others), ClamAV uses special algorithms to provide accurate detection. This option controls the algorithmic detection.

 .br 

 Default: yes

@@ -166,7 +166,7 @@ LocalSocket /tmp/clamd

 # ClamAV uses special algorithms to provide accurate detection. This option

 # controls the algorithmic detection.

 # Default: yes

-#ScanAlgo yes

+#AlgorithmicDetection yes

 ##

 ## Executable files

@@ -48,7 +48,7 @@ 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},

-    {"ScanAlgo", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},

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

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

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

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