]>
Commit | Line | Data |
---|---|---|
5a9aead1 AG |
1 | diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h |
2 | --- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200 | |
3 | +++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200 | |
4 | @@ -64,7 +64,7 @@ | |
5 | extern gid_t var_owner_gid; | |
6 | ||
7 | #define VAR_SGID_GROUP "setgid_group" | |
8 | -#define DEF_SGID_GROUP "postdrop" | |
9 | +#define DEF_SGID_GROUP "maildrop" | |
10 | extern char *var_sgid_group; | |
11 | extern gid_t var_sgid_gid; | |
12 | ||
13 | #@@ -231,7 +231,7 @@ | |
14 | # */ | |
15 | # #define VAR_CONFIG_DIR "config_directory" | |
16 | # #ifndef DEF_CONFIG_DIR | |
17 | #-#define DEF_CONFIG_DIR "/etc/postfix" | |
18 | #+#define DEF_CONFIG_DIR "/etc/mail" | |
19 | # #endif | |
20 | # extern char *var_config_dir; | |
21 | # | |
22 | --- postfix-2.9.0/conf/main.cf.orig 2012-02-04 19:05:20.960656539 +0100 | |
23 | +++ postfix-2.9.0/conf/main.cf 2012-02-04 19:12:31.810624906 +0100 | |
24 | @@ -39,7 +39,7 @@ | |
c1f75f47 JB |
25 | # daemon programs (i.e. programs listed in the master.cf file). This |
26 | # directory must be owned by root. | |
320b372d | 27 | # |
9e5ab0fc | 28 | -daemon_directory = /usr/libexec/postfix |
320b372d AM |
29 | +daemon_directory = /usr/lib/postfix |
30 | ||
5a9aead1 AG |
31 | # The data_directory parameter specifies the location of Postfix-writable |
32 | # data files (caches, random numbers). This directory must be owned | |
33 | @@ -63,7 +63,7 @@ | |
a281e397 AM |
34 | # These rights are used in the absence of a recipient user context. |
35 | # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. | |
36 | # | |
37 | -#default_privs = nobody | |
38 | +default_privs = nobody | |
39 | ||
40 | # INTERNET HOST AND DOMAIN NAMES | |
41 | # | |
5a9aead1 | 42 | @@ -95,7 +95,7 @@ |
c1f75f47 JB |
43 | # myorigin also specifies the default domain name that is appended |
44 | # to recipient addresses that have no @domain part. | |
a281e397 | 45 | # |
35e20fbe | 46 | -#myorigin = $myhostname |
35e20fbe | 47 | +myorigin = $myhostname |
9e9007a1 | 48 | #myorigin = $mydomain |
a281e397 | 49 | |
a281e397 | 50 | # RECEIVING MAIL |
5a9aead1 | 51 | @@ -379,7 +379,7 @@ |
a281e397 AM |
52 | # "postfix reload" to eliminate the delay. |
53 | # | |
54 | #alias_maps = dbm:/etc/aliases | |
55 | -#alias_maps = hash:/etc/aliases | |
56 | +alias_maps = hash:/etc/mail/aliases | |
57 | #alias_maps = hash:/etc/aliases, nis:mail.aliases | |
9e5ab0fc | 58 | #alias_maps = netinfo:/aliases |
a281e397 | 59 | |
5a9aead1 | 60 | @@ -390,7 +390,7 @@ |
320b372d AM |
61 | # |
62 | #alias_database = dbm:/etc/aliases | |
63 | #alias_database = dbm:/etc/mail/aliases | |
64 | -#alias_database = hash:/etc/aliases | |
65 | +alias_database = hash:/etc/mail/aliases | |
66 | #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases | |
67 | ||
4070b073 | 68 | # ADDRESS EXTENSIONS (e.g., user+foo) |
5a9aead1 | 69 | @@ -418,7 +418,7 @@ |
35e20fbe AM |
70 | # UNIX-style mailboxes are kept. The default setting depends on the |
71 | # system type. | |
a281e397 | 72 | # |
447bfc58 | 73 | -#mail_spool_directory = /var/mail |
35e20fbe | 74 | +mail_spool_directory = /var/mail |
447bfc58 | 75 | #mail_spool_directory = /var/spool/mail |
a281e397 | 76 | |
35e20fbe | 77 | # The mailbox_command parameter specifies the optional external |
5a9aead1 | 78 | @@ -440,8 +440,8 @@ |
4070b073 AF |
79 | # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN |
80 | # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. | |
81 | # | |
82 | -#mailbox_command = /some/where/procmail | |
83 | -#mailbox_command = /some/where/procmail -a "$EXTENSION" | |
84 | +#mailbox_command = /usr/bin/procmail | |
dbc4c78b | 85 | +#mailbox_command = /usr/bin/procmail -a "$EXTENSION" |
4070b073 AF |
86 | |
87 | # The mailbox_transport specifies the optional transport in master.cf | |
88 | # to use after processing aliases and .forward files. This parameter | |
5a9aead1 AG |
89 | @@ -613,45 +613,24 @@ |
90 | # -dmS $process_name gdb $daemon_directory/$process_name | |
91 | # $process_id & sleep 1 | |
320b372d | 92 | |
320b372d | 93 | +biff = no |
5a9aead1 | 94 | + |
830ba608 | 95 | # INSTALL-TIME CONFIGURATION INFORMATION |
96 | # | |
97 | # The following parameters are used when installing a new Postfix version. | |
98 | -# | |
99 | -# sendmail_path: The full pathname of the Postfix sendmail command. | |
100 | -# This is the Sendmail-compatible mail posting interface. | |
101 | -# | |
102 | -sendmail_path = | |
103 | - | |
104 | -# newaliases_path: The full pathname of the Postfix newaliases command. | |
105 | -# This is the Sendmail-compatible command to build alias databases. | |
106 | -# | |
107 | -newaliases_path = | |
108 | - | |
109 | -# mailq_path: The full pathname of the Postfix mailq command. This | |
110 | -# is the Sendmail-compatible mail queue listing command. | |
111 | -# | |
112 | -mailq_path = | |
bf21c84b | 113 | |
830ba608 | 114 | # setgid_group: The group for mail submission and queue management |
115 | # commands. This must be a group name with a numerical group ID that | |
116 | # is not shared with other accounts, not even with the Postfix account. | |
117 | # | |
118 | -setgid_group = | |
5a9aead1 AG |
119 | +setgid_group = maildrop |
120 | ||
bf21c84b JK |
121 | -# html_directory: The location of the Postfix HTML documentation. |
122 | -# | |
123 | -html_directory = | |
124 | - | |
830ba608 | 125 | -# manpage_directory: The location of the Postfix on-line manual pages. |
126 | -# | |
127 | -manpage_directory = | |
5a9aead1 AG |
128 | +inet_protocols = ipv4 |
129 | ||
830ba608 | 130 | -# sample_directory: The location of the Postfix sample configuration files. |
bf21c84b | 131 | -# This parameter is obsolete as of Postfix 2.1. |
0ccf72cf JR |
132 | +# The unknown_address_reject_code parameter specifies the SMTP server |
133 | +# response when a client violates the reject_unknown_sender_domain | |
134 | +# or reject_unknown_recipient_domain restrictions. | |
5a9aead1 AG |
135 | # |
136 | -sample_directory = | |
137 | - | |
138 | -# readme_directory: The location of the Postfix README files. | |
1fc4ff6b | 139 | +# Contrary to what Wietse thinks (450) this should be 550 |
5a9aead1 AG |
140 | # |
141 | -readme_directory = | |
142 | -inet_protocols = ipv4 | |
0ccf72cf | 143 | +unknown_address_reject_code = 550 |
5a9aead1 AG |
144 | --- postfix-2.9.0/src/util/sys_defs.h.orig 2012-02-04 19:05:23.000000000 +0100 |
145 | +++ postfix-2.9.0/src/util/sys_defs.h 2012-02-04 19:15:31.153933031 +0100 | |
146 | @@ -54,7 +54,7 @@ | |
147 | #define ALIAS_DB_MAP "hash:/etc/mail/aliases" /* OpenBSD 2.7 */ | |
148 | #endif | |
149 | #ifndef ALIAS_DB_MAP | |
bf21c84b JK |
150 | -#define ALIAS_DB_MAP "hash:/etc/aliases" |
151 | +#define ALIAS_DB_MAP "hash:/etc/mail/aliases" | |
5a9aead1 | 152 | #endif |
bf21c84b JK |
153 | #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) |
154 | #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" |