--- p3scan-2.3.2.orig/p3scan.conf
+++ p3scan-2.3.2/p3scan.conf
@@ -7,42 +7,6 @@
 #                                                                        #
 ##########################################################################
 
-/*
- * P3Scan v2.3.2
- *
- * (C) 2003-2005 by Jack S. Lai <laitcg@cox.net>
- *
- * It's intent is to provide a follow on program to POP3-Virusscan-Proxy 0.4
- * by Folke Ashberg <folke@ashberg.de>.
- *
- * It is based upon his program but provides numerous changes to include
- * scanning pop3 mail for spam, hardening the program, addaption to todays
- * email environment, and many other changes.
- *
- * The initial release of p3scan includes patches made and submitted to the
- * original project but were never incorporated. Please see the README for
- * further information.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * This program is released under the GPL with the additional exemption that
- * compiling, linking, and/or using OpenSSL is allowed."
- * (http://www.openssl.org/support/faq.html#LEGAL2)
- *
- */
-
 #
 # PID File
 #
@@ -50,7 +14,7 @@
 #
 #   default: /var/run/p3scan/p3scan.pid
 #
-# pidfile = /var/run/p3scan/p3scan.pid
+pidfile = /var/run/p3scan/p3scan.pid
 
 #
 # Max Child's
@@ -61,14 +25,14 @@
 #
 #   default: 10
 #
-# maxchilds = 10
+maxchilds = 10
 
 #
 # IP Address
 #
 #   The IP Address we listen on default: 0.0.0.0 (any address)
 #
-# ip = 0.0.0.0
+ip = 0.0.0.0
 
 #
 # Port
@@ -80,7 +44,7 @@
 #
 #   default: 8110
 #
-# port = 8110
+port = 8110
 
 #
 # TargetIP, TargetPort
@@ -129,7 +93,7 @@
 #
 #   default: mail
 #
-# user = mail
+user = p3scan
 
 #
 # Notify Directory
@@ -137,7 +101,7 @@
 #   Create notification mails in <DIR>. Also used for temporary storage.
 #
 #  default: /var/spool/p3scan/notify
-# notifydir = /var/spool/p3scan/notify
+notifydir = /var/spool/p3scan/notify
 
 #
 # Virus Directory
@@ -148,7 +112,7 @@
 #
 #   default: /var/spool/p3scan
 #
-# virusdir = /var/spool/p3scan
+virusdir = /var/spool/p3scan
 
 #
 # Just Delete
@@ -292,6 +256,10 @@
 #
 #     Un-comment appropriate options below.
 #     Use default scannertype = basic
+
+scannertype = basic
+
+
 #
 #   Clam Anti-Virus: http://www.clamav.net
 #
@@ -355,6 +323,9 @@
 # Sample: scannertype bash using p3scan.sh for testing:
 # scanner = /usr/local/sbin/p3scan.sh
 
+scanner = /usr/bin/clamdscan --no-summary
+
+
 #
 # Scanner Returncode
 #
@@ -402,7 +373,7 @@
 # Sample: FRISK F-Prot Antivirus
 # virusregexp = (?=Infection\:)[[:space:]]*(.*)$
 # Sample: ClamAV
-# virusregexp = .*: (.*) FOUND
+#virusregexp = .*: (.*) FOUND
 
 #
 # deMIME Setting
@@ -412,7 +383,7 @@
 #   natively handle email attachments.
 #
 #   default: <no demime>
-# demime
+#demime
 
 #
 # Broken email clients
@@ -509,7 +480,7 @@
 #
 #  default: none
 #
-# renattach = /usr/local/bin/renattach
+#renattach = /usr/bin/renattach
 
 #
 # Overwrite (disable) HTML
@@ -527,18 +498,6 @@
 # overwrite = /usr/bin/p3pmail
 
 #
-# Debug
-#
-#   Turn on debugging. The recommended debug procedure is to
-#   call p3scan as follows:
-#      p3scan -d > debug 2>&1
-#   This will trap debug information to the file "debug".
-#   You can then monitor it with a 'tail' command.
-#
-#   default: off
-# debug
-
-#
 # Quiet
 #
 #   Disable reporting of normal operating messages. Only report errors