git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@2595 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2007/01/08 01:47:19... | ... |
@@ -1,3 +1,7 @@ |
1 |
+Sun Jan 7 16:46:41 GMT 2007 (njh) |
|
2 |
+---------------------------------- |
|
3 |
+ * clamav-milter: s/DetectPhishing/PhishingSignatures/g |
|
4 |
+ |
|
1 | 5 |
Sun Jan 7 14:51:56 CET 2007 (tk) |
2 | 6 |
--------------------------------- |
3 | 7 |
* freshclam/manager.c: fix error path descriptor leak, spotted by NJH |
... | ... |
@@ -24,9 +24,9 @@ |
24 | 24 |
* |
25 | 25 |
* For installation instructions see the file INSTALL that came with this file |
26 | 26 |
*/ |
27 |
-static char const rcsid[] = "$Id: clamav-milter.c,v 1.307 2006/12/30 12:01:23 njh Exp $"; |
|
27 |
+static char const rcsid[] = "$Id: clamav-milter.c,v 1.308 2007/01/07 16:45:59 njh Exp $"; |
|
28 | 28 |
|
29 |
-#define CM_VERSION "devel-301206" |
|
29 |
+#define CM_VERSION "devel-070107" |
|
30 | 30 |
|
31 | 31 |
#if HAVE_CONFIG_H |
32 | 32 |
#include "clamav-config.h" |
... | ... |
@@ -1577,8 +1577,8 @@ main(int argc, char **argv) |
1577 | 1577 |
tmpdir = NULL; |
1578 | 1578 |
|
1579 | 1579 |
if(report) { |
1580 |
- if(!cfgopt(copt, "DetectPhishing")->enabled) { |
|
1581 |
- fprintf(stderr, "%s: You have chosen --report, but DetectPhishing is off in %s\n", |
|
1580 |
+ if(!cfgopt(copt, "PhishingSignatures")->enabled) { |
|
1581 |
+ fprintf(stderr, "%s: You have chosen --report, but PhishingSignatures is off in %s\n", |
|
1582 | 1582 |
argv[0], cfgfile); |
1583 | 1583 |
return EX_USAGE; |
1584 | 1584 |
} |
... | ... |
@@ -5356,7 +5356,7 @@ loadDatabase(void) |
5356 | 5356 |
signatures = 0; |
5357 | 5357 |
newroot = NULL; |
5358 | 5358 |
|
5359 |
- if(!cfgopt(copt, "DetectPhishing")->enabled) { |
|
5359 |
+ if(!cfgopt(copt, "PhishingSignatures")->enabled) { |
|
5360 | 5360 |
logg("Not loading phishing signatures.\n"); |
5361 | 5361 |
dboptions = 0; |
5362 | 5362 |
} else |