Browse code

update

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@898 77e5149b-7576-45b1-b177-96237e5ba77b

Tomasz Kojm authored on 2004/09/19 09:10:49
Showing 22 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 If you want to help, compile clamav with:
2 2
 ./configure --enable-debug
3
-and enable Foreground option in clamav.conf.
3
+and enable Foreground option in clamd.conf.
4 4
 
5 5
 Known bugs:
6 6
 -----------
... ...
@@ -1,3 +1,8 @@
1
+Sun Sep 19 02:06:06 CEST 2004 (tk)
2
+----------------------------------
3
+  * etc/clamav.conf: rename clamd.conf
4
+  * freshclam,sigtool: minor cleanup
5
+
1 6
 Sat Sep 18 21:23:00 CEST 2004 (tk)
2 7
 ----------------------------------
3 8
   * clamd: remove obsolete StreamSaveToDisk directive
... ...
@@ -16,4 +16,4 @@
16 16
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 17
  */
18 18
 
19
-#define DEFAULT_CFG CONFDIR"/clamav.conf"
19
+#define DEFAULT_CFG CONFDIR"/clamd.conf"
... ...
@@ -187,9 +187,9 @@ void register_char_option(struct optstruct *opt, char ch, const char *longname)
187 187
 
188 188
 	if(!found) {
189 189
 	    if(longname)
190
-		mprintf("WARNING: Ignoring option -%c (--%s): please edit clamav.conf instead.\n", ch, longname);
190
+		mprintf("WARNING: Ignoring option -%c (--%s): please edit clamd.conf instead.\n", ch, longname);
191 191
 	    else
192
-		mprintf("WARNING: Ignoring option -%c: please edit clamav.conf instead.\n", ch);
192
+		mprintf("WARNING: Ignoring option -%c: please edit clamd.conf instead.\n", ch);
193 193
 
194 194
 	    return;
195 195
 	}
... ...
@@ -219,7 +219,7 @@ void register_long_option(struct optstruct *opt, const char *optname)
219 219
 		found = 1;
220 220
 
221 221
 	if(!found) {
222
-	    mprintf("WARNING: Ignoring option --%s: please edit clamav.conf instead.\n", optname);
222
+	    mprintf("WARNING: Ignoring option --%s: please edit clamd.conf instead.\n", optname);
223 223
 	    return;
224 224
 	}
225 225
     }
... ...
@@ -16,4 +16,4 @@
16 16
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17 17
 
18 18
 EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf Polish
19
-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
19
+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
... ...
@@ -180,7 +180,7 @@ target_cpu = @target_cpu@
180 180
 target_os = @target_os@
181 181
 target_vendor = @target_vendor@
182 182
 EXTRA_DIST = clamdoc.pdf html man clamav-mirror-howto.pdf signatures.pdf Polish
183
-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
183
+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
184 184
 all: all-am
185 185
 
186 186
 .SUFFIXES:
... ...
@@ -21,7 +21,7 @@ The socket_address argument is the socket used to communicate with
21 21
 It must agree with the entry in sendmail.cf or sendmail.mc.
22 22
 The file associated with the socket must be createable by clamav\-milter,
23 23
 if the User option is set in
24
-\fBclamav.conf(5)\fR,
24
+\fBclamd.conf(5)\fR,
25 25
 then that user must have the rights to create the file.
26 26
 .SH "OPTIONS"
27 27
 .LP
... ...
@@ -65,7 +65,7 @@ See also \-\-noreject.
65 65
 .TP
66 66
 \fB-C, \-\-dont-log-clean\fR
67 67
 Messages without viruses are usually logged if SysLog is set in
68
-\fBclamav.conf\fR since it gives a feel-good factor.
68
+\fBclamd.conf\fR since it gives a feel-good factor.
69 69
 This option turns that off.
70 70
 .TP
71 71
 \fB-d, \-\-dont-scan-on-error\fR
... ...
@@ -102,7 +102,7 @@ Scan messages generated from this machine. You probably don't need this.
102 102
 Notifies clamav\-milter to store its process ID in FILE.
103 103
 The file must be createable by clamav\-milter,
104 104
 if the User option is set in
105
-\fBclamav.conf(5)\fR,
105
+\fBclamd.conf(5)\fR,
106 106
 then that user must have the rights to create the file.
107 107
 .TP
108 108
 \fB-p, \-\-postmaster=EMAILADDRESS\fR
... ...
@@ -152,7 +152,7 @@ maximum time a pending thread will be held up is set by \-\-timeout, so the
152 152
 number of threads can exceed this number for short periods of time.
153 153
 There is no default, if this argument is not \fBclamav\-milter\fR will
154 154
 spawn as many children as is necessary up to the MaxThreads limit set
155
-in \fBclamav.conf\fR.
155
+in \fBclamd.conf\fR.
156 156
 Most users will not need this option, if in doubt do not set it.
157 157
 .TP
158 158
 \fB\-\-dont\-wait\fR
... ...
@@ -188,4 +188,4 @@ clamav\-milter \-ol local:/var/run/clamav/clmilter.sock
188 188
 Nigel Horne <njh@clamav.net>
189 189
 .SH "SEE ALSO"
190 190
 .LP
191
-clamd(8), clamscan(1), freshclam(1), sigtool(1), clamav.conf(5), hosts_access(5)
191
+clamd(8), clamscan(1), freshclam(1), sigtool(1), clamd.conf(5), hosts_access(5)
192 192
deleted file mode 100644
... ...
@@ -1,285 +0,0 @@
1
-.\" Manual page created by Tomasz Kojm, 20021001.
2
-.TH "clamav.conf" "5" "September 2, 2004" "Tomasz Kojm" "Clam AntiVirus"
3
-.SH "NAME"
4
-.LP 
5
-\fBclamav.conf\fR \- a configuration file for Clam AntiVirus Daemon
6
-.SH "DESCRIPTION"
7
-.LP 
8
-clamav.conf configures the Clam AntiVirus daemon, clamd(8).
9
-.SH "FILE FORMAT"
10
-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:
11
-.TP 
12
-\fBSTRING\fR
13
-String without blank characters.
14
-.TP 
15
-\fBSIZE\fR
16
-Size in bytes. You can use a 'M' or 'm' modifiers for megabytes and a 'K' or 'k' for kilobytes.
17
-.TP 
18
-\fBNUMBER\fR
19
-Unsigned integer.
20
-.SH "DIRECTIVES"
21
-.LP 
22
-When an option is not used (hashed or doesn't exist in the configuration file) freshclam takes a default action.
23
-.TP 
24
-\fBExample\fR
25
-If this option is set clamd will not run.
26
-.TP 
27
-\fBLogFile STRING\fR
28
-Enable logging to selected file.
29
-.br 
30
-Default: disabled.
31
-.TP 
32
-\fBLogFileUnlock\fR
33
-Disable a system lock that protects against running clamd with a same configuration file multiple times.
34
-.br 
35
-Default: disabled.
36
-.TP 
37
-\fBLogFileMaxSize SIZE\fR
38
-Limit a size of a log file. The logger will be automatically disabled  if the file is greater than SIZE. Value of 0 disables the limit.
39
-.br 
40
-Default: 1M
41
-.TP 
42
-\fBLogTime\fR
43
-Log time with each message.
44
-.br 
45
-Default: disabled.
46
-.TP 
47
-\fBLogClean\fR
48
-Log clean files.
49
-.br 
50
-Default: disabled.
51
-.TP 
52
-\fBLogSyslog\fR
53
-Use system logger (can work together with LogFile).
54
-.br 
55
-Default: disabled.
56
-.TP 
57
-\fBLogVerbose\fR
58
-Enable verbose logging.
59
-.br 
60
-Default: disabled.
61
-.TP 
62
-\fBPidFile STRING\fR
63
-Save a process identifier of a listening daemon (main thread) to a specified file.
64
-.br 
65
-Default: disabled.
66
-.TP 
67
-\fBDatabaseDirectory STRING\fR
68
-Path to a directory containing database files.
69
-.br 
70
-Default: hardcoded directory.
71
-.TP 
72
-\fBLocalSocket STRING\fR
73
-Path to a local (Unix) socket the daemon will listen on.
74
-.br 
75
-Default: disabled.
76
-.TP 
77
-\fBFixStaleSocket\fR
78
-Remove stale socket after unclean shutdown.
79
-.br 
80
-Default: disabled.
81
-.TP 
82
-\fBTCPSocket NUMBER\fR
83
-TCP port number the daemon will listen on.
84
-.br 
85
-Default: disabled.
86
-.TP 
87
-\fBTCPAddr STRING\fR
88
-TCP address to bind to. By default clamd binds to INADDR_ANY.
89
-.br 
90
-Default: disabled.
91
-.TP 
92
-\fBMaxConnectionQueueLength NUMBER\fR
93
-Maximum length the queue of pending connections may grow to.
94
-.br 
95
-Default: 15
96
-.TP 
97
-\fBMaxThreads NUMBER\fR
98
-Maximal number of threads running at the same time.
99
-.br 
100
-Default: 5.
101
-.TP 
102
-\fBThreadTimeout NUMBER\fR
103
-Stop thread\-scanner after specified time (in seconds). Value of 0 disables the timeout.
104
-.br 
105
-Default: 180
106
-.TP 
107
-\fBMaxDirectoryRecursion NUMBER\fR
108
-Maximal depth a directories are scanned at.
109
-.br 
110
-Default: disabled.
111
-.TP 
112
-\fBFollowDirectorySymlinks\fR
113
-Follow a directory symlinks. You should have enabled directory recursion limit to avoid a potential problems.
114
-.br 
115
-Default: disabled.
116
-.TP 
117
-\fBFollowFileSymlinks\fR
118
-Follow regular file symlinks.
119
-.br 
120
-Default: disabled.
121
-.TP 
122
-\fBSelfCheck NUMBER\fR
123
-Do internal checks every NUMBER seconds.
124
-.br 
125
-Default: 3600
126
-.TP 
127
-\fBVirusEvent COMMAND\fR
128
-Execute the COMMAND when virus is found. In the command string %v will be replaced by a virus name.
129
-\fR
130
-.br 
131
-Default: disabled.
132
-.TP 
133
-\fBUser STRING\fR
134
-Drop priviledges to a selected user.
135
-.br 
136
-Default: disabled.
137
-.TP 
138
-\fBAllowSupplementaryGroups\fR
139
-When started by root and the User option is activated, it will initialize all the groups from /etc/group for which user is a member.
140
-.br 
141
-Default: disabled.
142
-.TP 
143
-\fBForeground\fR
144
-Don't fork into background. Useful in debugging.
145
-.br 
146
-Default: disabled.
147
-.TP 
148
-\fBDebug\fR
149
-Enable debug messages from libclamav. You need to enable the \fBForeground\fR option to see them.
150
-.TP 
151
-\fBStreamSaveToDisk\fR
152
-When activated the input stream (see STREAM command) will be saved to disk before scanning \- this allows scanning within archives.
153
-.br 
154
-Default: disabled.
155
-.TP 
156
-\fBStreamMaxLength SIZE\fR
157
-Close the connection when this limit is exceeded.
158
-.br 
159
-Default: disabled.
160
-.TP 
161
-\fBScanPE\fR
162
-PE stands for Portable Executable \- it's an executable file format used in all 32\-bit versions of Windows operating systems. This option allows ClamAV to perform a deeper analysis of executable files and it's also required for decompression of popular executable packers such as UPX.
163
-.br 
164
-Default: enabled.
165
-.TP 
166
-\fBDetectBrokenExecutables\fR
167
-With this option clamav will try to detect broken executables and mark them as Broken.Executable.
168
-.br 
169
-Default: disabled.
170
-.TP 
171
-\fBScanOLE2\fR
172
-Enables scanning of Microsoft Office document macros.
173
-.br 
174
-Default: enabled.
175
-.TP 
176
-\fBScanHTML\fR
177
-Enables HTML detection and normalisation.
178
-.br 
179
-Default: enabled.
180
-.TP 
181
-\fBScanMail\fR
182
-Enable scanning of mail files.
183
-.br 
184
-Default: enabled.
185
-.TP 
186
-\fBMailFollowURLs\fR
187
-If an email contains URLs ClamAV can download and scan them. \fBWARNING: This option may open your system to a DoS attack. Never use it on loaded servers.\fR
188
-.br 
189
-Default: disabled.
190
-.TP 
191
-\fBScanArchive\fR
192
-Enable archive scanning.
193
-.br 
194
-Default: disabled.
195
-.TP 
196
-\fBScanRAR\fR
197
-The built\-in RAR unpacker is disabled by default because the code leaks.
198
-.br 
199
-Default: disabled.
200
-.TP 
201
-\fBArchiveMaxFileSize SIZE\fR
202
-Files in archives larger than this limit won't be scanned. Value of 0 disables the limit.
203
-.br 
204
-Default: 10M
205
-.TP 
206
-\fBArchiveMaxRecursion NUMBER\fR
207
-Limit archive recursion level. Value of 0 disables the limit.
208
-.br 
209
-Default: 5
210
-.TP 
211
-\fBArchiveMaxFiles NUMBER\fR
212
-Number of files to be scanned within archive. Value of 0 disables the limit.
213
-.br 
214
-Default: 1000
215
-.TP 
216
-\fBArchiveMaxCompressionRatio NUMBER\fR
217
-Analyze compression ratio and mark potential archive bombs as viruses (0 disables the limit).
218
-.br 
219
-Default: 200
220
-.TP 
221
-\fBArchiveLimitMemoryUsage\fR
222
-Use slower decompression algorithm which uses less memory. This option affects bzip2 decompressor only.
223
-.br 
224
-Default: disabled
225
-.TP 
226
-\fBArchiveBlockEncrypted\fR
227
-Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
228
-.br 
229
-Default: disabled
230
-.TP 
231
-\fBArchiveBlockMax\fR
232
-Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or ArchiveMaxRecursion limit is reached.
233
-.br 
234
-Default: disabled
235
-.TP 
236
-\fBClamukoScanOnLine\fR
237
-Enable Clamuko \- on\-access scanner for Linux. Dazuko must be already running.
238
-.br 
239
-Default: disabled.
240
-.TP 
241
-\fBClamukoScanOnOpen\fR
242
-Scan a file on open.
243
-.br 
244
-Default: disabled.
245
-.TP 
246
-\fBClamukoScanOnClose\fR
247
-Scan a file on close.
248
-.br 
249
-Default: disabled.
250
-.TP 
251
-\fBClamukoScanOnExec\fR
252
-Scan a file on execute.
253
-.br 
254
-Default: disabled.
255
-.TP 
256
-\fBClamukoIncludePath STRING\fR
257
-Set the include paths (all files and directories in them will be scanned). You can have multiple ClamukoIncludePath options but each directory must be added with a seperate option.
258
-.br 
259
-Default: disabled. Required.
260
-.TP 
261
-\fBClamukoExcludePath\fR
262
-Set the exclude paths. All subdirectories are also excluded.
263
-.br 
264
-Default: disabled.
265
-.TP 
266
-\fBClamukoMaxFileSize SIZE\fR
267
-Don't scan files larger than SIZE.
268
-.br 
269
-Default: 5M
270
-.TP 
271
-\fBClamukoScanArchive\fR
272
-Enable archive scanning. It uses ArchiveMax* limits.
273
-.br 
274
-Default: disabled.
275
-.SH "FILES"
276
-.LP 
277
-/etc/clamav.conf
278
-.br 
279
-/usr/local/etc/clamav.conf
280
-.SH "AUTHOR"
281
-.LP 
282
-Tomasz Kojm <tkojm@clamav.net>
283
-.SH "SEE ALSO"
284
-.LP 
285
-clamd(8), clamdscan(1), clamscan(1), freshclam(1), sigtool(1), clamav\-milter(8)
... ...
@@ -8,7 +8,7 @@ clamd \- an anti\-virus daemon
8 8
 clamd [options]
9 9
 .SH "DESCRIPTION"
10 10
 .LP 
11
-The daemon listens for incoming connections on Unix or TCP socket and scans files or directories on demand. It's a part of the Clam AntiVirus package. It reads its configuration information from a clamav.conf file. It provides on\-access scanning feature (clamuko) under Linux.
11
+The daemon listens for incoming connections on Unix or TCP socket and scans files or directories on demand. It's a part of the Clam AntiVirus package. It reads its configuration information from a clamd.conf file. It provides on\-access scanning feature (clamuko) under Linux.
12 12
 .SH "COMMANDS"
13 13
 .LP 
14 14
 clamd recognizes the following commands:
... ...
@@ -26,7 +26,7 @@ Reload the virus databases.
26 26
 Perform a clean exit.
27 27
 .TP 
28 28
 \fBSCAN file/directory\fR
29
-Scan a file or directory (recursively) with archive support enabled (if not disabled in clamav.conf). A full path is required.
29
+Scan a file or directory (recursively) with archive support enabled (if not disabled in clamd.conf). A full path is required.
30 30
 .TP 
31 31
 \fBRAWSCAN file/directory\fR
32 32
 Scan a file or directory (recursively) with archive support disabled. A full path is required.
... ...
@@ -55,4 +55,4 @@ Please check the full documentation for credits.
55 55
 Tomasz Kojm <tkojm@clamav.net>
56 56
 .SH "SEE ALSO"
57 57
 .LP 
58
-clamdscan(1), clamscan(1), freshclam(1), sigtool(1), clamav.conf(5), clamav\-milter(8)
58
+clamdscan(1), clamscan(1), freshclam(1), sigtool(1), clamd.conf(5), clamav\-milter(8)
59 59
new file mode 100644
... ...
@@ -0,0 +1,285 @@
0
+.\" Manual page created by Tomasz Kojm, 20021001.
1
+.TH "clamd.conf" "5" "September 2, 2004" "Tomasz Kojm" "Clam AntiVirus"
2
+.SH "NAME"
3
+.LP 
4
+\fBclamd.conf\fR \- a configuration file for Clam AntiVirus Daemon
5
+.SH "DESCRIPTION"
6
+.LP 
7
+clamd.conf configures the Clam AntiVirus daemon, clamd(8).
8
+.SH "FILE FORMAT"
9
+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:
10
+.TP 
11
+\fBSTRING\fR
12
+String without blank characters.
13
+.TP 
14
+\fBSIZE\fR
15
+Size in bytes. You can use a 'M' or 'm' modifiers for megabytes and a 'K' or 'k' for kilobytes.
16
+.TP 
17
+\fBNUMBER\fR
18
+Unsigned integer.
19
+.SH "DIRECTIVES"
20
+.LP 
21
+When an option is not used (hashed or doesn't exist in the configuration file) freshclam takes a default action.
22
+.TP 
23
+\fBExample\fR
24
+If this option is set clamd will not run.
25
+.TP 
26
+\fBLogFile STRING\fR
27
+Enable logging to selected file.
28
+.br 
29
+Default: disabled.
30
+.TP 
31
+\fBLogFileUnlock\fR
32
+Disable a system lock that protects against running clamd with a same configuration file multiple times.
33
+.br 
34
+Default: disabled.
35
+.TP 
36
+\fBLogFileMaxSize SIZE\fR
37
+Limit a size of a log file. The logger will be automatically disabled  if the file is greater than SIZE. Value of 0 disables the limit.
38
+.br 
39
+Default: 1M
40
+.TP 
41
+\fBLogTime\fR
42
+Log time with each message.
43
+.br 
44
+Default: disabled.
45
+.TP 
46
+\fBLogClean\fR
47
+Log clean files.
48
+.br 
49
+Default: disabled.
50
+.TP 
51
+\fBLogSyslog\fR
52
+Use system logger (can work together with LogFile).
53
+.br 
54
+Default: disabled.
55
+.TP 
56
+\fBLogVerbose\fR
57
+Enable verbose logging.
58
+.br 
59
+Default: disabled.
60
+.TP 
61
+\fBPidFile STRING\fR
62
+Save a process identifier of a listening daemon (main thread) to a specified file.
63
+.br 
64
+Default: disabled.
65
+.TP 
66
+\fBDatabaseDirectory STRING\fR
67
+Path to a directory containing database files.
68
+.br 
69
+Default: hardcoded directory.
70
+.TP 
71
+\fBLocalSocket STRING\fR
72
+Path to a local (Unix) socket the daemon will listen on.
73
+.br 
74
+Default: disabled.
75
+.TP 
76
+\fBFixStaleSocket\fR
77
+Remove stale socket after unclean shutdown.
78
+.br 
79
+Default: disabled.
80
+.TP 
81
+\fBTCPSocket NUMBER\fR
82
+TCP port number the daemon will listen on.
83
+.br 
84
+Default: disabled.
85
+.TP 
86
+\fBTCPAddr STRING\fR
87
+TCP address to bind to. By default clamd binds to INADDR_ANY.
88
+.br 
89
+Default: disabled.
90
+.TP 
91
+\fBMaxConnectionQueueLength NUMBER\fR
92
+Maximum length the queue of pending connections may grow to.
93
+.br 
94
+Default: 15
95
+.TP 
96
+\fBMaxThreads NUMBER\fR
97
+Maximal number of threads running at the same time.
98
+.br 
99
+Default: 5.
100
+.TP 
101
+\fBThreadTimeout NUMBER\fR
102
+Stop thread\-scanner after specified time (in seconds). Value of 0 disables the timeout.
103
+.br 
104
+Default: 180
105
+.TP 
106
+\fBMaxDirectoryRecursion NUMBER\fR
107
+Maximal depth a directories are scanned at.
108
+.br 
109
+Default: disabled.
110
+.TP 
111
+\fBFollowDirectorySymlinks\fR
112
+Follow a directory symlinks. You should have enabled directory recursion limit to avoid a potential problems.
113
+.br 
114
+Default: disabled.
115
+.TP 
116
+\fBFollowFileSymlinks\fR
117
+Follow regular file symlinks.
118
+.br 
119
+Default: disabled.
120
+.TP 
121
+\fBSelfCheck NUMBER\fR
122
+Do internal checks every NUMBER seconds.
123
+.br 
124
+Default: 3600
125
+.TP 
126
+\fBVirusEvent COMMAND\fR
127
+Execute the COMMAND when virus is found. In the command string %v will be replaced by a virus name.
128
+\fR
129
+.br 
130
+Default: disabled.
131
+.TP 
132
+\fBUser STRING\fR
133
+Drop priviledges to a selected user.
134
+.br 
135
+Default: disabled.
136
+.TP 
137
+\fBAllowSupplementaryGroups\fR
138
+When started by root and the User option is activated, it will initialize all the groups from /etc/group for which user is a member.
139
+.br 
140
+Default: disabled.
141
+.TP 
142
+\fBForeground\fR
143
+Don't fork into background. Useful in debugging.
144
+.br 
145
+Default: disabled.
146
+.TP 
147
+\fBDebug\fR
148
+Enable debug messages from libclamav. You need to enable the \fBForeground\fR option to see them.
149
+.TP 
150
+\fBStreamSaveToDisk\fR
151
+When activated the input stream (see STREAM command) will be saved to disk before scanning \- this allows scanning within archives.
152
+.br 
153
+Default: disabled.
154
+.TP 
155
+\fBStreamMaxLength SIZE\fR
156
+Close the connection when this limit is exceeded.
157
+.br 
158
+Default: disabled.
159
+.TP 
160
+\fBScanPE\fR
161
+PE stands for Portable Executable \- it's an executable file format used in all 32\-bit versions of Windows operating systems. This option allows ClamAV to perform a deeper analysis of executable files and it's also required for decompression of popular executable packers such as UPX.
162
+.br 
163
+Default: enabled.
164
+.TP 
165
+\fBDetectBrokenExecutables\fR
166
+With this option clamav will try to detect broken executables and mark them as Broken.Executable.
167
+.br 
168
+Default: disabled.
169
+.TP 
170
+\fBScanOLE2\fR
171
+Enables scanning of Microsoft Office document macros.
172
+.br 
173
+Default: enabled.
174
+.TP 
175
+\fBScanHTML\fR
176
+Enables HTML detection and normalisation.
177
+.br 
178
+Default: enabled.
179
+.TP 
180
+\fBScanMail\fR
181
+Enable scanning of mail files.
182
+.br 
183
+Default: enabled.
184
+.TP 
185
+\fBMailFollowURLs\fR
186
+If an email contains URLs ClamAV can download and scan them. \fBWARNING: This option may open your system to a DoS attack. Never use it on loaded servers.\fR
187
+.br 
188
+Default: disabled.
189
+.TP 
190
+\fBScanArchive\fR
191
+Enable archive scanning.
192
+.br 
193
+Default: disabled.
194
+.TP 
195
+\fBScanRAR\fR
196
+The built\-in RAR unpacker is disabled by default because the code leaks.
197
+.br 
198
+Default: disabled.
199
+.TP 
200
+\fBArchiveMaxFileSize SIZE\fR
201
+Files in archives larger than this limit won't be scanned. Value of 0 disables the limit.
202
+.br 
203
+Default: 10M
204
+.TP 
205
+\fBArchiveMaxRecursion NUMBER\fR
206
+Limit archive recursion level. Value of 0 disables the limit.
207
+.br 
208
+Default: 5
209
+.TP 
210
+\fBArchiveMaxFiles NUMBER\fR
211
+Number of files to be scanned within archive. Value of 0 disables the limit.
212
+.br 
213
+Default: 1000
214
+.TP 
215
+\fBArchiveMaxCompressionRatio NUMBER\fR
216
+Analyze compression ratio and mark potential archive bombs as viruses (0 disables the limit).
217
+.br 
218
+Default: 200
219
+.TP 
220
+\fBArchiveLimitMemoryUsage\fR
221
+Use slower decompression algorithm which uses less memory. This option affects bzip2 decompressor only.
222
+.br 
223
+Default: disabled
224
+.TP 
225
+\fBArchiveBlockEncrypted\fR
226
+Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
227
+.br 
228
+Default: disabled
229
+.TP 
230
+\fBArchiveBlockMax\fR
231
+Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or ArchiveMaxRecursion limit is reached.
232
+.br 
233
+Default: disabled
234
+.TP 
235
+\fBClamukoScanOnLine\fR
236
+Enable Clamuko \- on\-access scanner for Linux. Dazuko must be already running.
237
+.br 
238
+Default: disabled.
239
+.TP 
240
+\fBClamukoScanOnOpen\fR
241
+Scan a file on open.
242
+.br 
243
+Default: disabled.
244
+.TP 
245
+\fBClamukoScanOnClose\fR
246
+Scan a file on close.
247
+.br 
248
+Default: disabled.
249
+.TP 
250
+\fBClamukoScanOnExec\fR
251
+Scan a file on execute.
252
+.br 
253
+Default: disabled.
254
+.TP 
255
+\fBClamukoIncludePath STRING\fR
256
+Set the include paths (all files and directories in them will be scanned). You can have multiple ClamukoIncludePath options but each directory must be added with a seperate option.
257
+.br 
258
+Default: disabled. Required.
259
+.TP 
260
+\fBClamukoExcludePath\fR
261
+Set the exclude paths. All subdirectories are also excluded.
262
+.br 
263
+Default: disabled.
264
+.TP 
265
+\fBClamukoMaxFileSize SIZE\fR
266
+Don't scan files larger than SIZE.
267
+.br 
268
+Default: 5M
269
+.TP 
270
+\fBClamukoScanArchive\fR
271
+Enable archive scanning. It uses ArchiveMax* limits.
272
+.br 
273
+Default: disabled.
274
+.SH "FILES"
275
+.LP 
276
+/etc/clamd.conf
277
+.br 
278
+/usr/local/etc/clamd.conf
279
+.SH "AUTHOR"
280
+.LP 
281
+Tomasz Kojm <tkojm@clamav.net>
282
+.SH "SEE ALSO"
283
+.LP 
284
+clamd(8), clamdscan(1), clamscan(1), freshclam(1), sigtool(1), clamav\-milter(8)
... ...
@@ -67,4 +67,4 @@ Please check the full documentation for credits.
67 67
 Tomasz Kojm <tkojm@clamav.net>
68 68
 .SH "SEE ALSO"
69 69
 .LP 
70
-clamscan(1), clamd(8), freshclam(1), clamav.conf(5)
70
+clamscan(1), clamd(8), freshclam(1), clamd.conf(5)
... ...
@@ -49,7 +49,7 @@ This option forces old non\-DNS verification method (without a TTL delay).
49 49
 \fB\-c #n, \-\-checks=#n\fR
50 50
 Check #n times per day for a new database. #n must be between 1 and 50.
51 51
 .TP 
52
-\fB\-\-daemon\-notify=/path/to/clamav.conf\fR
52
+\fB\-\-daemon\-notify=/path/to/clamd.conf\fR
53 53
 Notify the daemon about the new database. By default it reads a hardcoded config file but you can use an another one. Both local and TCP sockets are supported.
54 54
 .TP 
55 55
 \fB\-\-on\-error\-execute=COMMAND\fR
... ...
@@ -108,4 +108,4 @@ Please check the full documentation for credits.
108 108
 Tomasz Kojm <tkojm@clamav.net>
109 109
 .SH "SEE ALSO"
110 110
 .LP 
111
-clamd(8), clamdscan(1), clamscan(1), sigtool(1), clamav.conf(5)
111
+clamd(8), clamdscan(1), clamscan(1), sigtool(1), clamd.conf(5)
... ...
@@ -69,9 +69,9 @@ Proxy usage is authenticated through given username and password.
69 69
 Default: no proxy authentication
70 70
 .TP 
71 71
 \fBNotifyClamd \[STRING\]\fR
72
-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).
72
+Notify a running clamd(8) to reload it\'s database after a download has occured. Optionally a clamd.conf(5) file location may be given to tell freshclam(1) how to communicate with clamd(8).
73 73
 .br .
74
-The default is to not notify clamd. See clamav.conf(5)\'s option SelfCheck for how clamd(8) handles database updates in this case.
74
+The default is to not notify clamd. See clamd.conf(5)\'s option SelfCheck for how clamd(8) handles database updates in this case.
75 75
 .TP 
76 76
 \fBOnUpdateExecute STRING\fR
77 77
 Execute this command after the database has been successfully updated.
... ...
@@ -79,7 +79,7 @@ Execute this command after the database has been successfully updated.
79 79
 \fBOnErrorExecute\fR
80 80
 Execute this command after a database update has failed.
81 81
 .SH "NOTE"
82
-While not reasonable, any configuration option from clamav.conf(5) may be given.
82
+While not reasonable, any configuration option from clamd.conf(5) may be given.
83 83
 .SH "FILES"
84 84
 .LP 
85 85
 /usr/local/etc/freshclam.conf
... ...
@@ -90,5 +90,5 @@ While not reasonable, any configuration option from clamav.conf(5) may be given.
90 90
 Thomas Lamy <thomas.lamy@netwake.de>
91 91
 .SH "SEE ALSO"
92 92
 .LP 
93
-freshclam(1), clamav.conf(5), clamd(8), clamscan(1)
93
+freshclam(1), clamd.conf(5), clamd(8), clamscan(1)
94 94
 
... ...
@@ -62,4 +62,4 @@ Please check the full documentation for credits.
62 62
 Tomasz Kojm <tkojm@clamav.net>
63 63
 .SH "SEE ALSO"
64 64
 .LP 
65
-clamd(8), clamdscan(1), clamscan(1), freshclam(1), clamav.conf(5), clamav\-milter(8)
65
+clamd(8), clamdscan(1), clamscan(1), freshclam(1), clamd.conf(5), clamav\-milter(8)
... ...
@@ -17,7 +17,7 @@
17 17
 #  along with this program; if not, write to the Free Software
18 18
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 19
 
20
-EXTRA_DIST = clamav.conf freshclam.conf
20
+EXTRA_DIST = clamd.conf freshclam.conf
21 21
 CFGINST = @CFGDIR@
22 22
  
23 23
 install:
... ...
@@ -175,7 +175,7 @@ target_alias = @target_alias@
175 175
 target_cpu = @target_cpu@
176 176
 target_os = @target_os@
177 177
 target_vendor = @target_vendor@
178
-EXTRA_DIST = clamav.conf freshclam.conf
178
+EXTRA_DIST = clamd.conf freshclam.conf
179 179
 CFGINST = @CFGDIR@
180 180
 all: all-am
181 181
 
182 182
deleted file mode 100644
... ...
@@ -1,254 +0,0 @@
1
-##
2
-## Example config file for the Clam AV daemon
3
-## Please read the clamav.conf(5) manual before editing this file.
4
-##
5
-
6
-
7
-# Comment or remove the line below.
8
-Example
9
-
10
-# Uncomment this option to enable logging.
11
-# LogFile must be writable for the user running the daemon.
12
-# Full path is required.
13
-#LogFile /tmp/clamd.log
14
-
15
-# By default the log file is locked for writing - the lock protects against
16
-# running clamd multiple times (if want to run another clamd, please
17
-# copy the configuration file, change the LogFile variable, and run
18
-# the daemon with --config-file option). That's why you shouldn't uncomment
19
-# this option.
20
-#LogFileUnlock
21
-
22
-# Maximal size of the log file. Default is 1 Mb.
23
-# Value of 0 disables the limit.
24
-# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
25
-# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
26
-# in bytes just don't use modifiers.
27
-#LogFileMaxSize 2M
28
-
29
-# Log time with an each message.
30
-#LogTime
31
-
32
-# Log also clean files. May be useful in debugging but will drastically
33
-# increase the log size.
34
-#LogClean
35
-
36
-# Use system logger (can work together with LogFile).
37
-#LogSyslog
38
-
39
-# Specify the type of syslog messages - please refer to 'man syslog'
40
-# for facility names. Default is LOG_LOCAL6.
41
-#LogFacility LOG_MAIL
42
-
43
-# Enable verbose logging.
44
-#LogVerbose
45
-
46
-# This option allows you to save the process identifier of the listening
47
-# daemon (main thread).
48
-#PidFile /var/run/clamd.pid
49
-
50
-# Optional path to the global temporary directory.
51
-# Default is system specific - usually /var/tmp or /tmp.
52
-#TemporaryDirectory /var/tmp
53
-
54
-# Path to the database directory.
55
-# Default is the hardcoded directory (mostly /usr/local/share/clamav,
56
-# but it depends on installation options).
57
-#DatabaseDirectory /var/lib/clamav
58
-
59
-# The daemon works in local or network mode. Currently the local mode is
60
-# recommended for security reasons.
61
-
62
-# Path to the local socket. The daemon doesn't change the mode of the
63
-# created file (portability reasons). You may want to create it in a directory
64
-# which is only accessible for a user running daemon.
65
-LocalSocket /tmp/clamd
66
-
67
-# Remove stale socket after unclean shutdown.
68
-FixStaleSocket
69
-
70
-# TCP port address.
71
-#TCPSocket 3310
72
-
73
-# TCP address.
74
-# By default we bind to INADDR_ANY, probably not wise.
75
-# Enable the following to provide some degree of protection
76
-# from the outside world.
77
-#TCPAddr 127.0.0.1
78
-
79
-# Maximum length the queue of pending connections may grow to.
80
-# Default is 15.
81
-#MaxConnectionQueueLength 30
82
-
83
-# Close the connection if this limit is exceeded.
84
-#StreamMaxLength 10M
85
-
86
-# Maximal number of a threads running at the same time.
87
-# Default is 5, and it should be sufficient for a typical workstation.
88
-# You may need to increase threads number for a server machine.
89
-#MaxThreads 10
90
-
91
-# Waiting for data from a client socket will timeout after this time (seconds).
92
-# Default is 120. Value of 0 disables the timeout.
93
-#ReadTimeout 300
94
-
95
-# Maximal depth the directories are scanned at.
96
-MaxDirectoryRecursion 15
97
-
98
-# Follow a directory symlinks.
99
-# SECURITY HINT: You should have enabled directory recursion limit to
100
-# avoid potential problems.
101
-#FollowDirectorySymlinks
102
-
103
-# Follow regular file symlinks.
104
-#FollowFileSymlinks
105
-
106
-# Do internal checks (eg. check the integrity of the database structures)
107
-# By default clamd checks itself every 3600 seconds (1 hour).
108
-#SelfCheck 600
109
-
110
-# Execute a command when a virus is found. In the command string %v will
111
-# be replaced by the virus name.
112
-#
113
-#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %v"
114
-
115
-# Run as selected user (clamd must be started by root).
116
-# By default it doesn't drop privileges.
117
-#User clamav
118
-
119
-# Initialize the supplementary group access (for all groups in /etc/group
120
-# user is added in. clamd must be started by root).
121
-#AllowSupplementaryGroups
122
-
123
-# Don't fork into background. Useful in debugging.
124
-#Foreground
125
-
126
-# Enable debug messages in libclamav.
127
-#Debug
128
-
129
-# Do not remove temporary files (for debug purposes).
130
-#LeaveTemporaryFiles
131
-
132
-
133
-##
134
-## Executable files
135
-##
136
-
137
-# PE stands for Portable Executable - it's an executable file format used
138
-# in all 32-bit versions of Windows operating systems. This option allows
139
-# ClamAV to perform a deeper analysis of executable files and it's also
140
-# required for decompression of popular executable packers such as UPX.
141
-ScanPE
142
-
143
-# With this option clamav will try to detect broken executables and mark
144
-# them as Broken.Executable
145
-#DetectBrokenExecutables
146
-
147
-
148
-##
149
-## Documents
150
-##
151
-
152
-# This option enables scanning of Microsoft Office document macros.
153
-ScanOLE2
154
-
155
-##
156
-## Mail files
157
-##
158
-
159
-# Enable internal e-mail scanner.
160
-ScanMail
161
-
162
-# If an email contains URLs ClamAV can download and scan them.
163
-# WARNING: This option may open your system to a DoS attack.
164
-#	   Never use it on loaded servers.
165
-#MailFollowURLs
166
-
167
-
168
-##
169
-## HTML
170
-##
171
-
172
-# This option enables HTML detection and normalisation. It's highly
173
-# recommended and required to detect popular exploits.
174
-ScanHTML
175
-
176
-
177
-##
178
-## Archives
179
-##
180
-
181
-# Comment this line to disable scanning of the archives.
182
-ScanArchive
183
-
184
-# By default the built-in RAR unpacker is disabled by default because the code
185
-# terribly leaks, however it's probably a good idea to enable it.
186
-#ScanRAR
187
-
188
-# Options below protect your system against Denial of Service attacks
189
-# with archive bombs.
190
-
191
-# Files in archives larger than this limit won't be scanned.
192
-# Value of 0 disables the limit.
193
-# WARNING: Due to the unrarlib implementation, whole files (one by one) in RAR
194
-#	   archives are decompressed to the memory. That's why never disable
195
-#	   this limit (but you may increase it of course!)
196
-ArchiveMaxFileSize 10M
197
-
198
-# Archives are scanned recursively - e.g. if Zip archive contains RAR file,
199
-# the RAR file will be decompressed, too (but only if recursion limit is set
200
-# at least to 1). With this option you may set the recursion level.
201
-# Value of 0 disables the limit.
202
-ArchiveMaxRecursion 5
203
-
204
-# Number of files to be scanned within archive.
205
-# Value of 0 disables the limit.
206
-ArchiveMaxFiles 1000
207
-
208
-# Mark potential archive bombs as viruses (0 disables the limit)
209
-ArchiveMaxCompressionRatio 200
210
-
211
-# Use slower decompression algorithm which uses less memory. This option 
212
-# affects bzip2 decompressor only.
213
-#ArchiveLimitMemoryUsage
214
-
215
-# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
216
-#ArchiveBlockEncrypted
217
-
218
-# Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or
219
-# ArchiveMaxRecursion limit is reached.
220
-#ArchiveBlockMax
221
-
222
-
223
-##
224
-## Clamuko settings
225
-## WARNING: This is experimental software. It is very likely it will hang
226
-##	    up your system!!!
227
-##
228
-
229
-# Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
230
-#ClamukoScanOnAccess
231
-
232
-# Set access mask for Clamuko.
233
-ClamukoScanOnOpen
234
-ClamukoScanOnClose
235
-ClamukoScanOnExec
236
-
237
-# Set the include paths (all files in them will be scanned). You can have
238
-# multiple ClamukoIncludePath options, but each directory must be added
239
-# in a seperate option. All subdirectories are scanned, too.
240
-ClamukoIncludePath /home
241
-#ClamukoIncludePath /students
242
-
243
-# Set the exclude paths. All subdirectories are also excluded.
244
-#ClamukoExcludePath /home/guru
245
-
246
-# Limit the file size to be scanned (probably you don't want to scan your movie
247
-# files ;))
248
-# Value of 0 disables the limit. 1 Mb should be fine.
249
-ClamukoMaxFileSize 1M
250
-
251
-# Enable archive support. It uses the limits from clamd section.
252
-# (This option doesn't depend on ScanArchive, you can have archive support
253
-# in clamd disabled).
254
-ClamukoScanArchive
255 1
new file mode 100644
... ...
@@ -0,0 +1,254 @@
0
+##
1
+## Example config file for the Clam AV daemon
2
+## Please read the clamd.conf(5) manual before editing this file.
3
+##
4
+
5
+
6
+# Comment or remove the line below.
7
+Example
8
+
9
+# Uncomment this option to enable logging.
10
+# LogFile must be writable for the user running the daemon.
11
+# Full path is required.
12
+#LogFile /tmp/clamd.log
13
+
14
+# By default the log file is locked for writing - the lock protects against
15
+# running clamd multiple times (if want to run another clamd, please
16
+# copy the configuration file, change the LogFile variable, and run
17
+# the daemon with --config-file option). That's why you shouldn't uncomment
18
+# this option.
19
+#LogFileUnlock
20
+
21
+# Maximal size of the log file. Default is 1 Mb.
22
+# Value of 0 disables the limit.
23
+# You may use 'M' or 'm' for megabytes (1M = 1m = 1048576 bytes)
24
+# and 'K' or 'k' for kilobytes (1K = 1k = 1024 bytes). To specify the size
25
+# in bytes just don't use modifiers.
26
+#LogFileMaxSize 2M
27
+
28
+# Log time with an each message.
29
+#LogTime
30
+
31
+# Log also clean files. May be useful in debugging but will drastically
32
+# increase the log size.
33
+#LogClean
34
+
35
+# Use system logger (can work together with LogFile).
36
+#LogSyslog
37
+
38
+# Specify the type of syslog messages - please refer to 'man syslog'
39
+# for facility names. Default is LOG_LOCAL6.
40
+#LogFacility LOG_MAIL
41
+
42
+# Enable verbose logging.
43
+#LogVerbose
44
+
45
+# This option allows you to save the process identifier of the listening
46
+# daemon (main thread).
47
+#PidFile /var/run/clamd.pid
48
+
49
+# Optional path to the global temporary directory.
50
+# Default is system specific - usually /var/tmp or /tmp.
51
+#TemporaryDirectory /var/tmp
52
+
53
+# Path to the database directory.
54
+# Default is the hardcoded directory (mostly /usr/local/share/clamav,
55
+# but it depends on installation options).
56
+#DatabaseDirectory /var/lib/clamav
57
+
58
+# The daemon works in local or network mode. Currently the local mode is
59
+# recommended for security reasons.
60
+
61
+# Path to the local socket. The daemon doesn't change the mode of the
62
+# created file (portability reasons). You may want to create it in a directory
63
+# which is only accessible for a user running daemon.
64
+LocalSocket /tmp/clamd
65
+
66
+# Remove stale socket after unclean shutdown.
67
+FixStaleSocket
68
+
69
+# TCP port address.
70
+#TCPSocket 3310
71
+
72
+# TCP address.
73
+# By default we bind to INADDR_ANY, probably not wise.
74
+# Enable the following to provide some degree of protection
75
+# from the outside world.
76
+#TCPAddr 127.0.0.1
77
+
78
+# Maximum length the queue of pending connections may grow to.
79
+# Default is 15.
80
+#MaxConnectionQueueLength 30
81
+
82
+# Close the connection if this limit is exceeded.
83
+#StreamMaxLength 10M
84
+
85
+# Maximal number of a threads running at the same time.
86
+# Default is 5, and it should be sufficient for a typical workstation.
87
+# You may need to increase threads number for a server machine.
88
+#MaxThreads 10
89
+
90
+# Waiting for data from a client socket will timeout after this time (seconds).
91
+# Default is 120. Value of 0 disables the timeout.
92
+#ReadTimeout 300
93
+
94
+# Maximal depth the directories are scanned at.
95
+MaxDirectoryRecursion 15
96
+
97
+# Follow a directory symlinks.
98
+# SECURITY HINT: You should have enabled directory recursion limit to
99
+# avoid potential problems.
100
+#FollowDirectorySymlinks
101
+
102
+# Follow regular file symlinks.
103
+#FollowFileSymlinks
104
+
105
+# Do internal checks (eg. check the integrity of the database structures)
106
+# By default clamd checks itself every 3600 seconds (1 hour).
107
+#SelfCheck 600
108
+
109
+# Execute a command when a virus is found. In the command string %v will
110
+# be replaced by the virus name.
111
+#
112
+#VirusEvent /usr/local/bin/send_sms 123456789 "VIRUS ALERT: %v"
113
+
114
+# Run as selected user (clamd must be started by root).
115
+# By default it doesn't drop privileges.
116
+#User clamav
117
+
118
+# Initialize the supplementary group access (for all groups in /etc/group
119
+# user is added in. clamd must be started by root).
120
+#AllowSupplementaryGroups
121
+
122
+# Don't fork into background. Useful in debugging.
123
+#Foreground
124
+
125
+# Enable debug messages in libclamav.
126
+#Debug
127
+
128
+# Do not remove temporary files (for debug purposes).
129
+#LeaveTemporaryFiles
130
+
131
+
132
+##
133
+## Executable files
134
+##
135
+
136
+# PE stands for Portable Executable - it's an executable file format used
137
+# in all 32-bit versions of Windows operating systems. This option allows
138
+# ClamAV to perform a deeper analysis of executable files and it's also
139
+# required for decompression of popular executable packers such as UPX.
140
+ScanPE
141
+
142
+# With this option clamav will try to detect broken executables and mark
143
+# them as Broken.Executable
144
+#DetectBrokenExecutables
145
+
146
+
147
+##
148
+## Documents
149
+##
150
+
151
+# This option enables scanning of Microsoft Office document macros.
152
+ScanOLE2
153
+
154
+##
155
+## Mail files
156
+##
157
+
158
+# Enable internal e-mail scanner.
159
+ScanMail
160
+
161
+# If an email contains URLs ClamAV can download and scan them.
162
+# WARNING: This option may open your system to a DoS attack.
163
+#	   Never use it on loaded servers.
164
+#MailFollowURLs
165
+
166
+
167
+##
168
+## HTML
169
+##
170
+
171
+# This option enables HTML detection and normalisation. It's highly
172
+# recommended and required to detect popular exploits.
173
+ScanHTML
174
+
175
+
176
+##
177
+## Archives
178
+##
179
+
180
+# Comment this line to disable scanning of the archives.
181
+ScanArchive
182
+
183
+# By default the built-in RAR unpacker is disabled by default because the code
184
+# terribly leaks, however it's probably a good idea to enable it.
185
+#ScanRAR
186
+
187
+# Options below protect your system against Denial of Service attacks
188
+# with archive bombs.
189
+
190
+# Files in archives larger than this limit won't be scanned.
191
+# Value of 0 disables the limit.
192
+# WARNING: Due to the unrarlib implementation, whole files (one by one) in RAR
193
+#	   archives are decompressed to the memory. That's why never disable
194
+#	   this limit (but you may increase it of course!)
195
+ArchiveMaxFileSize 10M
196
+
197
+# Archives are scanned recursively - e.g. if Zip archive contains RAR file,
198
+# the RAR file will be decompressed, too (but only if recursion limit is set
199
+# at least to 1). With this option you may set the recursion level.
200
+# Value of 0 disables the limit.
201
+ArchiveMaxRecursion 5
202
+
203
+# Number of files to be scanned within archive.
204
+# Value of 0 disables the limit.
205
+ArchiveMaxFiles 1000
206
+
207
+# Mark potential archive bombs as viruses (0 disables the limit)
208
+ArchiveMaxCompressionRatio 200
209
+
210
+# Use slower decompression algorithm which uses less memory. This option 
211
+# affects bzip2 decompressor only.
212
+#ArchiveLimitMemoryUsage
213
+
214
+# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
215
+#ArchiveBlockEncrypted
216
+
217
+# Mark archives as viruses if ArchiveMaxFiles, ArchiveMaxFileSize, or
218
+# ArchiveMaxRecursion limit is reached.
219
+#ArchiveBlockMax
220
+
221
+
222
+##
223
+## Clamuko settings
224
+## WARNING: This is experimental software. It is very likely it will hang
225
+##	    up your system!!!
226
+##
227
+
228
+# Enable Clamuko. Dazuko (/dev/dazuko) must be configured and running.
229
+#ClamukoScanOnAccess
230
+
231
+# Set access mask for Clamuko.
232
+ClamukoScanOnOpen
233
+ClamukoScanOnClose
234
+ClamukoScanOnExec
235
+
236
+# Set the include paths (all files in them will be scanned). You can have
237
+# multiple ClamukoIncludePath options, but each directory must be added
238
+# in a seperate option. All subdirectories are scanned, too.
239
+ClamukoIncludePath /home
240
+#ClamukoIncludePath /students
241
+
242
+# Set the exclude paths. All subdirectories are also excluded.
243
+#ClamukoExcludePath /home/guru
244
+
245
+# Limit the file size to be scanned (probably you don't want to scan your movie
246
+# files ;))
247
+# Value of 0 disables the limit. 1 Mb should be fine.
248
+ClamukoMaxFileSize 1M
249
+
250
+# Enable archive support. It uses the limits from clamd section.
251
+# (This option doesn't depend on ScanArchive, you can have archive support
252
+# in clamd disabled).
253
+ClamukoScanArchive
... ...
@@ -115,7 +115,7 @@ int freshclam(struct optstruct *opt)
115 115
     } else {
116 116
 	/* TODO: force strict permissions on freshclam.conf */
117 117
 	if((copt = parsecfg((cfgfile = CONFDIR"/freshclam.conf"), 1)) == NULL)
118
-	    copt = parsecfg((cfgfile = CONFDIR"/clamav.conf"), 1);
118
+	    copt = parsecfg((cfgfile = CONFDIR"/clamd.conf"), 1);
119 119
     }
120 120
 
121 121
     if(!copt) {
... ...
@@ -429,7 +429,7 @@ void help(void)
429 429
     mprintf("    --checks=#n          -c #n           number of checks per day, 1 <= n <= 50\n");
430 430
     mprintf("    --datadir=DIRECTORY                  download new databases into DIRECTORY\n");
431 431
 #ifdef BUILD_CLAMD
432
-    mprintf("    --daemon-notify[=/path/clamav.conf]  send RELOAD command to clamd\n");
432
+    mprintf("    --daemon-notify[=/path/clamd.conf]  send RELOAD command to clamd\n");
433 433
 #endif
434 434
     mprintf("    --on-update-execute=COMMAND          execute COMMAND after successful update\n");
435 435
     mprintf("    --on-error-execute=COMMAND           execute COMMAND if errors occured\n");
... ...
@@ -95,13 +95,13 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c
95 95
 	if(optl(opt, "daemon-notify")) {
96 96
 		const char *clamav_conf = getargl(opt, "daemon-notify");
97 97
 	    if(!clamav_conf)
98
-		clamav_conf = CONFDIR"/clamav.conf";
98
+		clamav_conf = CONFDIR"/clamd.conf";
99 99
 
100 100
 	    notify(clamav_conf);
101 101
 	} else if((cpt = cfgopt(copt, "NotifyClamd"))) {
102 102
 		const char *clamav_conf = cpt->strarg;
103 103
 	    if(!clamav_conf)
104
-		clamav_conf = CONFDIR"/clamav.conf";
104
+		clamav_conf = CONFDIR"/clamd.conf";
105 105
 
106 106
 	    notify(clamav_conf);
107 107
 	}
... ...
@@ -189,7 +189,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna
189 189
 		logg("WARNING: Invalid DNS reply.\n");
190 190
 	    }
191 191
 
192
-	    if((pt = cli_strtok(dnsreply, 0, ":"))) {
192
+	    if(field == 1 && (pt = cli_strtok(dnsreply, 0, ":"))) {
193 193
 		mprintf("*Software version from DNS: %s\n", pt);
194 194
 		if(!strstr(cl_retver(), "devel")) {
195 195
 		    if(strcmp(cl_retver(), pt)) {
... ...
@@ -38,7 +38,7 @@ const char *freshdbdir(void)
38 38
 
39 39
     /* try to find fresh directory */
40 40
     dbdir = cl_retdbdir();
41
-    if((copt = parsecfg(CONFDIR"/clamav.conf", 0))) {
41
+    if((copt = parsecfg(CONFDIR"/clamd.conf", 0))) {
42 42
 	if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory"))) {
43 43
 	    if(strcmp(cl_retdbdir(), cpt->strarg)) {
44 44
 		    char *daily = (char *) mmalloc(strlen(cpt->strarg) + strlen(cl_retdbdir()) + 15);
... ...
@@ -189,44 +189,6 @@ int countlines(const char *filename)
189 189
     return lines;
190 190
 }
191 191
 
192
-const char *getdbdir(void)
193
-{
194
-        struct cfgstruct *copt, *cpt;
195
-	struct cl_cvd *d1, *d2;
196
-        const char *dbdir;
197
-
198
-
199
-    dbdir = cl_retdbdir();
200
-    if((copt = parsecfg(CONFDIR"/clamav.conf", 0))) {
201
-	if((cpt = cfgopt(copt, "DatabaseDirectory")) || (cpt = cfgopt(copt, "DataDirectory"))) {
202
-	    if(strcmp(cl_retdbdir(), cpt->strarg)) {
203
-		char *daily = (char *) mmalloc(strlen(cpt->strarg) + strlen(cl_retdbdir()) + 15);
204
-		sprintf(daily, "%s/daily.cvd", cpt->strarg);
205
-		if((d1 = cl_cvdhead(daily))) {
206
-		    sprintf(daily, "%s/daily.cvd", cl_retdbdir());
207
-		    if((d2 = cl_cvdhead(daily))) {
208
-			free(daily);
209
-			if(d1->version > d2->version)
210
-			    dbdir = cpt->strarg;
211
-			else
212
-			    dbdir = cl_retdbdir();
213
-			cl_cvdfree(d2);
214
-		    } else {
215
-			free(daily);
216
-			dbdir = cpt->strarg;
217
-		    }
218
-		    cl_cvdfree(d1);
219
-		} else {
220
-		    free(daily);
221
-		    dbdir = cl_retdbdir();
222
-		}
223
-	    }
224
-	}
225
-    }
226
-
227
-    return dbdir;
228
-}
229
-
230 192
 int build(struct optstruct *opt)
231 193
 {
232 194
 	int ret, no = 0, realno = 0, bytes, itmp;
... ...
@@ -321,7 +283,7 @@ int build(struct optstruct *opt)
321 321
 
322 322
 
323 323
     /* try to read cvd header of old database */
324
-    sprintf(buffer, "%s/%s", getdbdir(), getargc(opt, 'b'));
324
+    sprintf(buffer, "%s/%s", freshdbdir(), getargc(opt, 'b'));
325 325
     if((oldcvd = cl_cvdhead(buffer)) == NULL)
326 326
 	mprintf("WARNING: CAN'T READ CVD HEADER OF CURRENT DATABASE %s\n", buffer);
327 327
 
... ...
@@ -535,7 +497,7 @@ int unpack(struct optstruct *opt)
535 535
 
536 536
     if(optl(opt, "unpack-current")) {
537 537
 	name = mcalloc(300, sizeof(char)); /* FIXME */
538
-	sprintf(name, "%s/%s", getdbdir(), getargl(opt, "unpack-current"));
538
+	sprintf(name, "%s/%s", freshdbdir(), getargl(opt, "unpack-current"));
539 539
     } else
540 540
 	name = getargc(opt, 'u');
541 541
 
... ...
@@ -779,7 +741,7 @@ void listsigs(struct optstruct *opt)
779 779
     if((name = getargc(opt, 'l')))
780 780
 	ret = listdb(name);
781 781
     else
782
-	ret = listdir(getdbdir());
782
+	ret = listdir(freshdbdir());
783 783
 
784 784
     ret ? exit(1) : exit(0);
785 785
 }