-diff -uNr amavisd-new-20030616/amavisd.conf amavisd-new-20030616~/amavisd.conf
---- amavisd-new-20030616/amavisd.conf Tue Mar 9 03:21:38 2004
-+++ amavisd-new-20030616~/amavisd.conf Sat Mar 13 17:13:34 2004
-@@ -51,19 +51,24 @@
- # $MYHOME serves as a quick default for some other configuration settings.
- # More refined control is available with each individual setting further down.
- # $MYHOME is not used directly by the program. No trailing slash!
--#$MYHOME = '/var/lib/amavis'; # (default is '/var/amavis')
-+$MYHOME = '/var/spool/amavis/runtime'; # (default is '/var/amavis')
-
- # $mydomain serves as a quick default for some other configuration settings.
- # More refined control is available with each individual setting further down.
- # $mydomain is never used directly by the program.
--$mydomain = 'example.com'; # (no useful default)
-+# $mydomain = 'example.com'; # (no useful default)
+--- ./amavisd.conf-sample.org 2006-08-03 09:46:31.000000000 +0000
++++ ./amavisd.conf-sample 2006-08-03 09:52:09.000000000 +0000
+@@ -82,7 +82,7 @@
+ # (no trailing slash, may be a scratch file system)
+ $TEMPBASE = "$MYHOME/runtime"; # prefer to keep home dir /var/amavis clean?
+
+-#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
++$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
+
+ # $helpers_home sets environment variable HOME, and is passed as option
+ # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
+@@ -92,8 +92,8 @@
+ # Run the daemon in the specified chroot jail if nonempty:
+ #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot), -R
+
+-#$pid_file = "$MYHOME/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
+-#$lock_file = "$MYHOME/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
++$pid_file = "/var/run/amavisd/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
++$lock_file = "/var/run/amavisd/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
+
+ # set environment variables if you want (no defaults):
+ $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
+@@ -111,6 +111,8 @@
+ #$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail
+ #$notify_method = $forward_method; # where to submit notifications
+
++#@auth_mech_avail = ('PLAIN','LOGIN'); # empty list disables incoming AUTH