[src/trunk]: src/gnu/dist/postfix resolve conflicts

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cac65dd7c2c7
branches:  trunk
changeset: 540804:cac65dd7c2c7
user:      perry <perry%NetBSD.org@localhost>
date:      Tue Dec 24 20:26:59 2002 +0000

description:
resolve conflicts

diffstat:

 gnu/dist/postfix/conf/main.cf                   |  186 ++++++++++----
 gnu/dist/postfix/conf/post-install              |   39 ++-
 gnu/dist/postfix/src/cleanup/cleanup.c          |   65 ++++-
 gnu/dist/postfix/src/cleanup/cleanup.h          |   27 +-
 gnu/dist/postfix/src/cleanup/cleanup_envelope.c |   69 ++++-
 gnu/dist/postfix/src/cleanup/cleanup_init.c     |   33 +-
 gnu/dist/postfix/src/global/Makefile.in         |  172 +++++++++++++-
 gnu/dist/postfix/src/global/mail_params.h       |  296 +++++++++++++++++++++--
 gnu/dist/postfix/src/global/own_inet_addr.c     |   67 +++++
 gnu/dist/postfix/src/global/own_inet_addr.h     |    2 +
 gnu/dist/postfix/src/global/resolve_local.c     |   13 +-
 gnu/dist/postfix/src/global/tok822_parse.c      |   48 ++-
 12 files changed, 861 insertions(+), 156 deletions(-)

diffs (truncated from 1976 to 300 lines):

diff -r c36170edee8f -r cac65dd7c2c7 gnu/dist/postfix/conf/main.cf
--- a/gnu/dist/postfix/conf/main.cf     Tue Dec 24 19:47:47 2002 +0000
+++ b/gnu/dist/postfix/conf/main.cf     Tue Dec 24 20:26:59 2002 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: main.cf,v 1.4 2002/06/08 22:49:51 itojun Exp $
+#      $NetBSD: main.cf,v 1.5 2002/12/24 20:26:59 perry Exp $
 #
 # Global Postfix configuration file. This file lists only a subset
-# of all 100+ parameters. See the sample-xxx.cf files for a full list.
+# of all 250+ parameters. See the sample-xxx.cf files for a full list.
 # 
 # The general format is lines with parameter = value pairs. Lines
 # that begin with whitespace continue the previous line. A value can
@@ -31,14 +31,13 @@
 queue_directory = /var/spool/postfix
 
 # The command_directory parameter specifies the location of all
-# postXXX commands.  The default value is $program_directory.
+# postXXX commands.
 #
 command_directory = /usr/sbin
 
 # The daemon_directory parameter specifies the location of all Postfix
-# daemon programs (i.e. programs listed in the master.cf file). The
-# default value is $program_directory. This directory must be owned
-# by root.
+# daemon programs (i.e. programs listed in the master.cf file). This
+# directory must be owned by root.
 #
 daemon_directory = /usr/libexec/postfix
 
@@ -86,6 +85,10 @@
 # a domain-wide alias database that aliases each user to
 # user@that.users.mailhost.
 #
+# For the sake of consistency between sender and recipient addresses,
+# myorigin also specifies the default domain name that is appended
+# to recipient addresses that have no @domain part.
+#
 #myorigin = $myhostname
 #myorigin = $mydomain
 
@@ -96,22 +99,45 @@
 # the software claims all active interfaces on the machine. The
 # parameter also controls delivery of mail to user@[ip.address].
 #
+# See also the proxy_interfaces parameter, for network addresses that
+# are forwarded to us via a proxy or network address translator.
+#
+# Note: you need to stop/start Postfix when this parameter changes.
+#
 #inet_interfaces = all
 #inet_interfaces = $myhostname
 #inet_interfaces = $myhostname, localhost
 
+# The proxy_interfaces parameter specifies the network interface
+# addresses that this mail system receives mail on by way of a
+# proxy or network address translation unit. This setting extends
+# the address list specified with the inet_interfaces parameter.
+#
+# You must specify your proxy/NAT addresses when your system is a
+# backup MX host for other domains, otherwise mail delivery loops
+# will happen when the primary MX host is down.
+#
+#proxy_interfaces =
+#proxy_interfaces = 1.2.3.4
+
 # The mydestination parameter specifies the list of domains that this
-# machine considers itself the final destination for. That includes
-# Sendmail-style virtual domains hosted on this machine.
+# machine considers itself the final destination for.
 #
-# Do not include Postfix-style virtual domains - those domains are
-# specified elsewhere (see sample-virtual.cf, and sample-transport.cf).
+# These domains are routed to the delivery agent specified with the
+# local_transport parameter setting. By default, that is the UNIX
+# compatible delivery agent that lookups all recipients in /etc/passwd
+# and /etc/aliases or their equivalent.
 #
 # The default is $myhostname + localhost.$mydomain.  On a mail domain
-# gateway, you should also include $mydomain. Do not specify the
-# names of domains that this machine is backup MX host for. Specify
-# those names via the relay_domains or permit_mx_backup settings for
-# the SMTP server (see sample-smtpd.cf).
+# gateway, you should also include $mydomain.
+#
+# Do not specify the names of virtual domains - those domains are
+# specified elsewhere (see sample-virtual.cf).
+#
+# Do not specify the names of domains that this machine is backup MX
+# host for. Specify those names via the relay_domains settings for
+# the SMTP server, or use permit_mx_backup if you are lazy (see
+# sample-smtpd.cf).
 #
 # The local machine is always the final destination for mail addressed
 # to user@[the.net.work.address] of an interface that the mail system
@@ -120,14 +146,63 @@
 # Specify a list of host or domain names, /file/name or type:table
 # patterns, separated by commas and/or whitespace. A /file/name
 # pattern is replaced by its contents; a type:table is matched when
-# a name matches a lookup key.  Continue long lines by starting the
-# next line with whitespace.
+# a name matches a lookup key (the right-hand side is ignored).
+# Continue long lines by starting the next line with whitespace.
+#
+# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
 #
 #mydestination = $myhostname, localhost.$mydomain
 #mydestination = $myhostname, localhost.$mydomain $mydomain
 #mydestination = $myhostname, localhost.$mydomain, $mydomain,
 #      mail.$mydomain, www.$mydomain, ftp.$mydomain
 
+# REJECTING MAIL FOR UNKNOWN LOCAL USERS
+#
+# The local_recipient_maps parameter specifies optional lookup tables
+# with all names or addresses of users that are local with respect
+# to $mydestination and $inet_interfaces.
+#
+# If this parameter is defined, then the SMTP server will reject
+# mail for unknown local users. This parameter is defined by default.
+#
+# To turn off local recipient checking in the SMTP server, specify
+# local_recipient_maps = (i.e. empty).
+#
+# The default setting assumes that you use the default Postfix local
+# delivery agent for local delivery. You need to update the
+# local_recipient_maps setting if:
+#
+# - You define $mydestination domain recipients in files other than
+#   /etc/passwd, /etc/aliases, or the $virtual_alias_maps files.
+#   For example, you define $mydestination domain recipients in
+#   the $virtual_mailbox_maps files.
+#
+# - You redefined the local delivery agent in master.cf.
+#
+# - You redefined the "local_transport" setting in main.cf.
+#
+# - You use the "luser_relay", "mailbox_transport", or "fallback_transport"
+#   feature of the Postfix local delivery agent (see sample-local.cf).
+#
+# Beware: if the Postfix SMTP server runs chrooted, you probably have
+# to copy the passwd (not shadow) database into the jail, and perhaps
+# other files. This is system dependent.
+# 
+#local_recipient_maps = unix:passwd.byname $alias_maps
+#local_recipient_maps =
+
+# The unknown_local_recipient_reject_code specifies the SMTP server
+# response code when a recipient domain matches $mydestination or
+# $inet_interfaces, while $local_recipient_maps is non-empty and the
+# recipient address or address local-part is not found.
+#
+# The default setting is 550 (reject mail) but it is safer to start
+# with 450 (try again later) until you are certain that your
+# local_recipient_maps settings are OK.
+#
+#unknown_local_recipient_reject_code = 550
+unknown_local_recipient_reject_code = 450
+
 # TRUST AND RELAY CONTROL
 
 # The mynetworks parameter specifies the list of "trusted" SMTP
@@ -173,23 +248,22 @@
 #mynetworks = $config_directory/mynetworks
 #mynetworks = hash:/etc/postfix/network_table
 
-# The relay_domains parameter restricts what clients this mail system
-# will relay mail from, or what destinations this system will relay
-# mail to.  See the smtpd_recipient_restrictions restriction in the
+# The relay_domains parameter restricts what destinations this system will
+# relay mail to.  See the smtpd_recipient_restrictions restriction in the
 # file sample-smtpd.cf for detailed information.
 #
 # By default, Postfix relays mail
-# - from "trusted" clients whose IP address matches $mynetworks, 
-# - from "trusted" clients matching $relay_domains or subdomains thereof,
-# - from untrusted clients to destinations that match $relay_domains
-#   or subdomains thereof, except addresses with sender-specified routing.
+# - from "trusted" clients (IP address matches $mynetworks) to any destination,
+# - from "untrusted" clients to destinations that match $relay_domains or
+#   subdomains thereof, except addresses with sender-specified routing.
 # The default relay_domains value is $mydestination.
 # 
 # In addition to the above, the Postfix SMTP server by default accepts mail
 # that Postfix is final destination for:
 # - destinations that match $inet_interfaces,
 # - destinations that match $mydestination
-# - destinations that match $virtual_maps.
+# - destinations that match $virtual_alias_domains,
+# - destinations that match $virtual_mailbox_domains.
 # These destinations do not need to be listed in $relay_domains.
 # 
 # Specify a list of hosts or domains, /file/name patterns or type:name
@@ -224,22 +298,15 @@
 #relayhost = uucphost
 #relayhost = [an.ip.add.ress]
 
-# REJECTING UNKNOWN LOCAL USERS
+# REJECTING UNKNOWN RELAY USERS
 #
-# The local_recipient_maps parameter specifies optional lookup tables
-# with all names (not addresses) of users that are local with respect
-# to $mydestination and $inet_interfaces.  If this parameter is
-# defined, then the SMTP server will reject mail for unknown local
-# users.
+# The relay_recipient_maps parameter specifies optional lookup tables
+# with all addresses in the domains that match $relay_domains.
 #
-# If you use the default Postfix local delivery agent for local
-# delivery, uncomment the definition below.
-#
-# Beware: if the Postfix SMTP server runs chrooted, you may have to
-# copy the passwd (not shadow) database into the jail. This is
-# system dependent.
+# If this parameter is defined, then the SMTP server will reject
+# mail for unknown relay users. This feature is off by default.
 # 
-#local_recipient_maps = $alias_maps unix:passwd.byname
+#relay_recipient_maps = hash:/etc/postfix/relay_recipients
 
 # INPUT RATE CONTROL
 #
@@ -284,6 +351,7 @@
 #
 # The alias_maps parameter specifies the list of alias databases used
 # by the local delivery agent. The default list is system dependent.
+#
 # On systems with NIS, the default is to search the local alias
 # database, then the NIS alias database. See aliases(5) for syntax
 # details.
@@ -370,6 +438,11 @@
 # :nexthop part is optional. For more details see the sample transport
 # configuration file.
 #
+# NOTE: if you use this feature for accounts not in the UNIX password
+# file, then you must update the "local_recipient_maps" setting in
+# the main.cf file, otherwise the SMTP server will reject mail for    
+# non-UNIX accounts with "User unknown in local recipient table".
+#
 #mailbox_transport = lmtp:unix:/file/name
 #mailbox_transport = cyrus
 
@@ -382,13 +455,18 @@
 # :nexthop part is optional. For more details see the sample transport
 # configuration file.
 #
+# NOTE: if you use this feature for accounts not in the UNIX password
+# file, then you must update the "local_recipient_maps" setting in
+# the main.cf file, otherwise the SMTP server will reject mail for    
+# non-UNIX accounts with "User unknown in local recipient table".
+#
 #fallback_transport = lmtp:unix:/file/name
 #fallback_transport = cyrus
 #fallback_transport =
 
 # The luser_relay parameter specifies an optional destination address
-# for unknown recipients.  By default, mail for unknown local recipients
-# is bounced.
+# for unknown recipients.  By default, mail for unknown@$mydestination
+# and unknown@[$inet_interfaces] is returned as undeliverable.
 #
 # The following expansions are done on luser_relay: $user (recipient
 # username), $shell (recipient shell), $home (recipient home directory),
@@ -399,6 +477,11 @@
 #
 # luser_relay works only for the default Postfix local delivery agent.
 #
+# NOTE: if you use this feature for accounts not in the UNIX password
+# file, then you must specify "local_recipient_maps =" (i.e. empty) in
+# the main.cf file, otherwise the SMTP server will reject mail for    
+# non-UNIX accounts with "User unknown in local recipient table".
+#
 #luser_relay = $user%other.host@localhost
 #luser_relay = $local%other.host@localhost
 #luser_relay = admin+$local
@@ -410,20 +493,13 @@
 
 # The header_checks parameter specifies an optional table with patterns
 # that each logical message header is matched against, including
-# headers that span multiple physical lines.  Patterns are matched
-# in the specified order, and the search stops upon the first match.
-# When a pattern matches, what happens next depends on the associated
-# action that is specified in the right-hand side of the table:
+# headers that span multiple physical lines.
 #
-# REJECT the entire message is rejected.
-# REJECT text.... The text is sent to the originator.
-# IGNORE the header line is silently discarded.
-# WARN   the header is logged (not rejected) with a warning message.
-# WARN text... as above, and the text is logged, too.
+# By default, these patterns also apply to MIME headers and to the
+# headers of attached messages. With older Postfix versions, MIME and
+# attached message headers were treated as body text.
 #
-# These patterns do not apply to MIME headers in the message body.
-#
-# See also the body_checks example in the sample-filter.cf file.
+# For details, see the sample-filter.cf file.
 #
 #header_checks = regexp:/etc/postfix/header_checks