--- src/dspam.conf.in.orig	2014-09-18 00:33:02.874722063 -0700
+++ src/dspam.conf.in	2014-09-18 00:41:49.434685786 -0700
@@ -56,6 +56,7 @@
 # necessary if you plan on allowing untrusted processing.
 #
 #UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
+#UntrustedDeliveryAgent "@delivery_agent@"
 
 #
 # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
@@ -350,7 +351,7 @@
 # Storage driver settings: Specific to a particular storage driver. Uncomment
 # the configuration specific to your installation, if applicable.
 #
-#MySQLServer		/var/lib/mysql/mysql.sock
+#MySQLServer		/tmp/mysql.sock
 #MySQLPort		
 #MySQLUser		dspam
 #MySQLPass		changeme
@@ -361,7 +362,7 @@
 # If you are using replication for clustering, you can also specify a separate
 # server to perform all writes to.
 #
-#MySQLWriteServer	/var/lib/mysql/mysql.sock
+#MySQLWriteServer	/tmp/mysql.sock
 #MySQLWritePort		
 #MySQLWriteUser		dspam
 #MySQLWritePass		changeme
@@ -406,7 +407,7 @@
 # in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
 # resits (without .s.PGSQL.5432).
 
-#PgSQLServer		/var/run/postgresql/
+#PgSQLServer		/tmp/
 #PgSQLPort		
 #PgSQLUser		dspam
 #PgSQLPass		changeme
@@ -845,14 +846,14 @@
 # you are running the client and server on the same machine, as it eliminates
 # much of the bandwidth overhead.
 #
-#ServerDomainSocketPath	"/tmp/dspam.sock"
+#ServerDomainSocketPath	"/var/run/dspam.sock"
 
 #
 # Client Mode: If you are running DSPAM in client/server mode, uncomment and
 # set these variables. A ClientHost beginning with a / will be treated as
 # a domain socket.
 #
-#ClientHost	/tmp/dspam.sock
+#ClientHost	/var/run/dspam.sock
 #ClientIdent	"secret@Relay1"
 #
 #ClientHost	127.0.0.1