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 Vietse 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 diff -dur postfix-2.1.3.orig/man/man1/postfix.1 postfix-2.1.3/man/man1/postfix.1
137 --- postfix-2.1.3.orig/man/man1/postfix.1 2004-04-21 23:15:45.000000000 +0200
138 +++ postfix-2.1.3/man/man1/postfix.1 2004-06-22 14:25:40.468191217 +0200
139 @@ -151,11 +151,11 @@
143 -/etc/postfix/main.cf, Postfix configuration parameters
144 -/etc/postfix/master.cf, Postfix daemon processes
145 -/etc/postfix/postfix-files, file/directory permissions
146 -/etc/postfix/postfix-script, administrative commands
147 -/etc/postfix/post-install, post-installation configuration
148 +/etc/mail/main.cf, Postfix configuration parameters
149 +/etc/mail/master.cf, Postfix daemon processes
150 +/etc/mail/postfix-files, file/directory permissions
151 +/etc/mail/postfix-script, administrative commands
152 +/etc/mail/post-install, post-installation configuration
156 diff -dur postfix-2.1.3.orig/man/man1/sendmail.1 postfix-2.1.3/man/man1/sendmail.1
157 --- postfix-2.1.3.orig/man/man1/sendmail.1 2004-04-14 03:56:07.000000000 +0200
158 +++ postfix-2.1.3/man/man1/sendmail.1 2004-06-22 14:25:58.213160652 +0200
160 This feature is available in Postfix version 2.1 and later.
161 .IP "\fB-C \fIconfig_file\fR (ignored)"
162 The path name of the \fBsendmail.cf\fR file. Postfix configuration
163 -files are kept in the \fB/etc/postfix\fR directory.
164 +files are kept in the \fB/etc/mail\fR directory.
165 .IP "\fB-F \fIfull_name\fR
166 Set the sender full name. This is used only with messages that
167 have no \fBFrom:\fR message header.
171 /var/spool/postfix, mail queue
172 -/etc/postfix, configuration files
173 +/etc/mail, configuration files
177 diff -dur postfix-2.1.3.orig/man/man5/access.5 postfix-2.1.3/man/man5/access.5
178 --- postfix-2.1.3.orig/man/man5/access.5 2004-04-22 02:44:38.000000000 +0200
179 +++ postfix-2.1.3/man/man5/access.5 2004-06-22 14:28:34.239094126 +0200
184 -\fBpostmap /etc/postfix/access\fR
185 +\fBpostmap /etc/mail/access\fR
187 -\fBpostmap -q "\fIstring\fB" /etc/postfix/access\fR
188 +\fBpostmap -q "\fIstring\fB" /etc/mail/access\fR
190 -\fBpostmap -q - /etc/postfix/access <\fIinputfile\fR
191 +\fBpostmap -q - /etc/mail/access <\fIinputfile\fR
196 that serves as input to the \fBpostmap\fR(1) command.
197 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
198 is used for fast searching by the mail system. Execute the command
199 -\fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
200 +\fBpostmap /etc/mail/access\fR in order to rebuild the indexed
201 file after changing the access table.
203 When the table is provided via other means such as NIS, LDAP
204 @@ -278,20 +278,20 @@
208 -/etc/postfix/main.cf:
211 smtpd_client_restrictions =
213 -check_client_access hash:/etc/postfix/access
214 +check_client_access hash:/etc/mail/access
217 -/etc/postfix/access:
224 -Execute the command "\fBpostmap /etc/postfix/access\fR" after
225 +Execute the command "\fBpostmap /etc/mail/access\fR" after
229 diff -dur postfix-2.1.3.orig/man/man5/canonical.5 postfix-2.1.3/man/man5/canonical.5
230 --- postfix-2.1.3.orig/man/man5/canonical.5 2004-04-22 02:44:38.000000000 +0200
231 +++ postfix-2.1.3/man/man5/canonical.5 2004-06-22 14:21:17.987420735 +0200
236 -\fBpostmap /etc/postfix/canonical\fR
237 +\fBpostmap /etc/mail/canonical\fR
239 -\fBpostmap -q "\fIstring\fB" /etc/postfix/canonical\fR
240 +\fBpostmap -q "\fIstring\fB" /etc/mail/canonical\fR
242 -\fBpostmap -q - /etc/postfix/canonical <\fIinputfile\fR
243 +\fBpostmap -q - /etc/mail/canonical <\fIinputfile\fR
248 that serves as input to the \fBpostmap\fR(1) command.
249 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
250 is used for fast searching by the mail system. Execute the command
251 -\fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
252 +\fBpostmap /etc/mail/canonical\fR in order to rebuild the indexed
253 file after changing the text file.
255 When the table is provided via other means such as NIS, LDAP
256 diff -dur postfix-2.1.3.orig/man/man5/cidr_table.5 postfix-2.1.3/man/man5/cidr_table.5
257 --- postfix-2.1.3.orig/man/man5/cidr_table.5 2004-04-16 15:17:25.000000000 +0200
258 +++ postfix-2.1.3/man/man5/cidr_table.5 2004-06-22 14:28:40.742716008 +0200
263 -\fBpostmap -q "\fIstring\fB" cidr:/etc/postfix/\fIfilename\fR
264 +\fBpostmap -q "\fIstring\fB" cidr:/etc/mail/\fIfilename\fR
266 -\fBpostmap -q - cidr:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
267 +\fBpostmap -q - cidr:/etc/mail/\fIfilename\fR <\fIinputfile\fR
272 .SH "EXAMPLE SMTPD ACCESS MAP"
275 -/etc/postfix/main.cf:
278 -smtpd_client_restrictions = ... cidr:/etc/postfix/client.cidr ...
279 +smtpd_client_restrictions = ... cidr:/etc/mail/client.cidr ...
281 -/etc/postfix/client.cidr:
282 +/etc/mail/client.cidr:
284 # Rule order matters. Put more specific whitelist entries
285 # before more general blacklist entries.
286 diff -dur postfix-2.1.3.orig/man/man5/header_checks.5 postfix-2.1.3/man/man5/header_checks.5
287 --- postfix-2.1.3.orig/man/man5/header_checks.5 2004-05-07 21:25:22.000000000 +0200
288 +++ postfix-2.1.3/man/man5/header_checks.5 2004-06-22 14:28:52.575028045 +0200
293 -\fBheader_checks = pcre:/etc/postfix/header_checks\fR
294 +\fBheader_checks = pcre:/etc/mail/header_checks\fR
296 -\fBmime_header_checks = pcre:/etc/postfix/mime_header_checks\fR
297 +\fBmime_header_checks = pcre:/etc/mail/mime_header_checks\fR
299 -\fBnested_header_checks = pcre:/etc/postfix/nested_header_checks\fR
300 +\fBnested_header_checks = pcre:/etc/mail/nested_header_checks\fR
302 -\fBbody_checks = pcre:/etc/postfix/body_checks\fR
303 +\fBbody_checks = pcre:/etc/mail/body_checks\fR
305 -\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
306 +\fBpostmap -fq "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
308 -\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
309 +\fBpostmap -fq - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
313 @@ -274,11 +274,11 @@
317 -/etc/postfix/main.cf:
320 -header_checks = regexp:/etc/postfix/header_checks
321 +header_checks = regexp:/etc/mail/header_checks
323 -/etc/postfix/header_checks:
324 +/etc/mail/header_checks:
326 /^content-(type|disposition):.*name[[:space:]]*=.*\\.(exe|vbs)/
328 @@ -290,11 +290,11 @@
332 -/etc/postfix/main.cf:
335 -body_checks = regexp:/etc/postfix/body_checks
336 +body_checks = regexp:/etc/mail/body_checks
338 -/etc/postfix/body_checks:
339 +/etc/mail/body_checks:
341 /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
343 diff -dur postfix-2.1.3.orig/man/man5/ldap_table.5 postfix-2.1.3/man/man5/ldap_table.5
344 --- postfix-2.1.3.orig/man/man5/ldap_table.5 2004-04-16 16:50:00.000000000 +0200
345 +++ postfix-2.1.3/man/man5/ldap_table.5 2004-06-22 14:28:58.307694713 +0200
350 -\fBpostmap -q "\fIstring\fB" ldap:/etc/postfix/filename\fR
351 +\fBpostmap -q "\fIstring\fB" ldap:/etc/mail/filename\fR
353 -\fBpostmap -q - ldap:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
354 +\fBpostmap -q - ldap:/etc/mail/\fIfilename\fR <\fIinputfile\fR
359 In order to use LDAP lookups, define an LDAP source as a lookup
360 table in main.cf, for example:
362 -alias_maps = ldap:/etc/postfix/ldap-aliases.cf
363 +alias_maps = ldap:/etc/mail/ldap-aliases.cf
365 -The file /etc/postfix/ldap-aliases.cf has the same format as
366 +The file /etc/mail/ldap-aliases.cf has the same format as
367 the Postfix main.cf file, and can specify the parameters
368 described below. An example is given at the end of this manual.
371 and "@domain" lookups are not performed. This can significantly
372 reduce the query load on the LDAP server.
374 -domain = postfix.org, hash:/etc/postfix/searchdomains
375 +domain = postfix.org, hash:/etc/mail/searchdomains
377 It is best not to use LDAP to store the domains eligible
381 alias_maps = hash:/etc/aliases,
383 -ldap:/etc/postfix/ldap-aliases.cf
384 +ldap:/etc/mail/ldap-aliases.cf
386 -and in ldap:/etc/postfix/ldap-aliases.cf you have:
387 +and in ldap:/etc/mail/ldap-aliases.cf you have:
389 server_host = ldap.my.com
391 diff -dur postfix-2.1.3.orig/man/man5/mysql_table.5 postfix-2.1.3/man/man5/mysql_table.5
392 --- postfix-2.1.3.orig/man/man5/mysql_table.5 2004-04-14 16:27:48.000000000 +0200
393 +++ postfix-2.1.3/man/man5/mysql_table.5 2004-06-22 14:29:04.905311074 +0200
398 -\fBpostmap -q "\fIstring\fB" mysql:/etc/postfix/filename\fR
399 +\fBpostmap -q "\fIstring\fB" mysql:/etc/mail/filename\fR
401 -\fBpostmap -q - mysql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
402 +\fBpostmap -q - mysql:/etc/mail/\fIfilename\fR <\fIinputfile\fR
408 alias_maps = mysql:/etc/mysql-aliases.cf
410 -The file /etc/postfix/mysql-aliases.cf has the same format as
411 +The file /etc/mail/mysql-aliases.cf has the same format as
412 the Postfix main.cf file, and can specify the parameters
414 .SH "ALTERNATIVE CONFIGURATION"
415 diff -dur postfix-2.1.3.orig/man/man5/pcre_table.5 postfix-2.1.3/man/man5/pcre_table.5
416 --- postfix-2.1.3.orig/man/man5/pcre_table.5 2004-04-14 16:27:48.000000000 +0200
417 +++ postfix-2.1.3/man/man5/pcre_table.5 2004-06-22 14:26:40.727691077 +0200
422 -\fBpostmap -fq "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
423 +\fBpostmap -fq "\fIstring\fB" pcre:/etc/mail/\fIfilename\fR
425 -\fBpostmap -fq - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
426 +\fBpostmap -fq - pcre:/etc/mail/\fIfilename\fR <\fIinputfile\fR
430 diff -dur postfix-2.1.3.orig/man/man5/pgsql_table.5 postfix-2.1.3/man/man5/pgsql_table.5
431 --- postfix-2.1.3.orig/man/man5/pgsql_table.5 2004-04-14 16:27:48.000000000 +0200
432 +++ postfix-2.1.3/man/man5/pgsql_table.5 2004-06-22 14:29:12.348878225 +0200
437 -\fBpostmap -q "\fIstring\fB" pgsql:/etc/postfix/filename\fR
438 +\fBpostmap -q "\fIstring\fB" pgsql:/etc/mail/filename\fR
440 -\fBpostmap -q - pgsql:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
441 +\fBpostmap -q - pgsql:/etc/mail/\fIfilename\fR <\fIinputfile\fR
447 alias_maps = pgsql:/etc/pgsql-aliases.cf
449 -The file /etc/postfix/pgsql-aliases.cf has the same format as
450 +The file /etc/mail/pgsql-aliases.cf has the same format as
451 the Postfix main.cf file, and can specify the parameters
453 .SH "ALTERNATIVE CONFIGURATION"
454 diff -dur postfix-2.1.3.orig/man/man5/postconf.5 postfix-2.1.3/man/man5/postconf.5
455 --- postfix-2.1.3.orig/man/man5/postconf.5 2004-06-17 00:40:35.000000000 +0200
456 +++ postfix-2.1.3/man/man5/postconf.5 2004-06-22 14:28:11.642407760 +0200
461 -address_verify_map = hash:/etc/postfix/verify
462 -address_verify_map = btree:/etc/postfix/verify
463 +address_verify_map = hash:/etc/mail/verify
464 +address_verify_map = btree:/etc/mail/verify
469 login names by Firstname.Lastname. The table format and lookups
470 are documented in canonical(5).
472 -If you use this feature, run "\fBpostmap /etc/postfix/canonical\fR" to
473 +If you use this feature, run "\fBpostmap /etc/mail/canonical\fR" to
474 build the necessary DBM or DB file after every change. The changes
475 will become visible after a minute or so. Use "\fBpostfix reload\fR"
476 to eliminate the delay.
481 -canonical_maps = dbm:/etc/postfix/canonical
482 -canonical_maps = hash:/etc/postfix/canonical
483 +canonical_maps = dbm:/etc/mail/canonical
484 +canonical_maps = hash:/etc/mail/canonical
488 @@ -1906,7 +1906,7 @@
490 mynetworks = 168.100.189.0/28, 127.0.0.0/8
491 mynetworks = $config_directory/mynetworks
492 -mynetworks = hash:/etc/postfix/network_table
493 +mynetworks = hash:/etc/mail/network_table
497 @@ -2283,7 +2283,7 @@
498 Look up the "@domain.tld" part.
500 Specify the types and names of databases to use. After change,
501 -run "\fBpostmap /etc/postfix/recipient_bcc\fR".
502 +run "\fBpostmap /etc/mail/recipient_bcc\fR".
504 NOTE: if mail to the BCC address bounces it will be returned to
506 @@ -2293,7 +2293,7 @@
510 -recipient_bcc_maps = hash:/etc/postfix/recipient_bcc
511 +recipient_bcc_maps = hash:/etc/mail/recipient_bcc
515 @@ -2309,7 +2309,7 @@
519 -recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
520 +recipient_canonical_maps = hash:/etc/mail/recipient_canonical
524 @@ -2401,7 +2401,7 @@
528 -relay_recipient_maps = hash:/etc/postfix/relay_recipients
529 +relay_recipient_maps = hash:/etc/mail/relay_recipients
533 @@ -2454,7 +2454,7 @@
534 domains that no longer exist. The table format and lookups are
535 documented in relocated(5).
537 -If you use this feature, run "\fBpostmap /etc/postfix/relocated\fR" to
538 +If you use this feature, run "\fBpostmap /etc/mail/relocated\fR" to
539 build the necessary DBM or DB file after change, then "\fBpostfix
540 reload\fR" to make the changes visible.
542 @@ -2463,8 +2463,8 @@
546 -relocated_maps = dbm:/etc/postfix/relocated
547 -relocated_maps = hash:/etc/postfix/relocated
548 +relocated_maps = dbm:/etc/mail/relocated
549 +relocated_maps = hash:/etc/mail/relocated
553 @@ -2505,7 +2505,7 @@
554 next-hop host, recipient) triple.
556 This feature is available in Postfix 2.0 and later.
557 -.SH sample_directory (default: /etc/postfix)
558 +.SH sample_directory (default: /etc/mail)
559 The name of the directory with example Postfix configuration files.
560 .SH sender_based_routing (default: no)
561 This parameter should not be used.
562 @@ -2534,7 +2534,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/sender_bcc\fR".
567 +run "\fBpostmap /etc/mail/sender_bcc\fR".
569 NOTE: if mail to the BCC address bounces it will be returned to
571 @@ -2544,7 +2544,7 @@
575 -sender_bcc_maps = hash:/etc/postfix/sender_bcc
576 +sender_bcc_maps = hash:/etc/mail/sender_bcc
580 @@ -2564,7 +2564,7 @@
584 -sender_canonical_maps = hash:/etc/postfix/sender_canonical
585 +sender_canonical_maps = hash:/etc/mail/sender_canonical
589 @@ -2610,7 +2610,7 @@
593 - /etc/postfix/master.cf:
594 + /etc/mail/master.cf:
595 smtp ... smtp -o smtp_bind_address=11.22.33.44
598 @@ -2686,7 +2686,7 @@
602 - /etc/postfix/master.cf:
603 + /etc/mail/master.cf:
604 mysmtp ... smtp -o smtp_helo_name=foo.bar.com
607 @@ -2778,7 +2778,7 @@
611 - /etc/postfix/master.cf:
612 + /etc/mail/master.cf:
613 broken-smtp . . . smtp -o smtp_quote_rfc821_envelope=no
616 @@ -2822,7 +2822,7 @@
617 attempt to authenticate to the remote host.
619 The Postfix SMTP client opens the lookup table before going to
620 -chroot jail, so you can leave the password file in /etc/postfix.
621 +chroot jail, so you can leave the password file in /etc/mail.
622 .SH smtp_sasl_security_options (default: noplaintext, noanonymous)
623 What authentication mechanisms the Postfix SMTP client is allowed
624 to use. The list of available authentication mechanisms is system
625 @@ -3833,7 +3833,7 @@
627 smtpd_sender_restrictions = reject_unknown_sender_domain
628 smtpd_sender_restrictions = reject_unknown_sender_domain,
629 - check_sender_access hash:/etc/postfix/access
630 + check_sender_access hash:/etc/mail/access
634 @@ -3970,7 +3970,7 @@
637 Specify zero or more "type:table" lookup tables. If you use this
638 -feature with local files, run "\fBpostmap /etc/postfix/transport\fR"
639 +feature with local files, run "\fBpostmap /etc/mail/transport\fR"
640 after making a change.
643 @@ -3978,8 +3978,8 @@
647 -transport_maps = dbm:/etc/postfix/transport
648 -transport_maps = hash:/etc/postfix/transport
649 +transport_maps = dbm:/etc/mail/transport
650 +transport_maps = hash:/etc/mail/transport
654 @@ -4135,15 +4135,15 @@
655 value is backwards compatible with Postfix 1.1.
657 If you use this feature with indexed files, run "\fBpostmap
658 -/etc/postfix/virtual\fR" after changing the file.
659 +/etc/mail/virtual\fR" after changing the file.
666 -virtual_alias_maps = dbm:/etc/postfix/virtual
667 -virtual_alias_maps = hash:/etc/postfix/virtual
668 +virtual_alias_maps = dbm:/etc/mail/virtual
669 +virtual_alias_maps = hash:/etc/mail/virtual
673 diff -dur postfix-2.1.3.orig/man/man5/regexp_table.5 postfix-2.1.3/man/man5/regexp_table.5
674 --- postfix-2.1.3.orig/man/man5/regexp_table.5 2004-04-14 16:27:48.000000000 +0200
675 +++ postfix-2.1.3/man/man5/regexp_table.5 2004-06-22 14:27:07.928110708 +0200
680 -\fBpostmap -fq "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
681 +\fBpostmap -fq "\fIstring\fB" regexp:/etc/mail/\fIfilename\fR
683 -\fBpostmap -fq - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
684 +\fBpostmap -fq - regexp:/etc/mail/\fIfilename\fR <\fIinputfile\fR
688 diff -dur postfix-2.1.3.orig/man/man5/relocated.5 postfix-2.1.3/man/man5/relocated.5
689 --- postfix-2.1.3.orig/man/man5/relocated.5 2004-04-22 02:44:38.000000000 +0200
690 +++ postfix-2.1.3/man/man5/relocated.5 2004-06-22 14:21:18.001419923 +0200
695 -\fBpostmap /etc/postfix/relocated\fR
696 +\fBpostmap /etc/mail/relocated\fR
701 that serves as input to the \fBpostmap\fR(1) command.
702 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
703 is used for fast searching by the mail system. Execute the command
704 -\fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
705 +\fBpostmap /etc/mail/relocated\fR in order to rebuild the indexed
706 file after changing the relocated table.
708 When the table is provided via other means such as NIS, LDAP
709 diff -dur postfix-2.1.3.orig/man/man5/transport.5 postfix-2.1.3/man/man5/transport.5
710 --- postfix-2.1.3.orig/man/man5/transport.5 2004-04-22 14:58:40.000000000 +0200
711 +++ postfix-2.1.3/man/man5/transport.5 2004-06-22 14:21:18.002419865 +0200
716 -\fBpostmap /etc/postfix/transport\fR
717 +\fBpostmap /etc/mail/transport\fR
719 -\fBpostmap -q "\fIstring\fB" /etc/postfix/transport\fR
720 +\fBpostmap -q "\fIstring\fB" /etc/mail/transport\fR
722 -\fBpostmap -q - /etc/postfix/transport <\fIinputfile\fR
723 +\fBpostmap -q - /etc/mail/transport <\fIinputfile\fR
728 that serves as input to the \fBpostmap\fR(1) command.
729 The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used
730 for fast searching by the mail system. Execute the command
731 -\fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
732 +\fBpostmap /etc/mail/transport\fR in order to rebuild the indexed
733 file after changing the transport table.
735 When the table is provided via other means such as NIS, LDAP
736 diff -dur postfix-2.1.3.orig/man/man5/virtual.5 postfix-2.1.3/man/man5/virtual.5
737 --- postfix-2.1.3.orig/man/man5/virtual.5 2004-04-22 02:44:38.000000000 +0200
738 +++ postfix-2.1.3/man/man5/virtual.5 2004-06-22 14:21:18.004419750 +0200
743 -\fBpostmap /etc/postfix/virtual\fR
744 +\fBpostmap /etc/mail/virtual\fR
746 -\fBpostmap -q "\fIstring\fB" /etc/postfix/virtual\fR
747 +\fBpostmap -q "\fIstring\fB" /etc/mail/virtual\fR
749 -\fBpostmap -q - /etc/postfix/virtual <\fIinputfile\fR
750 +\fBpostmap -q - /etc/mail/virtual <\fIinputfile\fR
755 that serves as input to the \fBpostmap\fR(1) command.
756 The result, an indexed file in \fBdbm\fR or \fBdb\fR format,
757 is used for fast searching by the mail system. Execute the command
758 -\fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
759 +\fBpostmap /etc/mail/virtual\fR in order to rebuild the indexed
760 file after changing the text file.
762 When the table is provided via other means such as NIS, LDAP
763 @@ -125,15 +125,15 @@
765 Support for a virtual alias domain looks like:
767 -/etc/postfix/main.cf:
770 -virtual_alias_maps = hash:/etc/postfix/virtual
771 +virtual_alias_maps = hash:/etc/mail/virtual
773 Note: some systems use \fBdbm\fR databases instead of \fBhash\fR.
774 See the output from \fBpostconf -m\fR for available database types.
777 -/etc/postfix/virtual:
781 \fIvirtual-alias.domain anything\fR (right-hand content does not matter)
782 diff -dur postfix-2.1.3.orig/man/man8/cleanup.8 postfix-2.1.3/man/man8/cleanup.8
783 --- postfix-2.1.3.orig/man/man8/cleanup.8 2004-04-14 16:27:46.000000000 +0200
784 +++ postfix-2.1.3/man/man8/cleanup.8 2004-06-22 14:27:27.616966592 +0200
789 -/etc/postfix/canonical*, canonical mapping table
790 -/etc/postfix/virtual*, virtual mapping table
791 +/etc/mail/canonical*, canonical mapping table
792 +/etc/mail/virtual*, virtual mapping table
796 diff -dur postfix-2.1.3.orig/man/man8/master.8 postfix-2.1.3/man/man8/master.8
797 --- postfix-2.1.3.orig/man/man8/master.8 2004-04-11 21:19:47.000000000 +0200
798 +++ postfix-2.1.3/man/man8/master.8 2004-06-22 14:27:45.157947168 +0200
803 -/etc/postfix/main.cf, global configuration file.
804 -/etc/postfix/master.cf, master server configuration file.
805 +/etc/mail/main.cf, global configuration file.
806 +/etc/mail/master.cf, master server configuration file.
807 /var/spool/postfix/pid/master.pid, master lock file.
810 diff -dur postfix-2.1.3.orig/man/man8/proxymap.8 postfix-2.1.3/man/man8/proxymap.8
811 --- postfix-2.1.3.orig/man/man8/proxymap.8 2004-06-14 23:18:54.000000000 +0200
812 +++ postfix-2.1.3/man/man8/proxymap.8 2004-06-22 14:21:18.013419228 +0200
817 -proxy:mysql:/etc/postfix/virtual_alias.cf
818 +proxy:mysql:/etc/mail/virtual_alias.cf
820 The total number of connections is limited by the number of
821 proxymap server processes.
822 diff -dur postfix-2.1.3.orig/man/man8/tlsmgr.8 postfix-2.1.3/man/man8/tlsmgr.8
823 --- postfix-2.1.3.orig/man/man8/tlsmgr.8 2004-06-22 14:20:57.678597931 +0200
824 +++ postfix-2.1.3/man/man8/tlsmgr.8 2004-06-22 14:21:18.014419170 +0200
826 .IP \fBtls_random_exchange_name\fR
827 Name of the file written by tlsmgr and read by smtp and smtpd at
828 startup. The length is 1024 bytes. Default value is
829 -/etc/postfix/prng_exch.
830 +/etc/mail/prng_exch.
831 .IP \fBtls_random_reseed_period\fR
832 Time in seconds until the next reseed from external sources is due.
833 This is the maximum value. The actual point in time is calculated
834 diff -dur postfix-2.1.3.orig/src/global/mail_params.h postfix-2.1.3/src/global/mail_params.h
835 --- postfix-2.1.3.orig/src/global/mail_params.h 2004-06-22 14:20:57.890585644 +0200
836 +++ postfix-2.1.3/src/global/mail_params.h 2004-06-22 14:21:17.963422126 +0200
838 extern gid_t var_owner_gid;
840 #define VAR_SGID_GROUP "setgid_group"
841 -#define DEF_SGID_GROUP "postdrop"
842 +#define DEF_SGID_GROUP "maildrop"
843 extern char *var_sgid_group;
844 extern gid_t var_sgid_gid;
848 #define VAR_CONFIG_DIR "config_directory"
849 #ifndef DEF_CONFIG_DIR
850 -#define DEF_CONFIG_DIR "/etc/postfix"
851 +#define DEF_CONFIG_DIR "/etc/mail"
853 extern char *var_config_dir;
855 diff -dur postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
856 --- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 14:20:58.094573821 +0200
857 +++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 14:21:17.966421952 +0200
861 #define DEF_DB_TYPE "hash"
862 -#define ALIAS_DB_MAP "hash:/etc/aliases"
863 +#define ALIAS_DB_MAP "hash:/etc/mail/aliases"
865 #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
866 #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"