]>
Commit | Line | Data |
---|---|---|
bf21c84b JK |
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 | |
4 | @@ -38,7 +38,7 @@ | |
c1f75f47 JB |
5 | # daemon programs (i.e. programs listed in the master.cf file). This |
6 | # directory must be owned by root. | |
320b372d | 7 | # |
9e5ab0fc | 8 | -daemon_directory = /usr/libexec/postfix |
320b372d AM |
9 | +daemon_directory = /usr/lib/postfix |
10 | ||
11 | # QUEUE AND PROCESS OWNERSHIP | |
12 | # | |
bf21c84b | 13 | @@ -56,7 +56,7 @@ |
a281e397 AM |
14 | # These rights are used in the absence of a recipient user context. |
15 | # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. | |
16 | # | |
17 | -#default_privs = nobody | |
18 | +default_privs = nobody | |
19 | ||
20 | # INTERNET HOST AND DOMAIN NAMES | |
21 | # | |
bf21c84b | 22 | @@ -88,7 +88,7 @@ |
c1f75f47 JB |
23 | # myorigin also specifies the default domain name that is appended |
24 | # to recipient addresses that have no @domain part. | |
a281e397 | 25 | # |
35e20fbe | 26 | -#myorigin = $myhostname |
35e20fbe | 27 | +myorigin = $myhostname |
9e9007a1 | 28 | #myorigin = $mydomain |
a281e397 | 29 | |
a281e397 | 30 | # RECEIVING MAIL |
bf21c84b | 31 | @@ -372,7 +372,7 @@ |
a281e397 AM |
32 | # "postfix reload" to eliminate the delay. |
33 | # | |
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 | |
9e5ab0fc | 38 | #alias_maps = netinfo:/aliases |
a281e397 | 39 | |
bf21c84b | 40 | @@ -383,7 +383,7 @@ |
320b372d AM |
41 | # |
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 | |
47 | ||
4070b073 | 48 | # ADDRESS EXTENSIONS (e.g., user+foo) |
bf21c84b | 49 | @@ -411,7 +411,7 @@ |
35e20fbe AM |
50 | # UNIX-style mailboxes are kept. The default setting depends on the |
51 | # system type. | |
a281e397 | 52 | # |
447bfc58 | 53 | -#mail_spool_directory = /var/mail |
35e20fbe | 54 | +mail_spool_directory = /var/mail |
447bfc58 | 55 | #mail_spool_directory = /var/spool/mail |
a281e397 | 56 | |
35e20fbe | 57 | # The mailbox_command parameter specifies the optional external |
bf21c84b | 58 | @@ -433,8 +433,8 @@ |
4070b073 AF |
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. | |
61 | # | |
62 | -#mailbox_command = /some/where/procmail | |
63 | -#mailbox_command = /some/where/procmail -a "$EXTENSION" | |
64 | +#mailbox_command = /usr/bin/procmail | |
dbc4c78b | 65 | +#mailbox_command = /usr/bin/procmail -a "$EXTENSION" |
4070b073 AF |
66 | |
67 | # The mailbox_transport specifies the optional transport in master.cf | |
68 | # to use after processing aliases and .forward files. This parameter | |
0ccf72cf | 69 | @@ -588,44 +588,22 @@ |
c1f75f47 JB |
70 | # echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 |
71 | # >$config_directory/$process_name.$process_id.log & sleep 5 | |
320b372d | 72 | |
320b372d | 73 | +biff = no |
830ba608 | 74 | # INSTALL-TIME CONFIGURATION INFORMATION |
75 | # | |
76 | # The following parameters are used when installing a new Postfix version. | |
77 | -# | |
78 | -# sendmail_path: The full pathname of the Postfix sendmail command. | |
79 | -# This is the Sendmail-compatible mail posting interface. | |
80 | -# | |
81 | -sendmail_path = | |
82 | - | |
83 | -# newaliases_path: The full pathname of the Postfix newaliases command. | |
84 | -# This is the Sendmail-compatible command to build alias databases. | |
85 | -# | |
86 | -newaliases_path = | |
87 | - | |
88 | -# mailq_path: The full pathname of the Postfix mailq command. This | |
89 | -# is the Sendmail-compatible mail queue listing command. | |
90 | -# | |
91 | -mailq_path = | |
bf21c84b | 92 | |
830ba608 | 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. | |
96 | # | |
97 | -setgid_group = | |
98 | - | |
bf21c84b JK |
99 | -# html_directory: The location of the Postfix HTML documentation. |
100 | -# | |
101 | -html_directory = | |
102 | - | |
830ba608 | 103 | -# manpage_directory: The location of the Postfix on-line manual pages. |
104 | -# | |
105 | -manpage_directory = | |
106 | - | |
107 | -# sample_directory: The location of the Postfix sample configuration files. | |
bf21c84b | 108 | -# This parameter is obsolete as of Postfix 2.1. |
830ba608 | 109 | -# |
110 | -sample_directory = | |
bf21c84b JK |
111 | +setgid_group = maildrop |
112 | ||
830ba608 | 113 | -# readme_directory: The location of the Postfix README files. |
114 | -# | |
115 | -readme_directory = | |
0ccf72cf JR |
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. | |
119 | +# | |
1fc4ff6b | 120 | +# Contrary to what Wietse thinks (450) this should be 550 |
0ccf72cf JR |
121 | +# |
122 | +unknown_address_reject_code = 550 | |
123 | + | |
bf21c84b JK |
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 | |
127 | @@ -64,7 +64,7 @@ | |
128 | extern gid_t var_owner_gid; | |
129 | ||
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; | |
135 | ||
f6940bf1 JR |
136 | #@@ -231,7 +231,7 @@ |
137 | # */ | |
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" | |
142 | # #endif | |
143 | # extern char *var_config_dir; | |
144 | # | |
bf21c84b JK |
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 | |
148 | @@ -550,7 +550,7 @@ | |
149 | #define HAS_FSYNC | |
150 | #define HAS_DB | |
151 | #define DEF_DB_TYPE "hash" | |
152 | -#define ALIAS_DB_MAP "hash:/etc/aliases" | |
153 | +#define ALIAS_DB_MAP "hash:/etc/mail/aliases" | |
154 | #define HAS_NIS | |
155 | #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) | |
156 | #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" |