@@ -1,3 +1,7 @@

+Fri Sep  3 19:55:57 CEST 2004 (tk)

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

+  * libclamav: fallback to old method of EICAR file detection

+

 Fri Sep  3 17:00:28 BST 2004 (njh)

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

   * libclamav:	Handle spaces in headers such as 'boundary= "foo"'. I believe

@@ -1,5 +1,5 @@

 .\" Manual page created by Tomasz Kojm, 20021001.

-.TH "clamav.conf" "5" "August 18, 2004" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamav.conf" "5" "September 2, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 \fBclamav.conf\fR \- a configuration file for Clam AntiVirus Daemon

@@ -7,19 +7,19 @@

 .LP 

 clamav.conf configures the Clam AntiVirus daemon, clamd(8).

 .SH "FILE FORMAT"

-The file consists of comments and options with optional arguments. Each line that starts with a hash (\fB#\fR) symbol is ignored. Option names are case sensitive and of the form \fBOption Argument\fR. There are a few types of arguments:

+The file consists of comments and options with arguments. Each line that starts with a hash (\fB#\fR) symbol is a comment. Options are are case sensitive and of the form \fBOption Argument\fR. The (possibly optional) arguments are are of the following types:

 .TP 

 \fBSTRING\fR

 String without blank characters.

 .TP 

 \fBSIZE\fR

-Size in bytes. You can use the 'M' or 'm' modifiers for megabytes and 'K' or 'k' for kilobytes.

+Size in bytes. You can use a 'M' or 'm' modifiers for megabytes and a 'K' or 'k' for kilobytes.

 .TP 

 \fBNUMBER\fR

 Unsigned integer.

 .SH "DIRECTIVES"

 .LP 

-If some option is not used (hashed or doesn't exist in the configuration file), clamd takes a default action.

+When an option is not used (hashed or doesn't exist in the configuration file) freshclam takes a default action.

 .TP 

 \fBExample\fR

 If this option is set clamd will not run.

@@ -30,7 +30,7 @@ Enable logging to selected file.

 Default: disabled.

 .TP 

 \fBLogFileUnlock\fR

-Disable a system lock that protects against running clamd with a same configuration multiple times.

+Disable a system lock that protects against running clamd with a same configuration file multiple times.

 .br 

 Default: disabled.

 .TP 

@@ -1,6 +1,5 @@

-.\" Based on work by by Tomasz Kojm, 1.10.2002. 

 .\" Manual page created by Magnus Ekdahl and Thomas Lamy

-.TH "freshclam.conf" "5" "June 6, 2003" "Thomas Lamy" "Clam AntiVirus"

+.TH "freshclam.conf" "5" "September 2, 2004" "Thomas Lamy" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 \fBfreshclam.conf\fR \- Configuration file for Clam AntiVirus Database Updater

@@ -8,7 +7,7 @@

 .LP 

 The file freshclam.conf configures the Clam AntiVirus Database Updater, freshclam(1).

 .SH "FILE FORMAT"

-The file consists of comments and options with arguments. Each line that starts with a hash (\fB#\fR) symbol is ignored. Everything is case sensitive. Options are of the form \fBOption Argument\fR, some options don't use arguments. There are few types of the arguments:

+The file consists of comments and options with arguments. Each line that starts with a hash (\fB#\fR) symbol is a comment. Options are are case sensitive and of the form \fBOption Argument\fR. The (possibly optional) arguments are are of the following types:

 .TP 

 \fBSTRING\fR

 String without blank characters.

@@ -18,21 +17,23 @@ Size in bytes. You can use a 'M' or 'm' modifiers for megabytes and a 'K' or 'k'

 .TP 

 \fBNUMBER\fR

 Unsigned integer.

-.SH "OPTIONS"

+.SH "DIRECTIVES"

 .LP 

-When some option is not used (hashed or doesn't exist in the configuration file), freshclam takes a default action.

+When an option is not used (hashed or doesn't exist in the configuration file) freshclam takes a default action.

 .TP 

 \fBExample\fR

-When this option is set, freshclam will stop and ask you to modify the configuration file.

-.TP

+If this option is set clamd will not run.

+.TP 

 \fBDatabaseOwner STRING\fR

 When started by root, drop privileges to a specified user. Default is \"clamav\".

-.TP

+.TP 

 \fBDatabaseDirectory STRING\fR

-One can change the default database directory here.  Note that clamd and clamscan expect the hardcoded path \/var\/lib\/clamav.

-.TP

+Path to a directory containing database files.

+.br 

+Default: hardcoded directory

+.TP 

 \fBChecks NUM\fR

-Number of new database checks per day. Default is to check 6 times \(every 4 hours\).

+Number of database checks per day. 12 is the recommended number.

 .TP 

 \fBUpdateLogFile STRING\fR

 Enable logging to a specified file. Highly recommended.

@@ -49,32 +50,32 @@ Enable verbose logging.

 .TP 

 \fBDatabaseMirror STRING\fR

 Server name where database updates are downloaded from. The default is database.clamav.net, which points to all official mirrors.

-.br.

+.br .

 If this option is given multiple times, freshclam(1) tries them in the order given if one download fails.

 .br 

 There is no default, which results in an error when running freshclam(1).

-.TP

+.TP 

 \fBMaxAttempts NUM\fR

 Freshclam(1) tries every mirror this number of times before switching to the next mirror.

-.br.

+.br .

 Default is to try once per mirror.

-.TP

+.TP 

 \fBHTTPProxyServer STR\fR, \fBHTTPProxyPort NUM\fR

 Use given proxy server and TCP port for database downloads.

-.TP

+.TP 

 \fBHTTPProxyUsername STR\fR,\fBHTTPProxyPassword STR\fR

 Proxy usage is authenticated through given username and password.

-.br.

+.br .

 Default: no proxy authentication

-.TP

+.TP 

 \fBNotifyClamd \[STRING\]\fR

 Notify a running clamd(8) to reload it\'s database after a download has occured. Optionally a clamav.conf(5) file location may be given to tell freshclam(1) how to communicate with clamd(8).

-.br.

+.br .

 The default is to not notify clamd. See clamav.conf(5)\'s option SelfCheck for how clamd(8) handles database updates in this case.

-.TP

+.TP 

 \fBOnUpdateExecute STRING\fR

 Execute this command after the database has been successfully updated.

-.TP

+.TP 

 \fBOnErrorExecute\fR

 Execute this command after a database update has failed.

 .SH "NOTE"

@@ -82,7 +83,7 @@ While not reasonable, any configuration option from clamav.conf(5) may be given.

 .SH "FILES"

 .LP 

 /usr/local/etc/freshclam.conf

-.br

+.br 

 /etc/clamav/freshclam.conf

 .SH "AUTHOR"

 .LP 

@@ -415,10 +415,6 @@ static int cli_loaddb(FILE *fd, struct cl_node **root, int *virnum)

     }

     while(fgets(buffer, FILEBUFF, fd)) {

-

-	if(strstr(buffer, "Eicar")) /* FIXME: Remove me some day! */

-	    continue;

-

 	line++;

 	cli_chomp(buffer);