Index: clamav/etc/clamd.conf
===================================================================
--- clamav.orig/etc/clamd.conf	2009-03-16 19:37:27.000000000 +0100
+++ clamav/etc/clamd.conf	2009-04-07 10:48:44.000000000 +0200
@@ -4,14 +4,12 @@
 ##
 
 
-# Comment or remove the line below.
-Example
-
 # Uncomment this option to enable logging.
 # LogFile must be writable for the user running daemon.
 # A full path is required.
 # Default: disabled
-#LogFile /tmp/clamd.log
+# DEBUG: uncomment next line
+# LogFile /var/log/clamav/clamd.log
 
 # By default the log file is locked for writing - the lock protects against
 # running clamd multiple times (if want to run another clamd, please
@@ -31,11 +29,12 @@ Example
 
 # Log time with each message.
 # Default: no
-#LogTime yes
+LogTime yes
 
 # Also log clean files. Useful in debugging but drastically increases the
 # log size.
 # Default: no
+# DEBUG: uncomment next line
 #LogClean yes
 
 # Use system logger (can work together with LogFile).
@@ -49,27 +48,28 @@ Example
 
 # Enable verbose logging.
 # Default: no
+# DEBUG: uncomment next line
 #LogVerbose yes
 
 # This option allows you to save a process identifier of the listening
 # daemon (main thread).
 # Default: disabled
-#PidFile /var/run/clamd.pid
+PidFile /var/run/clamav/clamd.pid
 
 # Optional path to the global temporary directory.
 # Default: system specific (usually /tmp or /var/tmp).
-#TemporaryDirectory /var/tmp
+TemporaryDirectory /var/tmpav
 
 # Path to the database directory.
 # Default: hardcoded (depends on installation options)
-#DatabaseDirectory /var/lib/clamav
+DatabaseDirectory /var/lib/avbases/clamav
 
 # The daemon can work in local mode, network mode or both. 
 # Due to security reasons we recommend the local mode.
 
 # Path to a local socket file the daemon will listen on.
 # Default: disabled (must be specified by a user)
-LocalSocket /tmp/clamd.socket
+LocalSocket /var/run/clamav/clamd.ctl
 
 # Remove stale socket after unclean shutdown.
 # Default: yes
@@ -147,18 +147,18 @@ LocalSocket /tmp/clamd.socket
 
 # Run as another user (clamd must be started by root for this option to work)
 # Default: don't drop privileges
-#User clamav
+User pavscan
 
 # Initialize supplementary group access (clamd must be started by root).
 # Default: no
 #AllowSupplementaryGroups no
 
 # Stop daemon when libclamav reports out of memory condition.
-#ExitOnOOM yes
+ExitOnOOM no
 
 # Don't fork into background.
 # Default: no
-#Foreground yes
+Foreground yes
 
 # Enable debug messages in libclamav.
 # Default: no
@@ -166,6 +166,7 @@ LocalSocket /tmp/clamd.socket
 
 # Do not remove temporary files (for debug purposes).
 # Default: no
+# DEBUG: uncomment next line
 #LeaveTemporaryFiles yes
 
 # Detect Possibly Unwanted Applications.
@@ -359,7 +360,7 @@ LocalSocket /tmp/clamd.socket
 # Note: disabling this limit or setting it too high may result in severe damage
 # to the system.
 # Default: 100M
-#MaxScanSize 150M
+MaxScanSize 750M
 
 # Files larger than this limit won't be scanned. Affects the input file itself
 # as well as files contained inside it (when the input file is an archive, a
@@ -368,7 +369,7 @@ LocalSocket /tmp/clamd.socket
 # Note: disabling this limit or setting it too high may result in severe damage
 # to the system.
 # Default: 25M
-#MaxFileSize 30M
+MaxFileSize 100M
 
 # Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR
 # file, all files within it will also be scanned. This options specifies how