1 diff -Nur postfix-2.0.16.orig/conf/main.cf postfix-2.0.16/conf/main.cf
2 --- postfix-2.0.16.orig/conf/main.cf Sat Sep 6 02:30:35 2003
3 +++ postfix-2.0.16/conf/main.cf Mon Dec 1 14:26:08 2003
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 -# manpage_directory: The location of the Postfix on-line manual pages.
103 -# sample_directory: The location of the Postfix sample configuration files.
107 -# readme_directory: The location of the Postfix README files.
110 +setgid_group = maildrop
111 diff -Nur postfix-2.0.16.orig/src/global/mail_params.h postfix-2.0.16/src/global/mail_params.h
112 --- postfix-2.0.16.orig/src/global/mail_params.h Mon Dec 1 14:25:29 2003
113 +++ postfix-2.0.16/src/global/mail_params.h Mon Dec 1 14:26:08 2003
115 extern gid_t var_owner_gid;
117 #define VAR_SGID_GROUP "setgid_group"
118 -#define DEF_SGID_GROUP "postdrop"
119 +#define DEF_SGID_GROUP "maildrop"
120 extern char *var_sgid_group;
121 extern gid_t var_sgid_gid;
125 #define VAR_CONFIG_DIR "config_directory"
126 #ifndef DEF_CONFIG_DIR
127 -#define DEF_CONFIG_DIR "/etc/postfix"
128 +#define DEF_CONFIG_DIR "/etc/mail"
130 extern char *var_config_dir;
132 diff -Nur postfix-2.0.16.orig/src/util/sys_defs.h postfix-2.0.16/src/util/sys_defs.h
133 --- postfix-2.0.16.orig/src/util/sys_defs.h Thu Sep 11 02:33:31 2003
134 +++ postfix-2.0.16/src/util/sys_defs.h Mon Dec 1 14:26:08 2003
138 #define DEF_DB_TYPE "hash"
139 -#define ALIAS_DB_MAP "hash:/etc/aliases"
140 +#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
142 #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
143 #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
144 diff -Nur postfix-2.0.16.orig/man/man1/postdrop.1 postfix-2.0.16/man/man1/postdrop.1
145 --- postfix-2.0.16.orig/man/man1/postdrop.1 Tue Jun 10 02:16:04 2003
146 +++ postfix-2.0.16/man/man1/postdrop.1 Mon Dec 1 14:26:08 2003
150 /var/spool/postfix, mail queue
151 -/etc/postfix, configuration files
152 +/etc/mail, configuration files
153 .SH CONFIGURATION PARAMETERS
156 diff -Nur postfix-2.0.16.orig/man/man1/postqueue.1 postfix-2.0.16/man/man1/postqueue.1
157 --- postfix-2.0.16.orig/man/man1/postqueue.1 Tue Jan 7 22:16:13 2003
158 +++ postfix-2.0.16/man/man1/postqueue.1 Mon Dec 1 14:26:08 2003
162 /var/spool/postfix, mail queue
163 -/etc/postfix, configuration files
164 +/etc/mail, configuration files
165 .SH CONFIGURATION PARAMETERS
168 diff -Nur postfix-2.0.16.orig/man/man1/sendmail.1 postfix-2.0.16/man/man1/sendmail.1
169 --- postfix-2.0.16.orig/man/man1/sendmail.1 Tue Jun 10 02:16:04 2003
170 +++ postfix-2.0.16/man/man1/sendmail.1 Mon Dec 1 14:26:08 2003
172 The message body MIME type: \fB7BIT\fR or \fB8BITMIME\fR.
173 .IP "\fB-C \fIconfig_file\fR (ignored :-)"
174 The path name of the \fBsendmail.cf\fR file. Postfix configuration
175 -files are kept in \fB/etc/postfix\fR.
176 +files are kept in \fB/etc/mail\fR.
177 .IP "\fB-F \fIfull_name\fR
178 Set the sender full name. This is used only with messages that
179 have no \fBFrom:\fR message header.
183 /var/spool/postfix, mail queue
184 -/etc/postfix, configuration files
185 +/etc/mail, configuration files
186 .SH CONFIGURATION PARAMETERS
189 diff -Nur postfix-2.0.16.orig/man/man5/access.5 postfix-2.0.16/man/man5/access.5
190 --- postfix-2.0.16.orig/man/man5/access.5 Tue Aug 12 18:13:05 2003
191 +++ postfix-2.0.16/man/man5/access.5 Mon Dec 1 14:27:35 2003
196 -\fBpostmap /etc/postfix/access\fR
197 +\fBpostmap /etc/mail/access\fR
199 -\fBpostmap -q "\fIstring\fB" /etc/postfix/access\fR
200 +\fBpostmap -q "\fIstring\fB" /etc/mail/access\fR
202 -\fBpostmap -q - /etc/postfix/access <\fIinputfile\fR
203 +\fBpostmap -q - /etc/mail/access <\fIinputfile\fR
208 that serves as input to the \fBpostmap\fR(1) command.
209 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
210 is used for fast searching by the mail system. Execute the command
211 -\fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
212 +\fBpostmap /etc/mail/access\fR in order to rebuild the indexed
213 file after changing the access table.
215 When the table is provided via other means such as NIS, LDAP
216 diff -Nur postfix-2.0.16.orig/man/man5/canonical.5 postfix-2.0.16/man/man5/canonical.5
217 --- postfix-2.0.16.orig/man/man5/canonical.5 Tue Aug 12 18:13:05 2003
218 +++ postfix-2.0.16/man/man5/canonical.5 Mon Dec 1 14:27:50 2003
223 -\fBpostmap /etc/postfix/canonical\fR
224 +\fBpostmap /etc/mail/canonical\fR
226 -\fBpostmap -q "\fIstring\fB" /etc/postfix/canonical\fR
227 +\fBpostmap -q "\fIstring\fB" /etc/mail/canonical\fR
229 -\fBpostmap -q - /etc/postfix/canonical <\fIinputfile\fR
230 +\fBpostmap -q - /etc/mail/canonical <\fIinputfile\fR
235 that serves as input to the \fBpostmap\fR(1) command.
236 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
237 is used for fast searching by the mail system. Execute the command
238 -\fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
239 +\fBpostmap /etc/mail/canonical\fR in order to rebuild the indexed
240 file after changing the text file.
242 When the table is provided via other means such as NIS, LDAP
243 diff -Nur postfix-2.0.16.orig/man/man5/pcre_table.5 postfix-2.0.16/man/man5/pcre_table.5
244 --- postfix-2.0.16.orig/man/man5/pcre_table.5 Mon Sep 8 14:36:26 2003
245 +++ postfix-2.0.16/man/man5/pcre_table.5 Mon Dec 1 14:28:06 2003
250 -\fBpcre:/etc/postfix/\fIfilename\fR
251 +\fBpcre:/etc/mail/\fIfilename\fR
253 -\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
254 +\fBpostmap -q "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
256 -\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
257 +\fBpostmap -q - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
261 diff -Nur postfix-2.0.16.orig/man/man5/regexp_table.5 postfix-2.0.16/man/man5/regexp_table.5
262 --- postfix-2.0.16.orig/man/man5/regexp_table.5 Fri Aug 1 01:03:34 2003
263 +++ postfix-2.0.16/man/man5/regexp_table.5 Mon Dec 1 14:28:18 2003
268 -\fBregexp:/etc/postfix/\fIfilename\fR
269 +\fBregexp:/etc/mail/\fIfilename\fR
271 -\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
272 +\fBpostmap -q "\fIstring\fB" regexp:/etc/mail/\fIfilename\fR
274 -\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
275 +\fBpostmap -q - regexp:/etc/mail/\fIfilename\fR <\fIinputfile\fR
279 diff -Nur postfix-2.0.16.orig/man/man5/relocated.5 postfix-2.0.16/man/man5/relocated.5
280 --- postfix-2.0.16.orig/man/man5/relocated.5 Tue Aug 12 18:13:05 2003
281 +++ postfix-2.0.16/man/man5/relocated.5 Mon Dec 1 14:26:08 2003
286 -\fBpostmap /etc/postfix/relocated\fR
287 +\fBpostmap /etc/mail/relocated\fR
292 that serves as input to the \fBpostmap\fR(1) command.
293 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
294 is used for fast searching by the mail system. Execute the command
295 -\fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
296 +\fBpostmap /etc/mail/relocated\fR in order to rebuild the indexed
297 file after changing the relocated table.
299 When the table is provided via other means such as NIS, LDAP
300 diff -Nur postfix-2.0.16.orig/man/man5/transport.5 postfix-2.0.16/man/man5/transport.5
301 --- postfix-2.0.16.orig/man/man5/transport.5 Tue Aug 12 18:13:05 2003
302 +++ postfix-2.0.16/man/man5/transport.5 Mon Dec 1 14:28:30 2003
307 -\fBpostmap /etc/postfix/transport\fR
308 +\fBpostmap /etc/mail/transport\fR
310 -\fBpostmap -q "\fIstring\fB" /etc/postfix/transport\fR
311 +\fBpostmap -q "\fIstring\fB" /etc/mail/transport\fR
313 -\fBpostmap -q - /etc/postfix/transport <\fIinputfile\fR
314 +\fBpostmap -q - /etc/mail/transport <\fIinputfile\fR
319 that serves as input to the \fBpostmap\fR(1) command.
320 The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
321 for fast searching by the mail system. Execute the command
322 -\fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
323 +\fBpostmap /etc/mail/transport\fR in order to rebuild the indexed
324 file after changing the transport table.
326 When the table is provided via other means such as NIS, LDAP
327 diff -Nur postfix-2.0.16.orig/man/man5/virtual.5 postfix-2.0.16/man/man5/virtual.5
328 --- postfix-2.0.16.orig/man/man5/virtual.5 Tue Aug 12 19:47:26 2003
329 +++ postfix-2.0.16/man/man5/virtual.5 Mon Dec 1 14:28:53 2003
334 -\fBpostmap /etc/postfix/virtual\fR
335 +\fBpostmap /etc/mail/virtual\fR
337 -\fBpostmap -q "\fIstring\fB" /etc/postfix/virtual\fR
338 +\fBpostmap -q "\fIstring\fB" /etc/mail/virtual\fR
340 -\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
341 +\fBpostmap -q - /etc/mail/virtual <\fIinputfile\fR
346 that serves as input to the \fBpostmap\fR(1) command.
347 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
348 is used for fast searching by the mail system. Execute the command
349 -\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
350 +\fBpostmap /etc/mail/virtual\fR in order to rebuild the indexed
351 file after changing the text file.
353 When the table is provided via other means such as NIS, LDAP
354 @@ -119,15 +119,15 @@
356 Support for a virtual alias domain looks like:
358 -/etc/postfix/main.cf:
361 -virtual_alias_maps = hash:/etc/postfix/virtual
362 +virtual_alias_maps = hash:/etc/mail/virtual
364 Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
365 See the output from \fBpostconf -m\fR for available database types.
368 -/etc/postfix/virtual:
372 \fIvirtual-alias.domain anything\fR (right-hand content does not matter)
373 diff -Nur postfix-2.0.16.orig/man/man8/cleanup.8 postfix-2.0.16/man/man8/cleanup.8
374 --- postfix-2.0.16.orig/man/man8/cleanup.8 Tue Aug 12 18:04:43 2003
375 +++ postfix-2.0.16/man/man8/cleanup.8 Mon Dec 1 14:26:08 2003
380 -/etc/postfix/canonical*, canonical mapping table
381 -/etc/postfix/virtual*, virtual mapping table
382 +/etc/mail/canonical*, canonical mapping table
383 +/etc/mail/virtual*, virtual mapping table
387 diff -Nur postfix-2.0.16.orig/man/man8/master.8 postfix-2.0.16/man/man8/master.8
388 --- postfix-2.0.16.orig/man/man8/master.8 Thu Dec 19 03:18:43 2002
389 +++ postfix-2.0.16/man/man8/master.8 Mon Dec 1 14:26:08 2003
394 -/etc/postfix/main.cf: global configuration file.
395 -/etc/postfix/master.cf: master process configuration file.
396 +/etc/mail/main.cf: global configuration file.
397 +/etc/mail/master.cf: master process configuration file.
398 /var/spool/postfix/pid/master.pid: master lock file.
401 diff -Nur postfix-2.0.16.orig/man/man8/proxymap.8 postfix-2.0.16/man/man8/proxymap.8
402 --- postfix-2.0.16.orig/man/man8/proxymap.8 Wed May 21 21:21:42 2003
403 +++ postfix-2.0.16/man/man8/proxymap.8 Mon Dec 1 14:26:59 2003
408 -proxy:mysql:/etc/postfix/virtual_alias.cf
409 +proxy:mysql:/etc/mail/virtual_alias.cf
411 The total number of connections is limited by the number of
412 proxymap server processes.
413 diff -Nur postfix-2.0.16.orig/man/man8/tlsmgr.8 postfix-2.0.16/man/man8/tlsmgr.8
414 --- postfix-2.0.16.orig/man/man8/tlsmgr.8 Mon Dec 1 14:25:29 2003
415 +++ postfix-2.0.16/man/man8/tlsmgr.8 Mon Dec 1 14:27:05 2003
417 .IP \fBtls_random_exchange_name\fR
418 Name of the file written by tlsmgr and read by smtp and smtpd at
419 startup. The length is 1024 bytes. Default value is
420 -/etc/postfix/prng_exch.
421 +/etc/mail/prng_exch.
422 .IP \fBtls_random_reseed_period\fR
423 Time in seconds until the next reseed from external sources is due.
424 This is the maximum value. The actual point in time is calculated