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/man/man1/postconf.1 postfix-2.1.3/man/man1/postconf.1
125 --- postfix-2.1.3.orig/man/man1/postconf.1 2004-04-22 21:27:05.000000000 +0200
126 +++ postfix-2.1.3/man/man1/postconf.1 2004-06-22 14:25:06.710151423 +0200
131 -/etc/postfix/main.cf, Postfix configuration parameters
132 +/etc/mail/main.cf, Postfix configuration parameters
136 --- postfix-2.2.2/man/man1/postfix.1.orig 2005-02-22 13:44:48.000000000 +0100
137 +++ postfix-2.2.2/man/man1/postfix.1 2005-04-26 11:24:46.000000000 +0200
139 already installed Postfix system.
141 This feature is available in Postfix 2.1 and later. With
142 -Postfix 2.0 and earlier, use "\fB/etc/postfix/post-install
143 +Postfix 2.0 and earlier, use "\fB/etc/mail/post-install
145 .IP "\fBupgrade-configuration\fR \fB[\fIname\fR=\fIvalue ...\fB]\fR
146 Update the \fBmain.cf\fR and \fBmaster.cf\fR files with information
148 main.cf configuration parameters.
150 This feature is available in Postfix 2.1 and later. With
151 -Postfix 2.0 and earlier, use "\fB/etc/postfix/post-install
152 +Postfix 2.0 and earlier, use "\fB/etc/mail/post-install
153 upgrade-configuration\fR".
155 The following options are implemented:
156 @@ -155,11 +155,11 @@
160 -/etc/postfix/main.cf, Postfix configuration parameters
161 -/etc/postfix/master.cf, Postfix daemon processes
162 -/etc/postfix/postfix-files, file/directory permissions
163 -/etc/postfix/postfix-script, administrative commands
164 -/etc/postfix/post-install, post-installation configuration
165 +/etc/mail/main.cf, Postfix configuration parameters
166 +/etc/mail/master.cf, Postfix daemon processes
167 +/etc/mail/postfix-files, file/directory permissions
168 +/etc/mail/postfix-script, administrative commands
169 +/etc/mail/post-install, post-installation configuration
173 diff -dur postfix-2.1.3.orig/man/man1/sendmail.1 postfix-2.1.3/man/man1/sendmail.1
174 --- postfix-2.1.3.orig/man/man1/sendmail.1 2004-04-14 03:56:07.000000000 +0200
175 +++ postfix-2.1.3/man/man1/sendmail.1 2004-06-22 14:25:58.213160652 +0200
179 /var/spool/postfix, mail queue
180 -/etc/postfix, configuration files
181 +/etc/mail, configuration files
185 --- postfix-2.2.2/man/man5/access.5.orig 2005-02-05 00:50:56.000000000 +0100
186 +++ postfix-2.2.2/man/man5/access.5 2005-04-26 11:21:22.000000000 +0200
191 -\fBpostmap /etc/postfix/access\fR
192 +\fBpostmap /etc/mail/access\fR
194 -\fBpostmap -q "\fIstring\fB" /etc/postfix/access\fR
195 +\fBpostmap -q "\fIstring\fB" /etc/mail/access\fR
197 -\fBpostmap -q - /etc/postfix/access <\fIinputfile\fR
198 +\fBpostmap -q - /etc/mail/access <\fIinputfile\fR
203 that serves as input to the \fBpostmap\fR(1) command.
204 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
205 is used for fast searching by the mail system. Execute the command
206 -"\fBpostmap /etc/postfix/access\fR" in order to rebuild the indexed
207 +"\fBpostmap /etc/mail/access\fR" in order to rebuild the indexed
208 file after changing the access table.
210 When the table is provided via other means such as NIS, LDAP
211 @@ -318,20 +318,20 @@
215 -/etc/postfix/main.cf:
218 smtpd_client_restrictions =
220 -check_client_access hash:/etc/postfix/access
221 +check_client_access hash:/etc/mail/access
224 -/etc/postfix/access:
231 -Execute the command "\fBpostmap /etc/postfix/access\fR" after
232 +Execute the command "\fBpostmap /etc/mail/access\fR" after
236 --- postfix-2.2.2/man/man5/canonical.5.orig 2005-03-09 21:05:01.000000000 +0100
237 +++ postfix-2.2.2/man/man5/canonical.5 2005-04-26 11:21:34.000000000 +0200
242 -\fBpostmap /etc/postfix/canonical\fR
243 +\fBpostmap /etc/mail/canonical\fR
245 -\fBpostmap -q "\fIstring\fB" /etc/postfix/canonical\fR
246 +\fBpostmap -q "\fIstring\fB" /etc/mail/canonical\fR
248 -\fBpostmap -q - /etc/postfix/canonical <\fIinputfile\fR
249 +\fBpostmap -q - /etc/mail/canonical <\fIinputfile\fR
254 that serves as input to the \fBpostmap\fR(1) command.
255 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
256 is used for fast searching by the mail system. Execute the command
257 -"\fBpostmap /etc/postfix/canonical\fR" in order to rebuild the indexed
258 +"\fBpostmap /etc/mail/canonical\fR" in order to rebuild the indexed
259 file after changing the text file.
261 When the table is provided via other means such as NIS, LDAP
262 diff -dur postfix-2.1.3.orig/man/man5/cidr_table.5 postfix-2.1.3/man/man5/cidr_table.5
263 --- postfix-2.1.3.orig/man/man5/cidr_table.5 2004-04-16 15:17:25.000000000 +0200
264 +++ postfix-2.1.3/man/man5/cidr_table.5 2004-06-22 14:28:40.742716008 +0200
269 -\fBpostmap -q "\fIstring\fB" cidr:/etc/postfix/\fIfilename\fR
270 +\fBpostmap -q "\fIstring\fB" cidr:/etc/mail/\fIfilename\fR
272 -\fBpostmap -q - cidr:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
273 +\fBpostmap -q - cidr:/etc/mail/\fIfilename\fR <\fIinputfile\fR
278 .SH "EXAMPLE SMTPD ACCESS MAP"
281 -/etc/postfix/main.cf:
284 -smtpd_client_restrictions = ... cidr:/etc/postfix/client.cidr ...
285 +smtpd_client_restrictions = ... cidr:/etc/mail/client.cidr ...
287 -/etc/postfix/client.cidr:
288 +/etc/mail/client.cidr:
290 # Rule order matters. Put more specific whitelist entries
291 # before more general blacklist entries.
292 --- postfix-2.2.2/man/man5/generic.5.orig 2005-02-12 02:01:06.000000000 +0100
293 +++ postfix-2.2.2/man/man5/generic.5 2005-04-26 11:27:39.000000000 +0200
298 -\fBpostmap /etc/postfix/generic\fR
299 +\fBpostmap /etc/mail/generic\fR
301 -\fBpostmap -q "\fIstring\fB" /etc/postfix/generic\fR
302 +\fBpostmap -q "\fIstring\fB" /etc/mail/generic\fR
304 -\fBpostmap -q - /etc/postfix/generic <\fIinputfile\fR
305 +\fBpostmap -q - /etc/mail/generic <\fIinputfile\fR
310 text file that serves as input to the \fBpostmap\fR(1)
311 command. The result, an indexed file in \fBdbm\fR or
312 \fBdb\fR format, is used for fast searching by the mail
313 -system. Execute the command "\fBpostmap /etc/postfix/generic\fR"
314 +system. Execute the command "\fBpostmap /etc/mail/generic\fR"
315 in order to rebuild the indexed file after changing the
318 @@ -164,12 +164,12 @@
322 -/etc/postfix/main.cf:
325 - smtp_generic_maps = hash:/etc/postfix/generic
326 + smtp_generic_maps = hash:/etc/mail/generic
329 -/etc/postfix/generic:
332 his@localdomain.local hisaccount@hisisp.example
333 her@localdomain.local heraccount@herisp.example
338 -Execute the command "\fBpostmap /etc/postfix/generic\fR"
339 +Execute the command "\fBpostmap /etc/mail/generic\fR"
340 whenever the table is changed. Instead of \fBhash\fR, some
341 systems use \fBdbm\fR database files. To find out what
342 tables your system supports use the command "\fBpostconf
343 diff -dur postfix-2.1.3.orig/man/man5/header_checks.5 postfix-2.1.3/man/man5/header_checks.5
344 --- postfix-2.1.3.orig/man/man5/header_checks.5 2004-05-07 21:25:22.000000000 +0200
345 +++ postfix-2.1.3/man/man5/header_checks.5 2004-06-22 14:28:52.575028045 +0200
350 -\fBheader_checks = pcre:/etc/postfix/header_checks\fR
351 +\fBheader_checks = pcre:/etc/mail/header_checks\fR
353 -\fBmime_header_checks = pcre:/etc/postfix/mime_header_checks\fR
354 +\fBmime_header_checks = pcre:/etc/mail/mime_header_checks\fR
356 -\fBnested_header_checks = pcre:/etc/postfix/nested_header_checks\fR
357 +\fBnested_header_checks = pcre:/etc/mail/nested_header_checks\fR
359 -\fBbody_checks = pcre:/etc/postfix/body_checks\fR
360 +\fBbody_checks = pcre:/etc/mail/body_checks\fR
362 -\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
363 +\fBpostmap -fq "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
365 -\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
366 +\fBpostmap -fq - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
370 @@ -274,11 +274,11 @@
374 -/etc/postfix/main.cf:
377 -header_checks = regexp:/etc/postfix/header_checks
378 +header_checks = regexp:/etc/mail/header_checks
380 -/etc/postfix/header_checks:
381 +/etc/mail/header_checks:
383 /^content-(type|disposition):.*name[[:space:]]*=.*\\.(exe|vbs)/
385 @@ -290,11 +290,11 @@
389 -/etc/postfix/main.cf:
392 -body_checks = regexp:/etc/postfix/body_checks
393 +body_checks = regexp:/etc/mail/body_checks
395 -/etc/postfix/body_checks:
396 +/etc/mail/body_checks:
398 /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
400 diff -dur postfix-2.1.3.orig/man/man5/ldap_table.5 postfix-2.1.3/man/man5/ldap_table.5
401 --- postfix-2.1.3.orig/man/man5/ldap_table.5 2004-04-16 16:50:00.000000000 +0200
402 +++ postfix-2.1.3/man/man5/ldap_table.5 2004-06-22 14:28:58.307694713 +0200
407 -\fBpostmap -q "\fIstring\fB" ldap:/etc/postfix/filename\fR
408 +\fBpostmap -q "\fIstring\fB" ldap:/etc/mail/filename\fR
410 -\fBpostmap -q - ldap:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
411 +\fBpostmap -q - ldap:/etc/mail/\fIfilename\fR <\fIinputfile\fR
416 In order to use LDAP lookups, define an LDAP source as a lookup
417 table in main.cf, for example:
419 -alias_maps = ldap:/etc/postfix/ldap-aliases.cf
420 +alias_maps = ldap:/etc/mail/ldap-aliases.cf
422 -The file /etc/postfix/ldap-aliases.cf has the same format as
423 +The file /etc/mail/ldap-aliases.cf has the same format as
424 the Postfix main.cf file, and can specify the parameters
425 described below. An example is given at the end of this manual.
428 and "@domain" lookups are not performed. This can significantly
429 reduce the query load on the LDAP server.
431 -domain = postfix.org, hash:/etc/postfix/searchdomains
432 +domain = postfix.org, hash:/etc/mail/searchdomains
434 It is best not to use LDAP to store the domains eligible
438 alias_maps = hash:/etc/aliases,
440 -ldap:/etc/postfix/ldap-aliases.cf
441 +ldap:/etc/mail/ldap-aliases.cf
443 -and in ldap:/etc/postfix/ldap-aliases.cf you have:
444 +and in ldap:/etc/mail/ldap-aliases.cf you have:
446 server_host = ldap.my.com
448 diff -dur postfix-2.1.3.orig/man/man5/mysql_table.5 postfix-2.1.3/man/man5/mysql_table.5
449 --- postfix-2.1.3.orig/man/man5/mysql_table.5 2004-04-14 16:27:48.000000000 +0200
450 +++ postfix-2.1.3/man/man5/mysql_table.5 2004-06-22 14:29:04.905311074 +0200
455 -\fBpostmap -q "\fIstring\fB" mysql:/etc/postfix/filename\fR
456 +\fBpostmap -q "\fIstring\fB" mysql:/etc/mail/filename\fR
458 -\fBpostmap -q - mysql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
459 +\fBpostmap -q - mysql:/etc/mail/\fIfilename\fR <\fIinputfile\fR
465 alias_maps = mysql:/etc/mysql-aliases.cf
467 -The file /etc/postfix/mysql-aliases.cf has the same format as
468 +The file /etc/mail/mysql-aliases.cf has the same format as
469 the Postfix main.cf file, and can specify the parameters
471 .SH "ALTERNATIVE CONFIGURATION"
472 diff -dur postfix-2.1.3.orig/man/man5/pcre_table.5 postfix-2.1.3/man/man5/pcre_table.5
473 --- postfix-2.1.3.orig/man/man5/pcre_table.5 2004-04-14 16:27:48.000000000 +0200
474 +++ postfix-2.1.3/man/man5/pcre_table.5 2004-06-22 14:26:40.727691077 +0200
479 -\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
480 +\fBpostmap -fq "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
482 -\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
483 +\fBpostmap -fq - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
487 diff -dur postfix-2.1.3.orig/man/man5/pgsql_table.5 postfix-2.1.3/man/man5/pgsql_table.5
488 --- postfix-2.1.3.orig/man/man5/pgsql_table.5 2004-04-14 16:27:48.000000000 +0200
489 +++ postfix-2.1.3/man/man5/pgsql_table.5 2004-06-22 14:29:12.348878225 +0200
494 -\fBpostmap -q "\fIstring\fB" pgsql:/etc/postfix/filename\fR
495 +\fBpostmap -q "\fIstring\fB" pgsql:/etc/mail/filename\fR
497 -\fBpostmap -q - pgsql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
498 +\fBpostmap -q - pgsql:/etc/mail/\fIfilename\fR <\fIinputfile\fR
504 alias_maps = pgsql:/etc/pgsql-aliases.cf
506 -The file /etc/postfix/pgsql-aliases.cf has the same format as
507 +The file /etc/mail/pgsql-aliases.cf has the same format as
508 the Postfix main.cf file, and can specify the parameters
510 .SH "ALTERNATIVE CONFIGURATION"
511 --- postfix-2.2.2/man/man5/postconf.5.orig 2005-03-09 21:06:05.000000000 +0100
512 +++ postfix-2.2.2/man/man5/postconf.5 2005-04-26 11:29:18.000000000 +0200
517 -address_verify_map = hash:/etc/postfix/verify
518 -address_verify_map = btree:/etc/postfix/verify
519 +address_verify_map = hash:/etc/mail/verify
520 +address_verify_map = btree:/etc/mail/verify
525 are documented in \fBcanonical\fR(5). For an overview of Postfix address
526 manipulations see the ADDRESS_REWRITING_README document.
528 -If you use this feature, run "\fBpostmap /etc/postfix/canonical\fR" to
529 +If you use this feature, run "\fBpostmap /etc/mail/canonical\fR" to
530 build the necessary DBM or DB file after every change. The changes
531 will become visible after a minute or so. Use "\fBpostfix reload\fR"
532 to eliminate the delay.
537 -canonical_maps = dbm:/etc/postfix/canonical
538 -canonical_maps = hash:/etc/postfix/canonical
539 +canonical_maps = dbm:/etc/mail/canonical
540 +canonical_maps = hash:/etc/mail/canonical
544 @@ -1816,7 +1816,7 @@
546 local_header_rewrite_clients = permit_mynetworks,
547 permit_sasl_authenticated permit_tls_clientcerts
548 - check_address_map hash:/etc/postfix/pop-before-smtp
549 + check_address_map hash:/etc/mail/pop-before-smtp
553 @@ -2360,7 +2360,7 @@
554 mynetworks = !192.168.0.1, 192.168.0.0/28
555 mynetworks = 127.0.0.0/8 168.100.189.0/28 [::1]/128 [2001:240:5c7::]/64
556 mynetworks = $config_directory/mynetworks
557 -mynetworks = hash:/etc/postfix/network_table
558 +mynetworks = hash:/etc/mail/network_table
562 @@ -2739,7 +2739,7 @@
563 Look up the "@domain.tld" part.
565 Specify the types and names of databases to use. After change,
566 -run "\fBpostmap /etc/postfix/recipient_bcc\fR".
567 +run "\fBpostmap /etc/mail/recipient_bcc\fR".
569 Note: if mail to the BCC address bounces it will be returned to
571 @@ -2754,7 +2754,7 @@
575 -recipient_bcc_maps = hash:/etc/postfix/recipient_bcc
576 +recipient_bcc_maps = hash:/etc/mail/recipient_bcc
580 @@ -2779,7 +2779,7 @@
584 -recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
585 +recipient_canonical_maps = hash:/etc/mail/recipient_canonical
589 @@ -2822,7 +2822,7 @@
593 -relay_clientcerts = hash:/etc/postfix/relay_clientcerts
594 +relay_clientcerts = hash:/etc/mail/relay_clientcerts
598 @@ -2899,7 +2899,7 @@
602 -relay_recipient_maps = hash:/etc/postfix/relay_recipients
603 +relay_recipient_maps = hash:/etc/mail/relay_recipients
607 @@ -2952,7 +2952,7 @@
608 domains that no longer exist. The table format and lookups are
609 documented in \fBrelocated\fR(5).
611 -If you use this feature, run "\fBpostmap /etc/postfix/relocated\fR" to
612 +If you use this feature, run "\fBpostmap /etc/mail/relocated\fR" to
613 build the necessary DBM or DB file after change, then "\fBpostfix
614 reload\fR" to make the changes visible.
616 @@ -2961,8 +2961,8 @@
620 -relocated_maps = dbm:/etc/postfix/relocated
621 -relocated_maps = hash:/etc/postfix/relocated
622 +relocated_maps = dbm:/etc/mail/relocated
623 +relocated_maps = hash:/etc/mail/relocated
627 @@ -3035,7 +3035,7 @@
628 next-hop host, recipient) triple.
630 This feature is available in Postfix 2.0 and later.
631 -.SH sample_directory (default: /etc/postfix)
632 +.SH sample_directory (default: /etc/mail)
633 The name of the directory with example Postfix configuration files.
634 .SH sender_based_routing (default: no)
635 This parameter should not be used.
636 @@ -3064,7 +3064,7 @@
637 Look up the "@domain.tld" part.
639 Specify the types and names of databases to use. After change,
640 -run "\fBpostmap /etc/postfix/sender_bcc\fR".
641 +run "\fBpostmap /etc/mail/sender_bcc\fR".
643 Note: if mail to the BCC address bounces it will be returned to
645 @@ -3079,7 +3079,7 @@
649 -sender_bcc_maps = hash:/etc/postfix/sender_bcc
650 +sender_bcc_maps = hash:/etc/mail/sender_bcc
654 @@ -3107,7 +3107,7 @@
658 -sender_canonical_maps = hash:/etc/postfix/sender_canonical
659 +sender_canonical_maps = hash:/etc/mail/sender_canonical
663 @@ -3154,7 +3154,7 @@
667 - /etc/postfix/master.cf:
668 + /etc/mail/master.cf:
669 smtp ... smtp -o smtp_bind_address=11.22.33.44
672 @@ -3181,7 +3181,7 @@
676 - /etc/postfix/master.cf:
677 + /etc/mail/master.cf:
678 smtp ... smtp -o smtp_bind_address6=1:2:3:4:5:6:7:8
681 @@ -3363,7 +3363,7 @@
685 - /etc/postfix/master.cf:
686 + /etc/mail/master.cf:
687 mysmtp ... smtp -o smtp_helo_name=foo.bar.com
690 @@ -3455,7 +3455,7 @@
694 - /etc/postfix/master.cf:
695 + /etc/mail/master.cf:
696 broken-smtp . . . smtp -o smtp_quote_rfc821_envelope=no
699 @@ -3514,7 +3514,7 @@
702 smtp_sasl_mechanism_filter = plain, login
703 -smtp_sasl_mechanism_filter = /etc/postfix/smtp_mechs
704 +smtp_sasl_mechanism_filter = /etc/mail/smtp_mechs
705 smtp_sasl_mechanism_filter = !gssapi, !login, static:rest
708 @@ -3603,7 +3603,7 @@
712 -smtp_tls_CAfile = /etc/postfix/CAcert.pem
713 +smtp_tls_CAfile = /etc/mail/CAcert.pem
717 @@ -3611,7 +3611,7 @@
718 Directory with PEM format certificate authority certificates
719 that the Postfix SMTP client uses to verify a remote SMTP server
720 certificate. Don't forget to create the necessary "hash" links
721 -with, for example, "$OPENSSL_HOME/bin/c_rehash /etc/postfix/certs".
722 +with, for example, "$OPENSSL_HOME/bin/c_rehash /etc/mail/certs".
724 To use this option in chroot mode, this directory (or a copy)
725 must be inside the chroot jail.
726 @@ -3621,7 +3621,7 @@
730 -smtp_tls_CApath = /etc/postfix/certs
731 +smtp_tls_CApath = /etc/mail/certs
735 @@ -3653,7 +3653,7 @@
739 -smtp_tls_cert_file = /etc/postfix/client.pem
740 +smtp_tls_cert_file = /etc/mail/client.pem
744 @@ -3672,7 +3672,7 @@
748 -smtp_tls_dcert_file = /etc/postfix/client-dsa.pem
749 +smtp_tls_dcert_file = /etc/mail/client-dsa.pem
753 @@ -4149,7 +4149,7 @@
757 -/etc/postfix/main.cf:
759 smtpd_client_restrictions =
760 sleep 1, reject_unauth_pipelining
761 smtpd_delay_reject = no
762 @@ -4933,7 +4933,7 @@
764 smtpd_sender_restrictions = reject_unknown_sender_domain
765 smtpd_sender_restrictions = reject_unknown_sender_domain,
766 - check_sender_access hash:/etc/postfix/access
767 + check_sender_access hash:/etc/mail/access
771 @@ -4972,7 +4972,7 @@
775 -smtpd_tls_CAfile = /etc/postfix/CAcert.pem
776 +smtpd_tls_CAfile = /etc/mail/CAcert.pem
780 @@ -4981,7 +4981,7 @@
781 that the Postfix SMTP server offers to remote SMTP clients for the
782 purpose of client certificate verification. Do not forget to create
783 the necessary "hash" links with, for example, "$OPENSSL_HOME/bin/c_rehash
784 -/etc/postfix/certs".
787 To use this option in chroot mode, this directory (or a copy)
788 must be inside the chroot jail. Please note that in this case the
789 @@ -4994,7 +4994,7 @@
793 -smtpd_tls_CApath = /etc/postfix/certs
794 +smtpd_tls_CApath = /etc/mail/certs
798 @@ -5049,7 +5049,7 @@
802 -smtpd_tls_cert_file = /etc/postfix/server.pem
803 +smtpd_tls_cert_file = /etc/mail/server.pem
807 @@ -5068,7 +5068,7 @@
811 -smtpd_tls_dcert_file = /etc/postfix/server-dsa.pem
812 +smtpd_tls_dcert_file = /etc/mail/server-dsa.pem
816 @@ -5083,7 +5083,7 @@
820 -openssl gendh -out /etc/postfix/dh_1024.pem -2 -rand /var/run/egd-pool 1024
821 +openssl gendh -out /etc/mail/dh_1024.pem -2 -rand /var/run/egd-pool 1024
825 @@ -5097,7 +5097,7 @@
829 -smtpd_tls_dh1024_param_file = /etc/postfix/dh_1024.pem
830 +smtpd_tls_dh1024_param_file = /etc/mail/dh_1024.pem
834 @@ -5113,7 +5113,7 @@
838 -smtpd_tls_dh512_param_file = /etc/postfix/dh_512.pem
839 +smtpd_tls_dh512_param_file = /etc/mail/dh_512.pem
843 @@ -5370,7 +5370,7 @@
846 Specify zero or more "type:table" lookup tables. If you use this
847 -feature with local files, run "\fBpostmap /etc/postfix/transport\fR"
848 +feature with local files, run "\fBpostmap /etc/mail/transport\fR"
849 after making a change.
852 @@ -5378,8 +5378,8 @@
856 -transport_maps = dbm:/etc/postfix/transport
857 -transport_maps = hash:/etc/postfix/transport
858 +transport_maps = dbm:/etc/mail/transport
859 +transport_maps = hash:/etc/mail/transport
863 @@ -5536,15 +5536,15 @@
864 value is backwards compatible with Postfix 1.1.
866 If you use this feature with indexed files, run "\fBpostmap
867 -/etc/postfix/virtual\fR" after changing the file.
868 +/etc/mail/virtual\fR" after changing the file.
875 -virtual_alias_maps = dbm:/etc/postfix/virtual
876 -virtual_alias_maps = hash:/etc/postfix/virtual
877 +virtual_alias_maps = dbm:/etc/mail/virtual
878 +virtual_alias_maps = hash:/etc/mail/virtual
882 diff -dur postfix-2.1.3.orig/man/man5/regexp_table.5 postfix-2.1.3/man/man5/regexp_table.5
883 --- postfix-2.1.3.orig/man/man5/regexp_table.5 2004-04-14 16:27:48.000000000 +0200
884 +++ postfix-2.1.3/man/man5/regexp_table.5 2004-06-22 14:27:07.928110708 +0200
889 -\fBpostmap -fq "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
890 +\fBpostmap -fq "\fIstring\fB" regexp:/etc/mail/\fIfilename\fR
892 -\fBpostmap -fq - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
893 +\fBpostmap -fq - regexp:/etc/mail/\fIfilename\fR <\fIinputfile\fR
897 --- postfix-2.2.2/man/man5/relocated.5.orig 2005-02-22 13:46:38.000000000 +0100
898 +++ postfix-2.2.2/man/man5/relocated.5 2005-04-26 11:21:51.000000000 +0200
903 -\fBpostmap /etc/postfix/relocated\fR
904 +\fBpostmap /etc/mail/relocated\fR
909 that serves as input to the \fBpostmap\fR(1) command.
910 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
911 is used for fast searching by the mail system. Execute the command
912 -"\fBpostmap /etc/postfix/relocated\fR" in order to rebuild the indexed
913 +"\fBpostmap /etc/mail/relocated\fR" in order to rebuild the indexed
914 file after changing the relocated table.
916 When the table is provided via other means such as NIS, LDAP
917 --- postfix-2.2.2/man/man5/transport.5.orig 2005-02-07 18:48:14.000000000 +0100
918 +++ postfix-2.2.2/man/man5/transport.5 2005-04-26 11:22:02.000000000 +0200
923 -\fBpostmap /etc/postfix/transport\fR
924 +\fBpostmap /etc/mail/transport\fR
926 -\fBpostmap -q "\fIstring\fB" /etc/postfix/transport\fR
927 +\fBpostmap -q "\fIstring\fB" /etc/mail/transport\fR
929 -\fBpostmap -q - /etc/postfix/transport <\fIinputfile\fR
930 +\fBpostmap -q - /etc/mail/transport <\fIinputfile\fR
935 that serves as input to the \fBpostmap\fR(1) command.
936 The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
937 for fast searching by the mail system. Execute the command
938 -"\fBpostmap /etc/postfix/transport\fR" in order to rebuild the indexed
939 +"\fBpostmap /etc/mail/transport\fR" in order to rebuild the indexed
940 file after changing the transport table.
942 When the table is provided via other means such as NIS, LDAP
943 --- postfix-2.2.2/man/man5/virtual.5.orig 2005-03-30 17:51:33.000000000 +0200
944 +++ postfix-2.2.2/man/man5/virtual.5 2005-04-26 11:22:28.000000000 +0200
949 -\fBpostmap /etc/postfix/virtual\fR
950 +\fBpostmap /etc/mail/virtual\fR
952 -\fBpostmap -q "\fIstring\fB" /etc/postfix/virtual\fR
953 +\fBpostmap -q "\fIstring\fB" /etc/mail/virtual\fR
955 -\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
956 +\fBpostmap -q - /etc/mail/virtual <\fIinputfile\fR
961 that serves as input to the \fBpostmap\fR(1) command.
962 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
963 is used for fast searching by the mail system. Execute the command
964 -"\fBpostmap /etc/postfix/virtual\fR" in order to rebuild the indexed
965 +"\fBpostmap /etc/mail/virtual\fR" in order to rebuild the indexed
966 file after changing the text file.
968 When the table is provided via other means such as NIS, LDAP
969 @@ -145,15 +145,15 @@
971 Support for a virtual alias domain looks like:
973 -/etc/postfix/main.cf:
976 -virtual_alias_maps = hash:/etc/postfix/virtual
977 +virtual_alias_maps = hash:/etc/mail/virtual
979 Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
980 See the output from "\fBpostconf -m\fR" for available database types.
983 -/etc/postfix/virtual:
987 \fIvirtual-alias.domain anything\fR (right-hand content does not matter)
988 diff -dur postfix-2.1.3.orig/man/man8/cleanup.8 postfix-2.1.3/man/man8/cleanup.8
989 --- postfix-2.1.3.orig/man/man8/cleanup.8 2004-04-14 16:27:46.000000000 +0200
990 +++ postfix-2.1.3/man/man8/cleanup.8 2004-06-22 14:27:27.616966592 +0200
995 -/etc/postfix/canonical*, canonical mapping table
996 -/etc/postfix/virtual*, virtual mapping table
997 +/etc/mail/canonical*, canonical mapping table
998 +/etc/mail/virtual*, virtual mapping table
1002 diff -dur postfix-2.1.3.orig/man/man8/master.8 postfix-2.1.3/man/man8/master.8
1003 --- postfix-2.1.3.orig/man/man8/master.8 2004-04-11 21:19:47.000000000 +0200
1004 +++ postfix-2.1.3/man/man8/master.8 2004-06-22 14:27:45.157947168 +0200
1009 -/etc/postfix/main.cf, global configuration file.
1010 -/etc/postfix/master.cf, master server configuration file.
1011 +/etc/mail/main.cf, global configuration file.
1012 +/etc/mail/master.cf, master server configuration file.
1013 /var/spool/postfix/pid/master.pid, master lock file.
1016 diff -dur postfix-2.1.3.orig/man/man8/proxymap.8 postfix-2.1.3/man/man8/proxymap.8
1017 --- postfix-2.1.3.orig/man/man8/proxymap.8 2004-06-14 23:18:54.000000000 +0200
1018 +++ postfix-2.1.3/man/man8/proxymap.8 2004-06-22 14:21:18.013419228 +0200
1021 virtual_alias_maps =
1023 -proxy:mysql:/etc/postfix/virtual_alias.cf
1024 +proxy:mysql:/etc/mail/virtual_alias.cf
1026 The total number of connections is limited by the number of
1027 proxymap server processes.
1028 diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
1029 --- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200
1030 +++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200
1032 extern gid_t var_owner_gid;
1034 #define VAR_SGID_GROUP "setgid_group"
1035 -#define DEF_SGID_GROUP "postdrop"
1036 +#define DEF_SGID_GROUP "maildrop"
1037 extern char *var_sgid_group;
1038 extern gid_t var_sgid_gid;
1042 #define VAR_CONFIG_DIR "config_directory"
1043 #ifndef DEF_CONFIG_DIR
1044 -#define DEF_CONFIG_DIR "/etc/postfix"
1045 +#define DEF_CONFIG_DIR "/etc/mail"
1047 extern char *var_config_dir;
1049 diff -dur postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
1050 --- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 14:20:58.094573821 +0200
1051 +++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 14:21:17.966421952 +0200
1055 #define DEF_DB_TYPE "hash"
1056 -#define ALIAS_DB_MAP "hash:/etc/aliases"
1057 +#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
1059 #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
1060 #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"