From: Wietse Venema Date: Wed, 20 Sep 2000 00:00:00 +0000 (+0000) Subject: snapshot-20000920 X-Git-Tag: v20010228~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=894699d60e646c374f169764c0419497b59ae814;p=thirdparty%2Fpostfix.git snapshot-20000920 --- diff --git a/postfix/.printfck b/postfix/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/.printfck +++ b/postfix/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/HISTORY b/postfix/HISTORY index 31031695d..f47f862e9 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -4109,6 +4109,12 @@ Apologies for any names omitted. Robustness: make_dirs() now continues when a missing directory is created by another process. +20000720 + + Feature: the queue manager now logs the number of recipients + when opening a queue file (a zero recipient count is logged + with older queue files). File: global/opened.c. + 20000726 Robustness: added watchdog_pat() routine to keep the watchdog @@ -4125,7 +4131,8 @@ Apologies for any names omitted. 20000821 - Feature: added -r (replace) option to postalias and postmap. + Feature: added -r (replace key+value) option to postalias + and postmap. Cleanup: smtpd now replies with 555 when the client sends unrecognized RCPT TO parameters, as required by RFC 1869 @@ -4152,6 +4159,8 @@ Apologies for any names omitted. client or sender until we have completed some investigation, after which we will either reject or accept. + However, the code is turned off because it is not finished. + 20000905 Robustness: the dns client now rejects malformed domain @@ -4212,5 +4221,24 @@ Apologies for any names omitted. Convenience: INSTALL.sh now imports default settings from the process environment, in order to make scripting easier. + Portability: INSTALL.sh now systematically skips over CVS, + RCS and SCCS cruft. + Portability: another fix for NEXTSTEP (Masaki MURASE). File: util/spawn_command.h. + +20000920 + + Cleanup: in a transport table entry, do not ignore port + numbers specified as [host]:port. In fact, this is now + becoming the preferred form, in order to avoid parsing + problems with IPV6 addresses. Postfix supports both forms + for a while but prints a warning for the old form. Problem + reported by Claus Fischer @ werhats.at + + Bugfix: missing initialization for state->sasl_method can + cause permit_sasl_authenticated to always succeed. Report + and fix by Lutz Jaenicke @ aet.TU-Cottbus.DE. + + FAQ: added notes about how to delete, copy or restore queue + files in a safe manner. diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 5a92053cf..f166e00c6 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,14 +1,29 @@ Incompatible changes with snapshot-20000919 =========================================== -The queue manager to delivery agent protocol has changed. This does -not affect the format of queue files, but means that you cannot -use this software with queue managers or delivery agents of prior -Postfix versions. - -Change in address rewriting: Errors-To:, Reply-To: and Return-Receipt: +The notation of [host:port] in transport tables etc. is going away +but it is still supported. The preferred form is now [host]:port. +This change is necessary to support IPV6 address forms which use +":" as part of the numeric IP address. In a future release, Postfix +will log a warning message when it encounters the [host:port] form. + +After "make install" you need to "postfix reload". The protocol +between queue manager and delivery agent protocol has changed. This +does not affect the format of existing queue files, you just cannot +mix this Postfix version with queue managers or delivery agents +from prior Postfix versions. + +In mail headers, Errors-To:, Reply-To: and Return-Receipt: addresses are now rewritten as a sender address (was: recipient). +Postfix no longer inserts Sender: message headers. + +The queue manager now logs the original number of recipients when +opening queue file. + +The local delivery agent no longer appends a blank line when +delivering to command. + Major changes with snapshot-20000919 ==================================== @@ -16,10 +31,12 @@ Postfix now strips out the Content-Length: header to avoid confusion with mail user agents. The header_checks and body_checks features can now be used to strip -out unwanted data. Specify IGNORE and the data will go disappear. +out unwanted data. Specify IGNORE and the data will disappear. + +Specify "test_home_directory = yes" to prevent mail from being +delivered to a user whose home directory is not mounted. -Postfix no longer inserts a Sender: message header when the -From: address differs from the envelope sender address. +The pipe mailer has a size limit (size=nnn) command-line argument. Incompatible changes with snapshot-20000625 (never released) =========================================== diff --git a/postfix/bounce/.printfck b/postfix/bounce/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/bounce/.printfck +++ b/postfix/bounce/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/bounce/bounce_notify_service.c b/postfix/bounce/bounce_notify_service.c index 5ff5475b7..78bcfa1a9 100644 --- a/postfix/bounce/bounce_notify_service.c +++ b/postfix/bounce/bounce_notify_service.c @@ -353,7 +353,7 @@ int bounce_notify_service(char *service, char *queue_name, * Unique string for multi-part message boundaries. */ vstring_sprintf(boundary, "%s.%ld/%s", - queue_id, event_time(), var_myhostname); + queue_id, (long) event_time(), var_myhostname); #define NULL_SENDER MAIL_ADDR_EMPTY /* special address */ #define NULL_CLEANUP_FLAGS 0 diff --git a/postfix/bounce/bounce_recip_service.c b/postfix/bounce/bounce_recip_service.c index 71102e56c..2ff9cc0c5 100644 --- a/postfix/bounce/bounce_recip_service.c +++ b/postfix/bounce/bounce_recip_service.c @@ -335,7 +335,7 @@ int bounce_recip_service(char *service, char *queue_name, char *queue_id, * Unique string for multi-part message boundaries. */ vstring_sprintf(boundary, "%s.%ld/%s", - queue_id, event_time(), var_myhostname); + queue_id, (long) event_time(), var_myhostname); #define NULL_SENDER MAIL_ADDR_EMPTY /* special address */ #define NULL_CLEANUP_FLAGS 0 diff --git a/postfix/cleanup/.printfck b/postfix/cleanup/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/cleanup/.printfck +++ b/postfix/cleanup/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/cleanup/cleanup_message.c b/postfix/cleanup/cleanup_message.c index 151bbb154..20a4c1cf5 100644 --- a/postfix/cleanup/cleanup_message.c +++ b/postfix/cleanup/cleanup_message.c @@ -320,7 +320,6 @@ static void cleanup_missing_headers(CLEANUP_STATE *state) char time_stamp[1024]; /* XXX locale dependent? */ struct tm *tp; TOK822 *token; - char *from; /* * Add a missing (Resent-)Message-Id: header. The message ID gives the diff --git a/postfix/conf/access b/postfix/conf/access index a596d799c..37c2169ab 100644 --- a/postfix/conf/access +++ b/postfix/conf/access @@ -15,25 +15,24 @@ # # Normally, the table serves as input to the postmap(1) com- # mand. The result, an indexed file in dbm or db format, is -# used for fast searching by the mail system. After an -# update it may take a minute or so before the change -# becomes visible. Issue a postfix reload command to elimi- -# nate the delay. +# used for fast searching by the mail system. Execute the +# command postmap /etc/postfix/access in order to rebuild +# the indexed file after changing the access table. # -# When the table is provided via other means such as NIS, -# LDAP or SQL, the same lookups are done as for ordinary +# When the table is provided via other means such as NIS, +# LDAP or SQL, the same lookups are done as for ordinary # indexed files. # -# Alternatively, the table can be provided as a regular- +# Alternatively, the table can be provided as a regular- # expression map where patterns are given as regular expres- -# sions. In that case, the lookups are done in a slightly +# sions. In that case, the lookups are done in a slightly # different way as described below. # # TABLE FORMAT # The format of the access table is as follows: # # blanks and comments -# Blank lines are ignored, as are lines beginning +# Blank lines are ignored, as are lines beginning # with `#'. # # pattern action @@ -42,18 +41,18 @@ # # PATTERNS # With lookups from indexed files such as DB or DBM, or from -# networked tables such as NIS, LDAP or SQL, patterns are +# networked tables such as NIS, LDAP or SQL, patterns are # tried in the order as listed below: # # user@domain # Matches the specified mail address. # # domain.name -# Matches the domain.name itself and any subdomain -# thereof, either in hostnames or in mail addresses. +# Matches the domain.name itself and any subdomain +# thereof, either in hostnames or in mail addresses. # Top-level domains will never be matched. # -# user@ Matches all mail addresses with the specified user +# user@ Matches all mail addresses with the specified user # part. # # 1 @@ -66,13 +65,13 @@ # # net.work # -# net Matches any host address in the specified network. -# A network address is a sequence of one or more +# net Matches any host address in the specified network. +# A network address is a sequence of one or more # octets separated by ".". # # ACTIONS # [45]XX text -# Reject the address etc. that matches the pattern, +# Reject the address etc. that matches the pattern, # and respond with the numerical code and text. # # REJECT Reject the address etc. that matches the pattern. A @@ -84,29 +83,29 @@ # Accept the address etc. that matches the pattern. # # REGULAR EXPRESSION TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # the table is given in the form of regular expressions. For -# a description of regular expression lookup table syntax, +# a description of regular expression lookup table syntax, # see regexp_table(5) or pcre_table(5). # -# Each pattern is a regular expression that is applied to +# Each pattern is a regular expression that is applied to # the entire string being looked up. Depending on the appli- -# cation, that string is an entire client hostname, an +# cation, that string is an entire client hostname, an # entire client IP address, or an entire mail address. Thus, -# no parent domain or parent network search is done, and -# user@domain mail addresses are not broken up into their +# no parent domain or parent network search is done, and +# user@domain mail addresses are not broken up into their # user@ and domain constituent parts. # -# Patterns are applied in the order as specified in the -# table, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the +# table, until a pattern is found that matches the search # string. # -# Actions are the same as with normal indexed file lookups, -# with the additional feature that parenthesized substrings -# from the pattern can be interpolated as $1, $2 and so on. +# Actions are the same as with normal indexed file lookups, +# with the additional feature that parenthesized substrings +# from the pattern can be interpolated as $1, $2 and so on. # # BUGS -# The table format does not understand quoting conventions. +# The table format does not understand quoting conventions. # # SEE ALSO # postmap(1) create mapping table @@ -119,7 +118,7 @@ # ACCESS(5) ACCESS(5) # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) diff --git a/postfix/conf/aliases b/postfix/conf/aliases index d5a59cbae..cdf06c1fb 100644 --- a/postfix/conf/aliases +++ b/postfix/conf/aliases @@ -39,7 +39,7 @@ decode: root # aliases - format of the Postfix alias database # # SYNOPSIS -# postalias [-c config_dir] [-v] [file_type:]input_file +# newaliases # # DESCRIPTION # The aliases file provides a system-wide mechanism to redi- @@ -47,9 +47,9 @@ decode: root # # The file serves as input to the postalias(1) command. The # result, an indexed file in dbm or db format, is used for -# fast lookup by the mail system. After an update it may -# take a minute or so before the change becomes visible. -# Issue a postfix reload command to eliminate the delay. +# fast lookup by the mail system. Execute the command +# newaliases in order to rebuild the indexed file after +# changing the Postfix alias database. # # The input and output file formats are expected to be com- # patible with Sendmail version 8, and are expected to be diff --git a/postfix/conf/canonical b/postfix/conf/canonical index cd451828d..fc3083cec 100644 --- a/postfix/conf/canonical +++ b/postfix/conf/canonical @@ -14,120 +14,120 @@ # # Normally, the file serves as input to the postmap(1) com- # mand. The result, an indexed file in dbm or db format, is -# used for fast searching by the mail system. After an -# update it may take a minute or so before the change -# becomes visible. Issue a postfix reload command to elimi- -# nate the delay. +# used for fast searching by the mail system. Execute the +# command postmap /etc/postfix/canonical in order to rebuild +# the indexed file after changing the canonical table. # -# When the table is provided via other means such as NIS, -# LDAP or SQL, the same lookups are done as for ordinary +# When the table is provided via other means such as NIS, +# LDAP or SQL, the same lookups are done as for ordinary # indexed files. # -# Alternatively, the table can be provided as a regular- +# Alternatively, the table can be provided as a regular- # expression map where patterns are given as regular expres- -# sions. In that case, the lookups are done in a slightly +# sions. In that case, the lookups are done in a slightly # different way as described below. # -# The canonical mapping affects both message header +# The canonical mapping affects both message header # addresses (i.e. addresses that appear inside messages) and -# message envelope addresses (for example, the addresses -# that are used in SMTP protocol commands). Think Sendmail +# message envelope addresses (for example, the addresses +# that are used in SMTP protocol commands). Think Sendmail # rule set S3, if you like. # -# Typically, one would use the canonical table to replace -# login names by Firstname.Lastname, or to clean up +# Typically, one would use the canonical table to replace +# login names by Firstname.Lastname, or to clean up # addresses produced by legacy mail systems. # -# The canonical mapping is not to be confused with virtual +# The canonical mapping is not to be confused with virtual # domain support. Use the virtual(5) map for that purpose. # -# The canonical mapping is not to be confused with local +# The canonical mapping is not to be confused with local # aliasing. Use the aliases(5) map for that purpose. # # TABLE FORMAT # The format of the canonical table is as follows: # # blanks and comments -# Blank lines are ignored, as are lines beginning +# Blank lines are ignored, as are lines beginning # with `#'. # # pattern result -# When pattern matches a mail address, replace it by +# When pattern matches a mail address, replace it by # the corresponding result. # +# With lookups from indexed files such as DB or DBM, or from +# # 1 # # CANONICAL(5) CANONICAL(5) # -# With lookups from indexed files such as DB or DBM, or from -# networked tables such as NIS, LDAP or SQL, patterns are +# networked tables such as NIS, LDAP or SQL, patterns are # tried in the order as listed below: # # user@domain address -# user@domain is replaced by address. This form has +# user@domain is replaced by address. This form has # the highest precedence. # -# This form useful to clean up addresses produced by -# legacy mail systems. It can also be used to pro- -# duce Firstname.Lastname style addresses, but see +# This form useful to clean up addresses produced by +# legacy mail systems. It can also be used to pro- +# duce Firstname.Lastname style addresses, but see # below for a simpler solution. # # user address # user@site is replaced by address when site is equal -# to $myorigin, when site is listed in $mydestina- +# to $myorigin, when site is listed in $mydestina- # tion, or when it is listed in $inet_interfaces. # -# This form is useful for replacing login names by +# This form is useful for replacing login names by # Firstname.Lastname. # # @domain address -# Every address in domain is replaced by address. +# Every address in domain is replaced by address. # This form has the lowest precedence. # -# In all the above forms, when address has the form @other- +# In all the above forms, when address has the form @other- # domain, the result is the same user in otherdomain. # # ADDRESS EXTENSION -# When table lookup fails, and the address localpart con- -# tains the optional recipient delimiter (e.g., -# user+foo@domain), the search is repeated for the unex- -# tended address (e.g. user@domain), and the unmatched +# When table lookup fails, and the address localpart con- +# tains the optional recipient delimiter (e.g., +# user+foo@domain), the search is repeated for the unex- +# tended address (e.g. user@domain), and the unmatched # extension is propagated to the result of table lookup. The # matching order is: user+foo@domain, user@domain, user+foo, # user, and @domain. # # REGULAR EXPRESSION TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # the table is given in the form of regular expressions. For -# a description of regular expression lookup table syntax, +# a description of regular expression lookup table syntax, # see regexp_table(5) or pcre_table(5). # -# Each pattern is a regular expression that is applied to +# Each pattern is a regular expression that is applied to # the entire address being looked up. Thus, user@domain mail -# addresses are not broken up into their user and @domain +# addresses are not broken up into their user and @domain # constituent parts, nor is user+foo broken up into user and # foo. # -# Patterns are applied in the order as specified in the -# table, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the +# table, until a pattern is found that matches the search # string. # -# Results are the same as with normal indexed file lookups, +# Results are the same as with normal indexed file lookups, +# with the additional feature that parenthesized substrings # # 2 # # CANONICAL(5) CANONICAL(5) # -# with the additional feature that parenthesized substrings -# from the pattern can be interpolated as $1, $2 and so on. +# from the pattern can be interpolated as $1, $2 and so on. # # BUGS -# The table format does not understand quoting conventions. +# The table format does not understand quoting conventions. # # CONFIGURATION PARAMETERS -# The following main.cf parameters are especially relevant -# to this topic. See the Postfix main.cf file for syntax -# details and for default values. Use the postfix reload +# The following main.cf parameters are especially relevant +# to this topic. See the Postfix main.cf file for syntax +# details and for default values. Use the postfix reload # command after a configuration change. # # canonical_maps @@ -144,19 +144,19 @@ # Other parameters of interest: # # inet_interfaces -# The network interface addresses that this system +# The network interface addresses that this system # receives mail on. # # masquerade_domains -# List of domains that hide their subdomain struc- +# List of domains that hide their subdomain struc- # ture. # # masquerade_exceptions -# List of user names that are not subject to address +# List of user names that are not subject to address # masquerading. # # mydestination -# List of domains that this mail system considers +# List of domains that this mail system considers # local. # # myorigin @@ -178,7 +178,7 @@ # CANONICAL(5) CANONICAL(5) # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) diff --git a/postfix/conf/relocated b/postfix/conf/relocated index e9be1a0ef..832b8c5ae 100644 --- a/postfix/conf/relocated +++ b/postfix/conf/relocated @@ -14,9 +14,9 @@ # # Normally, the file serves as input to the postmap(1) com- # mand. The result, an indexed file in dbm or db format, is -# used for fast searching by the mail system. After an -# update issue a postfix reload command to make the change -# visible. +# used for fast searching by the mail system. Execute the +# command postmap /etc/postfix/relocated in order to rebuild +# the indexed file after changing the relocated table. # # When the table is provided via other means such as NIS, # LDAP or SQL, the same lookups are done as for ordinary diff --git a/postfix/conf/sample-misc.cf b/postfix/conf/sample-misc.cf index 99d809c66..f2b5ff4a0 100644 --- a/postfix/conf/sample-misc.cf +++ b/postfix/conf/sample-misc.cf @@ -245,9 +245,9 @@ recipient_delimiter = # internal DNS uses no MX records, specify the name of the intranet # gateway host instead. # -# Specify a domain, host, host:port, [address] or [address:port]. -# Use the form [destination] to turn off MX lookups. See also the -# default_transport parameter if you're connected via UUCP. +# Specify a domain, host, host:port, [host]:port, [address] or +# [address]:port. Use the form [name] to turn off MX lookups. See +# also the default_transport parameter if you're connected via UUCP. # # relayhost = $mydomain # relayhost = gateway.my.domain diff --git a/postfix/conf/transport b/postfix/conf/transport index caafa50f5..072efb3f0 100644 --- a/postfix/conf/transport +++ b/postfix/conf/transport @@ -15,9 +15,9 @@ # # Normally, the file serves as input to the postmap(1) com- # mand. The result, an indexed file in dbm or db format, is -# used for fast searching by the mail system. After updating -# this table, issue the postfix reload command to make the -# change visible. +# used for fast searching by the mail system. Execute the +# command postmap /etc/postfix/transport in order to rebuild +# the indexed file after changing the transport table. # # When the table is provided via other means such as NIS, # LDAP or SQL, the same lookups are done as for ordinary @@ -67,79 +67,83 @@ # # The interpretation of the nexthop field is transport # dependent. In the case of SMTP, specify host:service for a -# non-default server port, and use [host] or [host:port] in +# non-default server port, and use [host] or [host]:port in # order to disable MX (mail exchanger) DNS lookups. The [] # form can also be used with IP addresses instead of host- # names. # # EXAMPLES -# In order to send mail for foo.org and its subdomains -# via the uucp transport to the UUCP host named foo: +# In order to send mail for foo.org and its subdomains via +# the uucp transport to the UUCP host named foo: # # foo.org uucp:foo # .foo.org uucp:foo # -# When no nexthop host name is specified, the destination domain -# name is used instead. For example, the following directs mail for -# user@foo.org via the slow transport to a mail -# exchanger for foo.org. The slow transport could be -# something that runs at most one delivery process at a time: +# When no nexthop host name is specified, the destination +# domain name is used instead. For example, the following +# directs mail for user@foo.org via the slow transport to a +# mail exchanger for foo.org. The slow transport could be +# something that runs at most one delivery process at a +# time: # # foo.org slow: # -# When no transport is specified, the default transport is +# When no transport is specified, the default transport is # used, as specified via the default_transport configuration -# parameter. The following sends all mail for foo.org and its -# subdomains to host gateway.foo.org: +# parameter. The following sends all mail for foo.org and +# its subdomains to host gateway.foo.org: # # foo.org :[gateway.foo.org] # .foo.org :[gateway.foo.org] # -# In the above example, the [] are used to suppress MX lookups. -# The result would likely point to your local machine. +# In the above example, the [] are used to suppress MX +# lookups. The result would likely point to your local +# machine. # -# In the case of delivery via SMTP, one may specify -# hostname:service instead of just a host: +# In the case of delivery via SMTP, one may specify host- +# name:service instead of just a host: # # foo.org smtp:bar.org:2025 # -# This directs mail for user@foo.org to host bar.org -# port 2025. Instead of a numerical port a symbolic name may be -# used. Specify [] around the destination in order to disable MX lookups. +# This directs mail for user@foo.org to host bar.org port +# 2025. Instead of a numerical port a symbolic name may be +# used. Specify [] around the hostname in order to disable +# MX lookups. # # The error mailer can be used to bounce mail: # -# .foo.org error:mail for *.foo.org is not deliverable -# -# This causes all mail for user@anythingfoo.org -# to be bounced. +# .foo.org error:mail for *.foo.org is not deliv- +# erable # # 2 # # TRANSPORT(5) TRANSPORT(5) # +# This causes all mail for user@anything.foo.org to be +# bounced. +# # REGULAR EXPRESSION TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # the table is given in the form of regular expressions. For -# a description of regular expression lookup table syntax, +# a description of regular expression lookup table syntax, # see regexp_table(5) or pcre_table(5). # -# Each pattern is a regular expression that is applied to +# Each pattern is a regular expression that is applied to # the entire domain being looked up. Thus, some.domain.hier- # archy is not broken up into parent domains. # -# Patterns are applied in the order as specified in the -# table, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the +# table, until a pattern is found that matches the search # string. # -# Results are the same as with normal indexed file lookups, -# with the additional feature that parenthesized substrings -# from the pattern can be interpolated as $1, $2 and so on. +# Results are the same as with normal indexed file lookups, +# with the additional feature that parenthesized substrings +# from the pattern can be interpolated as $1, $2 and so on. # # CONFIGURATION PARAMETERS -# The following main.cf parameters are especially relevant -# to this topic. See the Postfix main.cf file for syntax -# details and for default values. Use the postfix reload +# The following main.cf parameters are especially relevant +# to this topic. See the Postfix main.cf file for syntax +# details and for default values. Use the postfix reload # command after a configuration change. # # transport_maps @@ -148,7 +152,7 @@ # Other parameters of interest: # # default_transport -# The transport to use when no transport is explic- +# The transport to use when no transport is explic- # itly specified. # # relayhost @@ -162,14 +166,19 @@ # regexp_table(5) format of POSIX regular expression tables # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) # Wietse Venema # IBM T.J. Watson Research # P.O. Box 704 -# Yorktown Heights, NY 10598, USA # # 3 # +# TRANSPORT(5) TRANSPORT(5) +# +# Yorktown Heights, NY 10598, USA +# +# 4 +# diff --git a/postfix/conf/virtual b/postfix/conf/virtual index 57b64b3cb..9d3fef76d 100644 --- a/postfix/conf/virtual +++ b/postfix/conf/virtual @@ -21,37 +21,37 @@ # # Normally, the file serves as input to the postmap(1) com- # mand. The result, an indexed file in dbm or db format, is -# used for fast searching by the mail system. After an -# update it may take a minute or so before the change -# becomes visible. Issue a postfix reload command to elimi- -# nate the delay. +# used for fast searching by the mail system. Execute the +# command postmap /etc/postfix/virtual in order to rebuild +# the indexed file after changing the virtual table. # -# When the table is provided via other means such as NIS, -# LDAP or SQL, the same lookups are done as for ordinary +# When the table is provided via other means such as NIS, +# LDAP or SQL, the same lookups are done as for ordinary # indexed files. # -# Alternatively, the table can be provided as a regular- +# Alternatively, the table can be provided as a regular- # expression map where patterns are given as regular expres- -# sions. In that case, the lookups are done in a slightly +# sions. In that case, the lookups are done in a slightly # different way as described below. # # TABLE FORMAT -# Typical support for a virtual domain looks like the fol- +# Typical support for a virtual domain looks like the fol- # lowing: # # virtual.domain anything (right-hand content does not matter) +# postmaster@virtual.domain postmaster # user1@virtual.domain address1 # user2@virtual.domain address2, address3 # # With this, the SMTP server accepts mail for virtual.domain -# and rejects mail for unknown@virtual.domain as undeliver- +# and rejects mail for unknown@virtual.domain as undeliver- # able. # -# The format of the virtual table is as follows, mappings +# The format of the virtual table is as follows, mappings # being tried in the order as listed in this manual page: # # blanks and comments -# Blank lines are ignored, as are lines beginning +# Blank lines are ignored, as are lines beginning # with `#'. # # 1 @@ -59,75 +59,75 @@ # VIRTUAL(5) VIRTUAL(5) # # pattern result -# When pattern matches a mail address, replace it by +# When pattern matches a mail address, replace it by # the corresponding result. # # With lookups from indexed files such as DB or DBM, or from -# networked tables such as NIS, LDAP or SQL, patterns are +# networked tables such as NIS, LDAP or SQL, patterns are # tried in the order as listed below: # # user@domain address, address, ... -# Mail for user@domain is redirected to address. +# Mail for user@domain is redirected to address. # This form has the highest precedence. # # user address, address, ... -# Mail for user@site is redirected to address when -# site is equal to $myorigin, when site is listed in +# Mail for user@site is redirected to address when +# site is equal to $myorigin, when site is listed in # $mydestination, or when it is listed in # $inet_interfaces. # -# This functionality overlaps with functionality of +# This functionality overlaps with functionality of # the local alias(5) database. The difference is that -# virtual mapping can be applied to non-local +# virtual mapping can be applied to non-local # addresses. # # @domain address, address, ... -# Mail for any user in domain is redirected to +# Mail for any user in domain is redirected to # address. This form has the lowest precedence. # -# In all the above forms, when address has the form @other- -# domain, the result is the same user in otherdomain. This +# In all the above forms, when address has the form @other- +# domain, the result is the same user in otherdomain. This # works for the first address in the expansion only. # # ADDRESS EXTENSION -# When the search fails, and the address localpart contains -# the optional recipient delimiter (e.g., user+foo@domain), -# the search is repeated for the unextended address (e.g. +# When the search fails, and the address localpart contains +# the optional recipient delimiter (e.g., user+foo@domain), +# the search is repeated for the unextended address (e.g. # user@domain), and the unmatched address extension is prop- -# agated to the result of expansion. The matching order is: +# agated to the result of expansion. The matching order is: # user+foo@domain, user@domain, user+foo, user, and @domain. # # REGULAR EXPRESSION TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # the table is given in the form of regular expressions. For -# a description of regular expression lookup table syntax, +# a description of regular expression lookup table syntax, # see regexp_table(5) or pcre_table(5). # -# Each pattern is a regular expression that is applied to +# Each pattern is a regular expression that is applied to # the entire address being looked up. Thus, user@domain mail -# addresses are not broken up into their user and @domain +# addresses are not broken up into their user and @domain # constituent parts, nor is user+foo broken up into user and # foo. # -# Patterns are applied in the order as specified in the -# table, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the +# table, until a pattern is found that matches the search # string. # # 2 # # VIRTUAL(5) VIRTUAL(5) # -# Results are the same as with normal indexed file lookups, -# with the additional feature that parenthesized substrings -# from the pattern can be interpolated as $1, $2 and so on. +# Results are the same as with normal indexed file lookups, +# with the additional feature that parenthesized substrings +# from the pattern can be interpolated as $1, $2 and so on. # # BUGS -# The table format does not understand quoting conventions. +# The table format does not understand quoting conventions. # # CONFIGURATION PARAMETERS -# The following main.cf parameters are especially relevant -# to this topic. See the Postfix main.cf file for syntax -# details and for default values. Use the postfix reload +# The following main.cf parameters are especially relevant +# to this topic. See the Postfix main.cf file for syntax +# details and for default values. Use the postfix reload # command after a configuration change. # # virtual_maps @@ -136,11 +136,11 @@ # Other parameters of interest: # # inet_interfaces -# The network interface addresses that this system +# The network interface addresses that this system # receives mail on. # # mydestination -# List of domains that this mail system considers +# List of domains that this mail system considers # local. # # myorigin @@ -157,7 +157,7 @@ # regexp_table(5) format of POSIX regular expression tables # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) diff --git a/postfix/dns/.printfck b/postfix/dns/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/dns/.printfck +++ b/postfix/dns/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/error/.printfck b/postfix/error/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/error/.printfck +++ b/postfix/error/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/fsstone/.printfck b/postfix/fsstone/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/fsstone/.printfck +++ b/postfix/fsstone/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/global/.printfck b/postfix/global/.printfck index 65eb6bfa6..66016ed45 100644 --- a/postfix/global/.printfck +++ b/postfix/global/.printfck @@ -9,7 +9,7 @@ msg_fatal 0 0 msg_info 0 0 msg_panic 0 0 msg_warn 0 0 -opened 3 0 +opened 4 0 post_mail_fprintf 1 0 qmgr_message_bounce 2 0 rec_fprintf 2 0 diff --git a/postfix/global/mail_open_ok.c b/postfix/global/mail_open_ok.c index 9824971a9..8f9ffb253 100644 --- a/postfix/global/mail_open_ok.c +++ b/postfix/global/mail_open_ok.c @@ -97,14 +97,14 @@ int mail_open_ok(const char *queue_name, const char *queue_id, return (MAIL_OPEN_NO); } if (!S_ISREG(statp->st_mode)) { - msg_warn("%s: uid %d: not a regular file", *path, statp->st_uid); + msg_warn("%s: uid %ld: not a regular file", *path, (long) statp->st_uid); return (MAIL_OPEN_NO); } if ((statp->st_mode & S_IRWXU) != MAIL_QUEUE_STAT_READY) return (MAIL_OPEN_NO); if (statp->st_nlink > 1) { - msg_warn("%s: uid %d: file has %d links", *path, - statp->st_uid, (int) statp->st_nlink); + msg_warn("%s: uid %ld: file has %d links", *path, + (long) statp->st_uid, (int) statp->st_nlink); } return (MAIL_OPEN_YES); } diff --git a/postfix/global/mail_version.h b/postfix/global/mail_version.h index 24ecdf683..f54d6f568 100644 --- a/postfix/global/mail_version.h +++ b/postfix/global/mail_version.h @@ -15,7 +15,7 @@ * Version of this program. */ #define VAR_MAIL_VERSION "mail_version" -#define DEF_MAIL_VERSION "Snapshot-20000919" +#define DEF_MAIL_VERSION "Snapshot-20000920" extern char *var_mail_version; /* LICENSE diff --git a/postfix/html/faq.html b/postfix/html/faq.html index 2d4d47e0a..afaeaefe0 100644 --- a/postfix/html/faq.html +++ b/postfix/html/faq.html @@ -46,6 +46,8 @@
  • Other transports: UUCP, FAX, etc. +
  • Postfix queue maintenance +
  • Compiling and installing Postfix @@ -103,6 +105,8 @@ distribution list
  • Too much mail in the incoming queue +
  • Postfix responds slowly to incoming SMTP connections +

    Receiving mail via the network

    @@ -241,6 +245,16 @@ mailbox     +

    Postfix queue maintenance

     + + +

    Compiling and installing Postfix