diff -upk.orig postfix-2.2.4.orig/conf/main.cf postfix-2.2.4/conf/main.cf

--- postfix-2.2.4.orig/conf/main.cf	2005-06-23 12:37:33 +0000

+++ postfix-2.2.4/conf/main.cf	2005-06-23 12:46:35 +0000

@@ -20,44 +20,6 @@

 #

 #soft_bounce = no

-# LOCAL PATHNAME INFORMATION

-#

-# The queue_directory specifies the location of the Postfix queue.

-# This is also the root directory of Postfix daemons that run chrooted.

-# See the files in examples/chroot-setup for setting up Postfix chroot

-# environments on different UNIX systems.

-#

-queue_directory = /var/spool/postfix

-

-# The command_directory parameter specifies the location of all

-# postXXX commands.

-#

-command_directory = /usr/sbin

-

-# The daemon_directory parameter specifies the location of all Postfix

-# daemon programs (i.e. programs listed in the master.cf file). This

-# directory must be owned by root.

-#

-daemon_directory = /usr/libexec/postfix

-

-# QUEUE AND PROCESS OWNERSHIP

-#

-# The mail_owner parameter specifies the owner of the Postfix queue

-# and of most Postfix daemon processes.  Specify the name of a user

-# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS

-# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In

-# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED

-# USER.

-#

-mail_owner = postfix

-

-# The default_privs parameter specifies the default rights used by

-# the local delivery agent for delivery to external file or command.

-# These rights are used in the absence of a recipient user context.

-# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.

-#

-#default_privs = postman

-

 # INTERNET HOST AND DOMAIN NAMES

 # 

 # The myhostname parameter specifies the internet hostname of this

@@ -154,6 +116,7 @@ mail_owner = postfix

 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain

 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,

 #	mail.$mydomain, www.$mydomain, ftp.$mydomain

+mydestination = localhost, $myhostname, localhost.$mydomain, $config_directory/mydestination

 # REJECTING MAIL FOR UNKNOWN LOCAL USERS

 #

@@ -403,7 +366,7 @@ unknown_local_recipient_reject_code = 55

 #

 #home_mailbox = Mailbox

 #home_mailbox = Maildir/

- 

+

 # The mail_spool_directory parameter specifies the directory where

 # UNIX-style mailboxes are kept. The default setting depends on the

 # system type.

@@ -430,8 +393,8 @@ unknown_local_recipient_reject_code = 55

 # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN

 # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.

 #

-#mailbox_command = /some/where/procmail

-#mailbox_command = /some/where/procmail -a "$EXTENSION"

+#mailbox_command = /usr/bin/procmail -a "$EXTENSION"

+mailbox_command = /usr/bin/procmail -a $DOMAIN -d $LOGNAME

 # The mailbox_transport specifies the optional transport in master.cf

 # to use after processing aliases and .forward files. This parameter

@@ -491,7 +454,7 @@ unknown_local_recipient_reject_code = 55

 #luser_relay = $user@other.host

 #luser_relay = $local@other.host

 #luser_relay = admin+$local

-  

+

 # JUNK MAIL CONTROLS

 # 

 # The controls listed here are only a very small subset. The file

@@ -534,6 +497,40 @@ unknown_local_recipient_reject_code = 55

 #smtpd_banner = $myhostname ESMTP $mail_name

 #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)

+# The smtpd_etrn_restrictions parameter restricts what clients are

+# allowed to issue the ETRN command.

+#

+# The Postfix ETRN command accepts only destinations that are eligible

+# for the Postfix "fast flush" service. See the sample-flush.cf file

+# for details.

+#

+# The default is to allow ETRN from any host.  The following restrictions

+# are available:

+#

+#   reject_unknown_client: reject the request if the client hostname is unknown.

+#   permit_mynetworks: permit if the client address matches $mynetworks.

+#   check_client_access maptype:mapname

+#	look up client name, parent domains, client address,

+#	or networks obtained by stripping octets.

+#	see access(5) for possible lookup results.

+#   reject_rbl_client domain.tld: reject if the reverse client network

+#	address is listed in an A record under domain.tld.

+#   reject_rhsbl_client domain.tld: reject if the client hostname is listed

+#	in an A record under domain.tld.

+#   reject: reject the request. Place this at the end of a restriction.

+#   permit: permit the request. Place this at the end of a restriction.

+#   warn_if_reject: next restriction logs a warning instead of rejecting.

+#

+# You may also list any helo or client restrictions here (see below).

+#

+smtpd_etrn_restrictions = permit_mynetworks, reject

+

+# The smtpd_helo_required parameter optionally turns on the requirement

+# that SMTP clients must introduce themselves at the beginning of an

+# SMTP session.

+#

+smtpd_helo_required = yes

+

 # PARALLEL DELIVERY TO THE SAME DESTINATION

 #

 # How many parallel deliveries to the same user or domain? With local

@@ -551,91 +548,6 @@ unknown_local_recipient_reject_code = 55

 #local_destination_concurrency_limit = 2

 #default_destination_concurrency_limit = 20

-# DEBUGGING CONTROL

-#

-# The debug_peer_level parameter specifies the increment in verbose

-# logging level when an SMTP client or server host name or address

-# matches a pattern in the debug_peer_list parameter.

-#

-debug_peer_level = 2

-

-# The debug_peer_list parameter specifies an optional list of domain

-# or network patterns, /file/name patterns or type:name tables. When

-# an SMTP client or server host name or address matches a pattern,

-# increase the verbose logging level by the amount specified in the

-# debug_peer_level parameter.

-#

-#debug_peer_list = 127.0.0.1

-#debug_peer_list = some.domain

-

-# The debugger_command specifies the external command that is executed

-# when a Postfix daemon program is run with the -D option.

-#

-# Use "command .. & sleep 5" so that the debugger can attach before

-# the process marches on. If you use an X-based debugger, be sure to

-# set up your XAUTHORITY environment variable before starting Postfix.

-#

-debugger_command =

-	 PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin

-	 xxgdb $daemon_directory/$process_name $process_id & sleep 5

-

-# If you can't use X, use this to capture the call stack when a

-# daemon crashes. The result is in a file in the configuration

-# directory, and is named after the process name and the process ID.

-#

-# debugger_command =

-#	PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont;

-#	echo where) | gdb $daemon_directory/$process_name $process_id 2>&1

-#	>$config_directory/$process_name.$process_id.log & sleep 5

-#

-# Another possibility is to run gdb under a detached screen session.

-# To attach to the screen sesssion, su root and run "screen -r

-# <id_string>" where <id_string> uniquely matches one of the detached

-# sessions (from "screen -list").

-#

-# debugger_command =

-#	PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen

-#	-dmS $process_name gdb $daemon_directory/$process_name

-#	$process_id & sleep 1

 # INSTALL-TIME CONFIGURATION INFORMATION

 #

-# The following parameters are used when installing a new Postfix version.

-# 

-# sendmail_path: The full pathname of the Postfix sendmail command.

-# This is the Sendmail-compatible mail posting interface.

-# 

-sendmail_path =

-

-# newaliases_path: The full pathname of the Postfix newaliases command.

-# This is the Sendmail-compatible command to build alias databases.

-#

-newaliases_path =

-

-# mailq_path: The full pathname of the Postfix mailq command.  This

-# is the Sendmail-compatible mail queue listing command.

-# 

-mailq_path =

-

-# setgid_group: The group for mail submission and queue management

-# commands.  This must be a group name with a numerical group ID that

-# is not shared with other accounts, not even with the Postfix account.

-#

-setgid_group =

-

-# html_directory: The location of the Postfix HTML documentation.

-#

-html_directory =

-

-# manpage_directory: The location of the Postfix on-line manual pages.

-#

-manpage_directory =

-

-# sample_directory: The location of the Postfix sample configuration files.

-# This parameter is obsolete as of Postfix 2.1.

-#

-sample_directory =

-

-# readme_directory: The location of the Postfix README files.

-#

-readme_directory =