1 diff -dur postfix-2.1.3.orig/conf/main.cf postfix-2.1.3/conf/main.cf
2 --- postfix-2.1.3.orig/conf/main.cf 2004-06-06 23:53:58.000000000 +0200
3 +++ postfix-2.1.3/conf/main.cf 2004-06-22 14:23:20.533313840 +0200
5 # daemon programs (i.e. programs listed in the master.cf file). This
6 # directory must be owned by root.
8 -daemon_directory = /usr/libexec/postfix
9 +daemon_directory = /usr/lib/postfix
11 # QUEUE AND PROCESS OWNERSHIP
14 # These rights are used in the absence of a recipient user context.
15 # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
17 -#default_privs = nobody
18 +default_privs = nobody
20 # INTERNET HOST AND DOMAIN NAMES
23 # myorigin also specifies the default domain name that is appended
24 # to recipient addresses that have no @domain part.
26 -#myorigin = $myhostname
27 +myorigin = $myhostname
32 # "postfix reload" to eliminate the delay.
34 #alias_maps = dbm:/etc/aliases
35 -#alias_maps = hash:/etc/aliases
36 +alias_maps = hash:/etc/mail/aliases
37 #alias_maps = hash:/etc/aliases, nis:mail.aliases
38 #alias_maps = netinfo:/aliases
42 #alias_database = dbm:/etc/aliases
43 #alias_database = dbm:/etc/mail/aliases
44 -#alias_database = hash:/etc/aliases
45 +alias_database = hash:/etc/mail/aliases
46 #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
48 # ADDRESS EXTENSIONS (e.g., user+foo)
50 # UNIX-style mailboxes are kept. The default setting depends on the
53 -#mail_spool_directory = /var/mail
54 +mail_spool_directory = /var/mail
55 #mail_spool_directory = /var/spool/mail
57 # The mailbox_command parameter specifies the optional external
59 # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
60 # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
62 -#mailbox_command = /some/where/procmail
63 -#mailbox_command = /some/where/procmail -a "$EXTENSION"
64 +#mailbox_command = /usr/bin/procmail
65 +#mailbox_command = /usr/bin/procmail -a "$EXTENSION"
67 # The mailbox_transport specifies the optional transport in master.cf
68 # to use after processing aliases and .forward files. This parameter
70 # echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
71 # >$config_directory/$process_name.$process_id.log & sleep 5
74 # INSTALL-TIME CONFIGURATION INFORMATION
76 # The following parameters are used when installing a new Postfix version.
78 -# sendmail_path: The full pathname of the Postfix sendmail command.
79 -# This is the Sendmail-compatible mail posting interface.
83 -# newaliases_path: The full pathname of the Postfix newaliases command.
84 -# This is the Sendmail-compatible command to build alias databases.
88 -# mailq_path: The full pathname of the Postfix mailq command. This
89 -# is the Sendmail-compatible mail queue listing command.
93 # setgid_group: The group for mail submission and queue management
94 # commands. This must be a group name with a numerical group ID that
95 # is not shared with other accounts, not even with the Postfix account.
99 -# html_directory: The location of the Postfix HTML documentation.
103 -# manpage_directory: The location of the Postfix on-line manual pages.
107 -# sample_directory: The location of the Postfix sample configuration files.
108 -# This parameter is obsolete as of Postfix 2.1.
111 +setgid_group = maildrop
113 -# readme_directory: The location of the Postfix README files.
116 +# The unknown_address_reject_code parameter specifies the SMTP server
117 +# response when a client violates the reject_unknown_sender_domain
118 +# or reject_unknown_recipient_domain restrictions.
120 +# Contrary to what Wietse thinks (450) this should be 550
122 +unknown_address_reject_code = 550
124 diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
125 --- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200
126 +++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200
128 extern gid_t var_owner_gid;
130 #define VAR_SGID_GROUP "setgid_group"
131 -#define DEF_SGID_GROUP "postdrop"
132 +#define DEF_SGID_GROUP "maildrop"
133 extern char *var_sgid_group;
134 extern gid_t var_sgid_gid;
138 # #define VAR_CONFIG_DIR "config_directory"
139 # #ifndef DEF_CONFIG_DIR
140 #-#define DEF_CONFIG_DIR "/etc/postfix"
141 #+#define DEF_CONFIG_DIR "/etc/mail"
143 # extern char *var_config_dir;
145 diff -dur postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
146 --- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 14:20:58.094573821 +0200
147 +++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 14:21:17.966421952 +0200
151 #define DEF_DB_TYPE "hash"
152 -#define ALIAS_DB_MAP "hash:/etc/aliases"
153 +#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
155 #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
156 #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"