From: Wietse Venema Date: Mon, 20 Nov 2000 05:00:00 +0000 (-0500) Subject: snapshot-20001120 X-Git-Tag: v20010228~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b685f831586a856261d72d460af8b5cb40c0b8d;p=thirdparty%2Fpostfix.git snapshot-20001120 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index 94c96bcd3..cc90d46a7 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -4470,6 +4470,7 @@ Apologies for any names omitted. and nqmgr/qmgr_queue.c. Yup, changed the same code, again. We now allow for a margin above the actual concurrency, with the size of the initial destination concurrency. + Final solution by Patrik Rak. Bugfix: the recipient home directory test broke mailbox_transport support for non-UNIX recipients. File: local/recipient.c. @@ -4497,3 +4498,21 @@ Apologies for any names omitted. several FAQ entries concerning virtual domain support. Documentation: added FAQ entry for the biff service. + +20001119 + + Bugfix: per-destination queue names were case sensitive so + that the same site could have multiple queues. Reported + by Patrik Rak. Files: *qmgr/qmgr_message.c. + +20001120 + + Bugfix: per-destination deferred mail logfiles were case + sensitive so that the same site could have multiple deferred + mail logfiles, so that not all mail would be flushed with + ETRN. Reported by Ralph Hildebrandt. Files: flush/flush.c. + + Portability: added (int) casts to printf-like arguments + that specify the width of %*letter conversions. On some + systems, sizeof and pointer difference expressions are + wider than an int. Reported by Valentin Nechayev @ lucky.net. diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 8ff741942..2b077fba0 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,9 +1,24 @@ -Incompatible changes with snapshot-20001104 +Incompatible changes with snapshot-20001120 =========================================== On RedHat Linux 7.0, you must install the db3-devel RPM before you can compile the Postfix source code. +Major changes with snapshot-20001120 +==================================== + +The mailbox_transport feature works again. + +Postfix now supports both Sendmail-style virtual domains (all local +users and aliases are visible in all virtual domains) and Postfix-style +virtual domains (local users and aliases are not visible in virtual +domains). Details and examples are given in the revised virtual +manual page. + +The soft bounce feature now includes the Postfix SMTP server. +Specify "soft_bounce = yes" in main.cf to prevent the SMTP server +from bouncing mail while you are testing configurations. + Incompatible changes with snapshot-20001029 =========================================== diff --git a/postfix/conf/access b/postfix/conf/access index 06e3ebec2..a8a9d354f 100644 --- a/postfix/conf/access +++ b/postfix/conf/access @@ -13,30 +13,31 @@ # hosts, domains, networks, host addresses or mail # addresses. # -# 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. 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 +# Normally, the access table is specified as a text file +# that serves as input to the postmap(1) command. The +# result, an indexed file in dbm or db format, is 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 # 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 `#'. # # leading whitespace -# Lines that begin with whitespace continue the pre- +# Lines that begin with whitespace continue the pre- # vious line. # # pattern action @@ -45,22 +46,23 @@ # # 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. -# Top-level domains will never be matched. +# Matches the domain.name itself and any subdomain +# thereof, either in hostnames or in mail addresses. # # 1 # # ACCESS(5) ACCESS(5) # -# user@ Matches all mail addresses with the specified user +# Top-level domains will never be matched. +# +# user@ Matches all mail addresses with the specified user # part. # # net.work.addr.ess @@ -69,13 +71,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 @@ -87,43 +89,42 @@ # 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. -# -# SEE ALSO -# postmap(1) create mapping table -# smtpd(8) smtp server +# The table format does not understand quoting conventions. # # 2 # # ACCESS(5) ACCESS(5) # +# SEE ALSO +# postmap(1) create mapping table +# smtpd(8) smtp server # pcre_table(5) format of PCRE tables # 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/conf/aliases b/postfix/conf/aliases index 6ef99b3ff..9e36acefc 100644 --- a/postfix/conf/aliases +++ b/postfix/conf/aliases @@ -42,18 +42,19 @@ decode: root # newaliases # # DESCRIPTION -# The aliases file provides a system-wide mechanism to redi- -# rect mail for local recipients. The redirections are pro- -# cessed by the Postfix local(8) delivery agent. -# -# 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. Execute the command -# newaliases in order to rebuild the indexed file after +# The aliases table provides a system-wide mechanism to +# redirect mail for local recipients. The redirections are +# processed by the Postfix local(8) delivery agent. +# +# Normally, the aliases table is specified as a text file +# that 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. 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 +# The input and output file formats are expected to be com- +# patible with Sendmail version 8, and are expected to be # suitable for the use as NIS maps. # # Users can control delivery of their own mail by setting up @@ -67,23 +68,23 @@ decode: root # # name: value1, value2, ... # -# o Lines that begin with whitespace continue the pre- +# o Lines that begin with whitespace continue the pre- # vious line. # -# o Blank lines are ignored, as are lines beginning +# o Blank lines are ignored, as are lines beginning # with `#'. # -# The name is a local address (no domain part). Use double -# quotes when the name contains any special characters such -# as whitespace, `#', `:', or `@'. The name is folded to +# The name is a local address (no domain part). Use double +# quotes when the name contains any special characters such +# as whitespace, `#', `:', or `@'. The name is folded to # lowercase, in order to make database lookups case insensi- # tive. # # In addition, when an alias exists for owner-name, delivery -# diagnostics are directed to that address, instead of to +# diagnostics are directed to that address, instead of to # the originator. This is typically used to direct delivery -# errors to the owner of a mailing list, who is in a better -# position to deal with mailing list delivery problems than +# errors to the owner of a mailing list, who is in a better +# position to deal with mailing list delivery problems than # the originator of the undelivered mail. # # The value contains one or more of the following: @@ -93,30 +94,30 @@ decode: root # ALIASES(5) ALIASES(5) # # address -# Mail is forwarded to address, which is compatible +# Mail is forwarded to address, which is compatible # with the RFC 822 standard. # # /file/name -# Mail is appended to /file/name. See local(8) for -# details of delivery to file. Delivery is not lim- -# ited to regular files. For example, to dispose of +# Mail is appended to /file/name. See local(8) for +# details of delivery to file. Delivery is not lim- +# ited to regular files. For example, to dispose of # unwanted mail, deflect it to /dev/null. # # |command -# Mail is piped into command. Commands that contain -# special characters, such as whitespace, should be -# enclosed between double quotes. See local(8) for +# Mail is piped into command. Commands that contain +# special characters, such as whitespace, should be +# enclosed between double quotes. See local(8) for # details of delivery to command. # # When the command fails, a limited amount of command -# output is mailed back to the sender. The file -# /usr/include/sysexits.h defines the expected exit -# status codes. For example, use |"exit 67" to simu- -# late a "user unknown" error, and |"exit 0" to +# output is mailed back to the sender. The file +# /usr/include/sysexits.h defines the expected exit +# status codes. For example, use |"exit 67" to simu- +# late a "user unknown" error, and |"exit 0" to # implement an expensive black hole. # # :include:/file/name -# Mail is sent to the destinations listed in the +# Mail is sent to the destinations listed in the # named file. Lines in :include: files have the same # syntax as the right-hand side of alias entries. # @@ -128,21 +129,21 @@ decode: root # # ADDRESS EXTENSION # When alias database search fails, and the recipient local- -# part contains the optional recipient delimiter (e.g., -# user+foo), the search is repeated for the unextended +# part contains the optional recipient delimiter (e.g., +# user+foo), the search is repeated for the unextended # address (e.g., user). # # 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. # # alias_maps # List of alias databases. # # allow_mail_to_commands -# Restrict the usage of mail delivery to external +# Restrict the usage of mail delivery to external # command. # # 2 @@ -150,7 +151,7 @@ decode: root # ALIASES(5) ALIASES(5) # # allow_mail_to_files -# Restrict the usage of mail delivery to external +# Restrict the usage of mail delivery to external # file. # # owner_request_special @@ -158,7 +159,7 @@ decode: root # addresses. # # recipient_delimiter -# Delimiter that separates recipients from address +# Delimiter that separates recipients from address # extensions. # # STANDARDS @@ -169,7 +170,7 @@ decode: root # postalias(1) alias database management # # 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 bd1dfa469..37e2f29d0 100644 --- a/postfix/conf/relocated +++ b/postfix/conf/relocated @@ -8,23 +8,24 @@ # postmap /etc/postfix/relocated # # DESCRIPTION -# The optional relocated file provides the information that +# The optional relocated table provides the information that # is used in "user has moved to new_location" bounce mes- # sages. # -# 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. Execute the -# command postmap /etc/postfix/relocated in order to rebuild -# the indexed file after changing the relocated table. +# Normally, the relocated table is specified as a text file +# that serves as input to the postmap(1) command. The +# result, an indexed file in dbm or db format, is 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 +# 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 lookups are case insensitive. @@ -32,71 +33,72 @@ # TABLE FORMAT # The format of the table is as follows: # -# o Blank lines are ignored, as are lines beginning +# o Blank lines are ignored, as are lines beginning # with `#'. # -# o Lines that begin with whitespace continue the pre- +# o Lines that begin with whitespace continue the pre- # vious line. # # o An entry has one of the following form: # key new_location -# Where new_location specifies contact information -# such as an email address, or perhaps a street +# Where new_location specifies contact information +# such as an email address, or perhaps a street # address or telephone number. # # With lookups from indexed files such as DB or DBM, or from -# networked tables such as NIS, LDAP or SQL, the key field +# networked tables such as NIS, LDAP or SQL, the key field # is one of the following: # # user@domain -# Matches user@domain. This form has precedence over +# Matches user@domain. This form has precedence over # all other forms. # # user Matches user@site when site is $myorigin, when site # is listed in $mydestination, or when site is listed -# in $inet_interfaces. # # 1 # # RELOCATED(5) RELOCATED(5) # +# in $inet_interfaces. +# # @domain -# Matches every address in domain. This form has the +# Matches every address in domain. This form has the # lowest precedence. # # 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). # # 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, -# 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. # # relocated_maps @@ -105,27 +107,27 @@ # 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 -# The domain that is appended to locally-posted mail. -# # 2 # # RELOCATED(5) RELOCATED(5) # +# myorigin +# The domain that is appended to locally-posted mail. +# # SEE ALSO # postmap(1) create lookup table # pcre_table(5) format of PCRE tables # 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/conf/transport b/postfix/conf/transport index b14e6814f..33ccfc00f 100644 --- a/postfix/conf/transport +++ b/postfix/conf/transport @@ -8,109 +8,110 @@ # postmap /etc/postfix/transport # # DESCRIPTION -# The optional transport file specifies a mapping from +# The optional transport table specifies a mapping from # domain hierarchies to message delivery transports and/or # relay hosts. The mapping is used by the trivial-rewrite(8) # daemon. # -# 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. Execute the -# command postmap /etc/postfix/transport in order to rebuild -# the indexed file after changing the transport table. +# Normally, the transport table is specified as a text file +# that serves as input to the postmap(1) command. The +# result, an indexed file in dbm or db format, is 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 +# 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 transport table is as follows: # # blanks and comments -# Blank lines are ignored, as are lines beginning +# Blank lines are ignored, as are lines beginning # with `#'. # # leading whitespace -# Lines that begin with whitespace continue the pre- +# Lines that begin with whitespace continue the pre- # vious line. # # pattern result -# When pattern matches the domain, use the corre- +# When pattern matches the domain, use the corre- # sponding 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: # # domain transport:nexthop -# Mail for domain is delivered through transport to +# Mail for domain is delivered through transport to # nexthop. # # .domain transport:nexthop -# Mail for any subdomain of domain is delivered +# Mail for any subdomain of domain is delivered # through transport to nexthop. # # 1 # # TRANSPORT(5) TRANSPORT(5) # -# Note: transport map entries take precedence over domains -# specified in the mydestination parameter. If you use the +# Note: transport map entries take precedence over domains +# specified in the mydestination parameter. If you use the # optional transport map, it may be safer to specify -# explicit entries for all domains specified in mydestina- +# explicit entries for all domains specified in mydestina- # tion, for example: # # hostname.my.domain local: # localhost.my.domain local: # -# The interpretation of the nexthop field is transport +# 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 -# order to disable MX (mail exchanger) DNS lookups. The [] -# form can also be used with IP addresses instead of host- +# 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 +# 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 +# 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 +# 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 +# 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 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 hostname in order to disable +# 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. # # 2 @@ -119,34 +120,34 @@ # # The error mailer can be used to bounce mail: # -# .foo.org error:mail for *.foo.org is not deliv- +# .foo.org error:mail for *.foo.org is not deliv- # erable # -# This causes all mail for user@anything.foo.org to be +# 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 @@ -155,7 +156,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 @@ -169,7 +170,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. # # 3 diff --git a/postfix/html/access.5.html b/postfix/html/access.5.html index f99e6e146..383ba957e 100644 --- a/postfix/html/access.5.html +++ b/postfix/html/access.5.html @@ -17,30 +17,31 @@ ACCESS(5) ACCESS(5) hosts, domains, networks, host addresses or mail addresses. - 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. 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 + Normally, the access table is specified as a text file + that serves as input to the postmap(1) command. The + result, an indexed file in dbm or db format, is 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 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 `#'. leading whitespace - Lines that begin with whitespace continue the pre- + Lines that begin with whitespace continue the pre- vious line. pattern action @@ -49,16 +50,15 @@ ACCESS(5) ACCESS(5) 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. - Top-level domains will never be matched. + Matches the domain.name itself and any subdomain + thereof, either in hostnames or in mail addresses. @@ -71,7 +71,9 @@ ACCESS(5) ACCESS(5) ACCESS(5) ACCESS(5) - user@ Matches all mail addresses with the specified user + Top-level domains will never be matched. + + user@ Matches all mail addresses with the specified user part. net.work.addr.ess @@ -80,13 +82,13 @@ ACCESS(5) ACCESS(5) 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 @@ -98,33 +100,31 @@ ACCESS(5) ACCESS(5) 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 - smtpd(8) smtp server @@ -137,11 +137,14 @@ ACCESS(5) ACCESS(5) ACCESS(5) ACCESS(5) +SEE ALSO + postmap(1) create mapping table + smtpd(8) smtp server pcre_table(5) format of PCRE tables 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) @@ -187,9 +190,6 @@ ACCESS(5) ACCESS(5) - - - diff --git a/postfix/html/aliases.5.html b/postfix/html/aliases.5.html index a5ddb2163..8eef37550 100644 --- a/postfix/html/aliases.5.html +++ b/postfix/html/aliases.5.html @@ -12,18 +12,19 @@ ALIASES(5) ALIASES(5) newaliases DESCRIPTION - The aliases file provides a system-wide mechanism to redi- - rect mail for local recipients. The redirections are pro- - cessed by the Postfix local(8) delivery agent. - - 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. Execute the command - newaliases in order to rebuild the indexed file after + The aliases table provides a system-wide mechanism to + redirect mail for local recipients. The redirections are + processed by the Postfix local(8) delivery agent. + + Normally, the aliases table is specified as a text file + that 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. 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 + The input and output file formats are expected to be com- + patible with Sendmail version 8, and are expected to be suitable for the use as NIS maps. Users can control delivery of their own mail by setting up @@ -37,23 +38,23 @@ ALIASES(5) ALIASES(5) name: value1, value2, ... - o Lines that begin with whitespace continue the pre- + o Lines that begin with whitespace continue the pre- vious line. - o Blank lines are ignored, as are lines beginning + o Blank lines are ignored, as are lines beginning with `#'. - The name is a local address (no domain part). Use double - quotes when the name contains any special characters such - as whitespace, `#', `:', or `@'. The name is folded to + The name is a local address (no domain part). Use double + quotes when the name contains any special characters such + as whitespace, `#', `:', or `@'. The name is folded to lowercase, in order to make database lookups case insensi- tive. In addition, when an alias exists for owner-name, delivery - diagnostics are directed to that address, instead of to + diagnostics are directed to that address, instead of to the originator. This is typically used to direct delivery - errors to the owner of a mailing list, who is in a better - position to deal with mailing list delivery problems than + errors to the owner of a mailing list, who is in a better + position to deal with mailing list delivery problems than the originator of the undelivered mail. The value contains one or more of the following: @@ -61,7 +62,6 @@ ALIASES(5) ALIASES(5) - 1 @@ -72,30 +72,30 @@ ALIASES(5) ALIASES(5) address - Mail is forwarded to address, which is compatible + Mail is forwarded to address, which is compatible with the RFC 822 standard. /file/name - Mail is appended to /file/name. See local(8) for - details of delivery to file. Delivery is not lim- - ited to regular files. For example, to dispose of + Mail is appended to /file/name. See local(8) for + details of delivery to file. Delivery is not lim- + ited to regular files. For example, to dispose of unwanted mail, deflect it to /dev/null. |command - Mail is piped into command. Commands that contain - special characters, such as whitespace, should be - enclosed between double quotes. See local(8) for + Mail is piped into command. Commands that contain + special characters, such as whitespace, should be + enclosed between double quotes. See local(8) for details of delivery to command. When the command fails, a limited amount of command - output is mailed back to the sender. The file - /usr/include/sysexits.h defines the expected exit - status codes. For example, use |"exit 67" to simu- - late a "user unknown" error, and |"exit 0" to + output is mailed back to the sender. The file + /usr/include/sysexits.h defines the expected exit + status codes. For example, use |"exit 67" to simu- + late a "user unknown" error, and |"exit 0" to implement an expensive black hole. :include:/file/name - Mail is sent to the destinations listed in the + Mail is sent to the destinations listed in the named file. Lines in :include: files have the same syntax as the right-hand side of alias entries. @@ -107,21 +107,21 @@ ALIASES(5) ALIASES(5) ADDRESS EXTENSION When alias database search fails, and the recipient local- - part contains the optional recipient delimiter (e.g., - user+foo), the search is repeated for the unextended + part contains the optional recipient delimiter (e.g., + user+foo), the search is repeated for the unextended address (e.g., user). 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. alias_maps List of alias databases. allow_mail_to_commands - Restrict the usage of mail delivery to external + Restrict the usage of mail delivery to external command. @@ -138,7 +138,7 @@ ALIASES(5) ALIASES(5) allow_mail_to_files - Restrict the usage of mail delivery to external + Restrict the usage of mail delivery to external file. owner_request_special @@ -146,7 +146,7 @@ ALIASES(5) ALIASES(5) addresses. recipient_delimiter - Delimiter that separates recipients from address + Delimiter that separates recipients from address extensions. STANDARDS @@ -157,7 +157,7 @@ ALIASES(5) ALIASES(5) postalias(1) alias database management 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/html/flush.8.html b/postfix/html/flush.8.html index 5dd44230a..c9b618588 100644 --- a/postfix/html/flush.8.html +++ b/postfix/html/flush.8.html @@ -56,7 +56,7 @@ FLUSH(8) FLUSH(8) FLUSH_REQ_REFRESH (completes in the background) Refresh non-empty per-destination logfiles that - were not read in $fast_flush_refresh_time hours, by + were not read in fast_flush_refresh_time hours, by simulating send requests (see above) for the corre- sponding destinations. diff --git a/postfix/html/relocated.5.html b/postfix/html/relocated.5.html index f7309f0dc..d25a04597 100644 --- a/postfix/html/relocated.5.html +++ b/postfix/html/relocated.5.html @@ -12,23 +12,24 @@ RELOCATED(5) RELOCATED(5) postmap /etc/postfix/relocated DESCRIPTION - The optional relocated file provides the information that + The optional relocated table provides the information that is used in "user has moved to new_location" bounce mes- sages. - 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. Execute the - command postmap /etc/postfix/relocated in order to rebuild - the indexed file after changing the relocated table. + Normally, the relocated table is specified as a text file + that serves as input to the postmap(1) command. The + result, an indexed file in dbm or db format, is 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 + 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 lookups are case insensitive. @@ -36,29 +37,28 @@ RELOCATED(5) RELOCATED(5) TABLE FORMAT The format of the table is as follows: - o Blank lines are ignored, as are lines beginning + o Blank lines are ignored, as are lines beginning with `#'. - o Lines that begin with whitespace continue the pre- + o Lines that begin with whitespace continue the pre- vious line. o An entry has one of the following form: key new_location - Where new_location specifies contact information - such as an email address, or perhaps a street + Where new_location specifies contact information + such as an email address, or perhaps a street address or telephone number. With lookups from indexed files such as DB or DBM, or from - networked tables such as NIS, LDAP or SQL, the key field + networked tables such as NIS, LDAP or SQL, the key field is one of the following: user@domain - Matches user@domain. This form has precedence over + Matches user@domain. This form has precedence over all other forms. user Matches user@site when site is $myorigin, when site is listed in $mydestination, or when site is listed - in $inet_interfaces. @@ -71,43 +71,45 @@ RELOCATED(5) RELOCATED(5) RELOCATED(5) RELOCATED(5) + in $inet_interfaces. + @domain - Matches every address in domain. This form has the + Matches every address in domain. This form has the lowest precedence. 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). 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, - 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. relocated_maps @@ -116,15 +118,13 @@ RELOCATED(5) RELOCATED(5) 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 - The domain that is appended to locally-posted mail. @@ -137,13 +137,16 @@ RELOCATED(5) RELOCATED(5) RELOCATED(5) RELOCATED(5) + myorigin + The domain that is appended to locally-posted mail. + SEE ALSO postmap(1) create lookup table pcre_table(5) format of PCRE tables 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) @@ -187,9 +190,6 @@ RELOCATED(5) RELOCATED(5) - - - diff --git a/postfix/html/transport.5.html b/postfix/html/transport.5.html index 96a8a29cb..c384739dd 100644 --- a/postfix/html/transport.5.html +++ b/postfix/html/transport.5.html @@ -12,56 +12,56 @@ TRANSPORT(5) TRANSPORT(5) postmap /etc/postfix/transport DESCRIPTION - The optional transport file specifies a mapping from + The optional transport table specifies a mapping from domain hierarchies to message delivery transports and/or relay hosts. The mapping is used by the trivial-rewrite(8) daemon. - 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. Execute the - command postmap /etc/postfix/transport in order to rebuild - the indexed file after changing the transport table. + Normally, the transport table is specified as a text file + that serves as input to the postmap(1) command. The + result, an indexed file in dbm or db format, is 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 + 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 transport table is as follows: blanks and comments - Blank lines are ignored, as are lines beginning + Blank lines are ignored, as are lines beginning with `#'. leading whitespace - Lines that begin with whitespace continue the pre- + Lines that begin with whitespace continue the pre- vious line. pattern result - When pattern matches the domain, use the corre- + When pattern matches the domain, use the corre- sponding 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: domain transport:nexthop - Mail for domain is delivered through transport to + Mail for domain is delivered through transport to nexthop. .domain transport:nexthop - Mail for any subdomain of domain is delivered + Mail for any subdomain of domain is delivered through transport to nexthop. - 1 @@ -71,58 +71,58 @@ TRANSPORT(5) TRANSPORT(5) TRANSPORT(5) TRANSPORT(5) - Note: transport map entries take precedence over domains - specified in the mydestination parameter. If you use the + Note: transport map entries take precedence over domains + specified in the mydestination parameter. If you use the optional transport map, it may be safer to specify - explicit entries for all domains specified in mydestina- + explicit entries for all domains specified in mydestina- tion, for example: hostname.my.domain local: localhost.my.domain local: - The interpretation of the nexthop field is transport + 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 - order to disable MX (mail exchanger) DNS lookups. The [] - form can also be used with IP addresses instead of host- + 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 + 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 + 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 + 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 + 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 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 hostname in order to disable + 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. @@ -139,34 +139,34 @@ TRANSPORT(5) TRANSPORT(5) The error mailer can be used to bounce mail: - .foo.org error:mail for *.foo.org is not deliv- + .foo.org error:mail for *.foo.org is not deliv- erable - This causes all mail for user@anything.foo.org to be + 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 @@ -175,7 +175,7 @@ TRANSPORT(5) TRANSPORT(5) 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 @@ -189,7 +189,7 @@ TRANSPORT(5) TRANSPORT(5) 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. diff --git a/postfix/man/man5/access.5 b/postfix/man/man5/access.5 index 8c75d020d..39a376ecd 100644 --- a/postfix/man/man5/access.5 +++ b/postfix/man/man5/access.5 @@ -16,7 +16,8 @@ The optional \fBaccess\fR table directs the Postfix SMTP server to selectively reject or accept mail from or to specific hosts, domains, networks, host addresses or mail addresses. -Normally, the table serves as input to the \fBpostmap\fR(1) command. +Normally, the \fBaccess\fR table is specified as a text file +that serves as input to the \fBpostmap\fR(1) command. The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used for fast searching by the mail system. Execute the command \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed diff --git a/postfix/man/man5/aliases.5 b/postfix/man/man5/aliases.5 index fe84a1844..49edca843 100644 --- a/postfix/man/man5/aliases.5 +++ b/postfix/man/man5/aliases.5 @@ -13,11 +13,12 @@ format of the Postfix alias database .SH DESCRIPTION .ad .fi -The \fBaliases\fR file provides a system-wide mechanism to +The \fBaliases\fR table provides a system-wide mechanism to redirect mail for local recipients. The redirections are processed by the Postfix \fBlocal\fR(8) delivery agent. -The file serves as input to the \fBpostalias\fR(1) command. The +Normally, the \fBaliases\fR table is specified as a text file +that serves as input to the \fBpostalias\fR(1) command. The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used for fast lookup by the mail system. Execute the command \fBnewaliases\fR in order to rebuild the indexed file after diff --git a/postfix/man/man5/relocated.5 b/postfix/man/man5/relocated.5 index b3766f653..727a732f6 100644 --- a/postfix/man/man5/relocated.5 +++ b/postfix/man/man5/relocated.5 @@ -12,10 +12,11 @@ format of Postfix relocated table .SH DESCRIPTION .ad .fi -The optional \fBrelocated\fR file provides the information that is +The optional \fBrelocated\fR table provides the information that is used in "user has moved to \fInew_location\fR" bounce messages. -Normally, the file serves as input to the \fBpostmap\fR(1) command. +Normally, the \fBrelocated\fR table is specified as a text file +that serves as input to the \fBpostmap\fR(1) command. The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used for fast searching by the mail system. Execute the command \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed diff --git a/postfix/man/man5/transport.5 b/postfix/man/man5/transport.5 index cb3ab02cf..386d763f3 100644 --- a/postfix/man/man5/transport.5 +++ b/postfix/man/man5/transport.5 @@ -12,11 +12,12 @@ format of Postfix transport table .SH DESCRIPTION .ad .fi -The optional \fBtransport\fR file specifies a mapping from domain +The optional \fBtransport\fR table specifies a mapping from domain hierarchies to message delivery transports and/or relay hosts. The mapping is used by the \fBtrivial-rewrite\fR(8) daemon. -Normally, the file serves as input to the \fBpostmap\fR(1) command. +Normally, the \fBtransport\fR table is specified as a text file +that serves as input to the \fBpostmap\fR(1) command. The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used for fast searching by the mail system. Execute the command \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed diff --git a/postfix/man/man8/flush.8 b/postfix/man/man8/flush.8 index 7a994205b..57eb598ce 100644 --- a/postfix/man/man8/flush.8 +++ b/postfix/man/man8/flush.8 @@ -50,7 +50,7 @@ This wakeup request from the master is an alternative way to request \fBFLUSH_REQ_REFRESH\fR. .IP "\fBFLUSH_REQ_REFRESH\fR (completes in the background)" Refresh non-empty per-destination logfiles that were not read in -\fB$fast_flush_refresh_time\fR hours, by simulating +\fBfast_flush_refresh_time\fR hours, by simulating send requests (see above) for the corresponding destinations. .sp Delete empty per-destination logfiles that were not updated in diff --git a/postfix/proto/access b/postfix/proto/access index 398ad4ef8..1402fb628 100644 --- a/postfix/proto/access +++ b/postfix/proto/access @@ -10,7 +10,8 @@ # to selectively reject or accept mail from or to specific hosts, # domains, networks, host addresses or mail addresses. # -# Normally, the table serves as input to the \fBpostmap\fR(1) command. +# Normally, the \fBaccess\fR table is specified as a text file +# that serves as input to the \fBpostmap\fR(1) command. # The result, an indexed file in \fBdbm\fR or \fBdb\fR format, # is used for fast searching by the mail system. Execute the command # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed diff --git a/postfix/proto/aliases b/postfix/proto/aliases index 16f44bfb9..cc9680b01 100644 --- a/postfix/proto/aliases +++ b/postfix/proto/aliases @@ -7,11 +7,12 @@ # .fi # \fBnewaliases\fR # DESCRIPTION -# The \fBaliases\fR file provides a system-wide mechanism to +# The \fBaliases\fR table provides a system-wide mechanism to # redirect mail for local recipients. The redirections are # processed by the Postfix \fBlocal\fR(8) delivery agent. # -# The file serves as input to the \fBpostalias\fR(1) command. The +# Normally, the \fBaliases\fR table is specified as a text file +# that serves as input to the \fBpostalias\fR(1) command. The # result, an indexed file in \fBdbm\fR or \fBdb\fR format, is # used for fast lookup by the mail system. Execute the command # \fBnewaliases\fR in order to rebuild the indexed file after diff --git a/postfix/proto/relocated b/postfix/proto/relocated index e0cfbdb8a..9a272b80c 100644 --- a/postfix/proto/relocated +++ b/postfix/proto/relocated @@ -6,10 +6,11 @@ # SYNOPSIS # \fBpostmap /etc/postfix/relocated\fR # DESCRIPTION -# The optional \fBrelocated\fR file provides the information that is +# The optional \fBrelocated\fR table provides the information that is # used in "user has moved to \fInew_location\fR" bounce messages. # -# Normally, the file serves as input to the \fBpostmap\fR(1) command. +# Normally, the \fBrelocated\fR table is specified as a text file +# that serves as input to the \fBpostmap\fR(1) command. # The result, an indexed file in \fBdbm\fR or \fBdb\fR format, # is used for fast searching by the mail system. Execute the command # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed diff --git a/postfix/proto/transport b/postfix/proto/transport index d616cebbe..70c1a5843 100644 --- a/postfix/proto/transport +++ b/postfix/proto/transport @@ -6,11 +6,12 @@ # SYNOPSIS # \fBpostmap /etc/postfix/transport\fR # DESCRIPTION -# The optional \fBtransport\fR file specifies a mapping from domain +# The optional \fBtransport\fR table specifies a mapping from domain # hierarchies to message delivery transports and/or relay hosts. The # mapping is used by the \fBtrivial-rewrite\fR(8) daemon. # -# Normally, the file serves as input to the \fBpostmap\fR(1) command. +# Normally, the \fBtransport\fR table is specified as a text file +# that serves as input to the \fBpostmap\fR(1) command. # The result, an indexed file in \fBdbm\fR or \fBdb\fR format, is used # for fast searching by the mail system. Execute the command # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed diff --git a/postfix/src/dns/dns_strtype.c b/postfix/src/dns/dns_strtype.c index 8e78de463..f6f1fdff4 100644 --- a/postfix/src/dns/dns_strtype.c +++ b/postfix/src/dns/dns_strtype.c @@ -197,4 +197,3 @@ unsigned dns_type(const char *text) return (dns_type_map[i].type); return (0); } - diff --git a/postfix/src/flush/Makefile.in b/postfix/src/flush/Makefile.in index 6bdf7d2be..432d5e572 100644 --- a/postfix/src/flush/Makefile.in +++ b/postfix/src/flush/Makefile.in @@ -67,6 +67,7 @@ flush.o: ../../include/htable.h flush.o: ../../include/dict.h flush.o: ../../include/argv.h flush.o: ../../include/scan_dir.h +flush.o: ../../include/stringops.h flush.o: ../../include/mail_params.h flush.o: ../../include/mail_queue.h flush.o: ../../include/mail_proto.h diff --git a/postfix/src/flush/flush.c b/postfix/src/flush/flush.c index e4d9adc2d..cca42d38a 100644 --- a/postfix/src/flush/flush.c +++ b/postfix/src/flush/flush.c @@ -44,7 +44,7 @@ /* request \fBFLUSH_REQ_REFRESH\fR. /* .IP "\fBFLUSH_REQ_REFRESH\fR (completes in the background)" /* Refresh non-empty per-destination logfiles that were not read in -/* \fB$fast_flush_refresh_time\fR hours, by simulating +/* \fBfast_flush_refresh_time\fR hours, by simulating /* send requests (see above) for the corresponding destinations. /* .sp /* Delete empty per-destination logfiles that were not updated in @@ -142,6 +142,7 @@ #include #include #include +#include /* Global library. */ @@ -467,13 +468,13 @@ static void flush_service(VSTREAM *client_stream, char *unused_service, if (mail_command_read(client_stream, "%s %s", site, queue_id) == 2 && valid_hostname(STR(site)) && mail_queue_id_ok(STR(queue_id))) - status = flush_add_service(STR(site), STR(queue_id)); + status = flush_add_service(lowercase(STR(site)), STR(queue_id)); mail_print(client_stream, "%d", status); } else if (STREQ(STR(request), FLUSH_REQ_SEND)) { site = vstring_alloc(10); if (mail_command_read(client_stream, "%s", site) == 1 && valid_hostname(STR(site))) - status = flush_send_service(STR(site)); + status = flush_send_service(lowercase(STR(site))); mail_print(client_stream, "%d", status); } else if (STREQ(STR(request), FLUSH_REQ_REFRESH) || STREQ(STR(request), wakeup)) { diff --git a/postfix/src/global/Makefile.in b/postfix/src/global/Makefile.in index 6c1b6910f..084e664a8 100644 --- a/postfix/src/global/Makefile.in +++ b/postfix/src/global/Makefile.in @@ -854,6 +854,7 @@ recdump.o: ../../include/vstring.h recdump.o: rec_streamlf.h recdump.o: rec_type.h recipient_list.o: recipient_list.c +recipient_list.o: ../../include/sys_defs.h recipient_list.o: ../../include/mymalloc.h recipient_list.o: recipient_list.h record.o: record.c diff --git a/postfix/src/global/bounce_log.c b/postfix/src/global/bounce_log.c index 1bbcd23e0..566ad4878 100644 --- a/postfix/src/global/bounce_log.c +++ b/postfix/src/global/bounce_log.c @@ -49,7 +49,7 @@ /* /* bounce_log_rewind() is a helper that seeks to the first recipient /* in an open bounce or defer logfile (skipping over recipients that -/* are marked as done). The result is 0 in case of success, -1 in case +/* are marked as done). The result is 0 in case of success, -1 in case /* of problems. /* /* bounce_log_close() closes an open bounce or defer logfile and diff --git a/postfix/src/global/clnt_stream.c b/postfix/src/global/clnt_stream.c index 6fd200bc6..7b9cb3df4 100644 --- a/postfix/src/global/clnt_stream.c +++ b/postfix/src/global/clnt_stream.c @@ -118,7 +118,7 @@ static void clnt_stream_open(CLNT_STREAM *clnt_stream) * connection. Note that both events are handled by the same routine. */ clnt_stream->vstream = mail_connect_wait(clnt_stream->class, - clnt_stream->service); + clnt_stream->service); close_on_exec(vstream_fileno(clnt_stream->vstream), CLOSE_ON_EXEC); event_enable_read(vstream_fileno(clnt_stream->vstream), clnt_stream_event, (char *) clnt_stream); diff --git a/postfix/src/global/mail_print.c b/postfix/src/global/mail_print.c index 6500441ff..9dddc2592 100644 --- a/postfix/src/global/mail_print.c +++ b/postfix/src/global/mail_print.c @@ -150,7 +150,7 @@ int mail_vprint(VSTREAM *stream, const char *fmt, va_list ap) continue; if (*cp != '%') msg_fatal("mail_vprint: bad format: %.*s>%c<%s", - cp - fmt, fmt, *cp, cp + 1); + (int) (cp - fmt), fmt, *cp, cp + 1); if ((lflag = (*++cp == 'l')) != 0) cp++; @@ -186,7 +186,7 @@ int mail_vprint(VSTREAM *stream, const char *fmt, va_list ap) } if (tp >= mail_print_tab + mail_print_tablen) msg_fatal("mail_vprint: bad format: %.*s>%c<%s", - cp - fmt, fmt, *cp, cp + 1); + (int) (cp - fmt), fmt, *cp, cp + 1); } } return (error); diff --git a/postfix/src/global/mail_scan.c b/postfix/src/global/mail_scan.c index 0538c40bf..b9c4d1922 100644 --- a/postfix/src/global/mail_scan.c +++ b/postfix/src/global/mail_scan.c @@ -238,7 +238,7 @@ int mail_vscan(VSTREAM *stream, const char *fmt, va_list ap) continue; if (*cp != '%') msg_fatal("mail_scan: bad format: %.*s>%c<%s", - cp - fmt, fmt, *cp, cp + 1); + (int) (cp - fmt), fmt, *cp, cp + 1); if ((lflag = (*++cp == 'l')) != 0) cp++; @@ -262,7 +262,7 @@ int mail_vscan(VSTREAM *stream, const char *fmt, va_list ap) } if (tp >= mail_scan_tab + mail_scan_tablen) msg_fatal("mail_scan: bad format: %.*s>%c<%s", - cp - fmt, fmt, *cp, cp + 1); + (int) (cp - fmt), fmt, *cp, cp + 1); } if (error == 0) count++; diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 4ae30eb84..68fe73b56 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -15,7 +15,7 @@ * Version of this program. */ #define VAR_MAIL_VERSION "mail_version" -#define DEF_MAIL_VERSION "Snapshot-20001119" +#define DEF_MAIL_VERSION "Snapshot-20001120" extern char *var_mail_version; /* LICENSE diff --git a/postfix/src/global/maps.c b/postfix/src/global/maps.c index 9c13958b4..7fd51ff57 100644 --- a/postfix/src/global/maps.c +++ b/postfix/src/global/maps.c @@ -36,7 +36,7 @@ /* See dict_open(3) for a description of flags. /* /* maps_append() appends a dictionary to an existing handle -/* under the given name. If dict_handle is a null pointer, +/* under the given name. If dict_handle is a null pointer, /* the named dictionary is opened on the fly. /* /* maps_find() searches the specified list of dictionaries diff --git a/postfix/src/global/mkmap_db.c b/postfix/src/global/mkmap_db.c index d89c3b5e6..fd216df08 100644 --- a/postfix/src/global/mkmap_db.c +++ b/postfix/src/global/mkmap_db.c @@ -59,7 +59,7 @@ /* mkmap_db_open - create or open database */ static MKMAP *mkmap_db_open(const char *path, - DICT *(*db_open) (const char *, int, int)) + DICT *(*db_open) (const char *, int, int)) { MKMAP *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap)); diff --git a/postfix/src/global/peer_name.c b/postfix/src/global/peer_name.c index 5dc9327d7..63d408c2e 100644 --- a/postfix/src/global/peer_name.c +++ b/postfix/src/global/peer_name.c @@ -102,7 +102,7 @@ PEER_NAME *peer_name(int sock) #include -int main(int unused_argc, char **unused_argv) +int main(int unused_argc, char **unused_argv) { PEER_NAME *peer; diff --git a/postfix/src/global/recipient_list.c b/postfix/src/global/recipient_list.c index 055f2a358..158338c5e 100644 --- a/postfix/src/global/recipient_list.c +++ b/postfix/src/global/recipient_list.c @@ -67,6 +67,10 @@ /* Yorktown Heights, NY 10598, USA /*--*/ +/* System library. */ + +#include + /* Utility library. */ #include diff --git a/postfix/src/lmtp/lmtp_session.c b/postfix/src/lmtp/lmtp_session.c index 3f08533b5..411ee8172 100644 --- a/postfix/src/lmtp/lmtp_session.c +++ b/postfix/src/lmtp/lmtp_session.c @@ -77,7 +77,7 @@ /* lmtp_session_alloc - allocate and initialize LMTP_SESSION structure */ LMTP_SESSION *lmtp_session_alloc(VSTREAM *stream, const char *host, - const char *addr, const char *dest) + const char *addr, const char *dest) { LMTP_SESSION *session; diff --git a/postfix/src/local/token.c b/postfix/src/local/token.c index 18a2a22b0..28803fe4c 100644 --- a/postfix/src/local/token.c +++ b/postfix/src/local/token.c @@ -28,7 +28,7 @@ /* /* deliver_token() delivers to the address in the given token: /* an absolute /path/name, a ~/path/name relative to the recipient's -/* home directory, an :include:/path/name request, an external +/* home directory, an :include:/path/name request, an external /* "|command", or a mail address. /* /* deliver_token_string() delivers to all addresses listed in diff --git a/postfix/src/master/Makefile.in b/postfix/src/master/Makefile.in index c7b1b45a9..3acb84e40 100644 --- a/postfix/src/master/Makefile.in +++ b/postfix/src/master/Makefile.in @@ -91,6 +91,7 @@ master.o: ../../include/vstream.h master.o: ../../include/stringops.h master.o: ../../include/myflock.h master.o: ../../include/watchdog.h +master.o: ../../include/clean_env.h master.o: ../../include/mail_params.h master.o: ../../include/debug_process.h master.o: ../../include/mail_task.h diff --git a/postfix/src/master/master.c b/postfix/src/master/master.c index 6006f3f14..33b21573b 100644 --- a/postfix/src/master/master.c +++ b/postfix/src/master/master.c @@ -301,7 +301,7 @@ int main(int argc, char **argv) exit(lock_fp ? 0 : 1); if (lock_fp == 0) msg_fatal("%s", vstring_str(why)); - vstream_fprintf(lock_fp, "%*lu\n", sizeof(unsigned long) * 4, + vstream_fprintf(lock_fp, "%*lu\n", (int) sizeof(unsigned long) * 4, (unsigned long) var_pid); if (vstream_fflush(lock_fp)) msg_fatal("cannot update lock file %s: %m", vstring_str(lock_path)); diff --git a/postfix/src/master/master_proto.c b/postfix/src/master/master_proto.c index 6494b15f2..00e9c19dd 100644 --- a/postfix/src/master/master_proto.c +++ b/postfix/src/master/master_proto.c @@ -61,7 +61,7 @@ #include "master_proto.h" -int master_notify(int pid, int status) +int master_notify(int pid, int status) { char *myname = "master_notify"; MASTER_STATUS stat; diff --git a/postfix/src/nqmgr/qmgr_peer.c b/postfix/src/nqmgr/qmgr_peer.c index e086c3568..9b61e64e5 100644 --- a/postfix/src/nqmgr/qmgr_peer.c +++ b/postfix/src/nqmgr/qmgr_peer.c @@ -86,7 +86,7 @@ QMGR_PEER *qmgr_peer_create(QMGR_JOB *job, QMGR_QUEUE *queue) void qmgr_peer_free(QMGR_PEER *peer) { - char *myname = "qmgr_peer_free"; + char *myname = "qmgr_peer_free"; QMGR_JOB *job = peer->job; QMGR_QUEUE *queue = peer->queue; diff --git a/postfix/src/postconf/postconf.c b/postfix/src/postconf/postconf.c index 30a7cee47..71d873577 100644 --- a/postfix/src/postconf/postconf.c +++ b/postfix/src/postconf/postconf.c @@ -469,7 +469,7 @@ static void print_bool(int mode, CONFIG_BOOL_TABLE *cbt) /* print_time - print relative time parameter */ -static void print_time(int mode, CONFIG_TIME_TABLE * ctt) +static void print_time(int mode, CONFIG_TIME_TABLE *ctt) { const char *value; diff --git a/postfix/src/qmgr/qmgr_entry.c b/postfix/src/qmgr/qmgr_entry.c index df6e81e30..6e2fb3b2e 100644 --- a/postfix/src/qmgr/qmgr_entry.c +++ b/postfix/src/qmgr/qmgr_entry.c @@ -177,7 +177,7 @@ void qmgr_entry_done(QMGR_ENTRY *entry, int which) #define FUDGE(x) ((x) * (var_qmgr_fudge / 100.0)) message->refcount--; if (message->rcpt_offset > 0 - && qmgr_recipient_count < FUDGE(var_qmgr_rcpt_limit)) + && qmgr_recipient_count < FUDGE(var_qmgr_rcpt_limit)) qmgr_message_realloc(message); if (message->refcount == 0) qmgr_active_done(message); diff --git a/postfix/src/qmgr/qmgr_transport.c b/postfix/src/qmgr/qmgr_transport.c index b58fcd5eb..dcb4ad1fa 100644 --- a/postfix/src/qmgr/qmgr_transport.c +++ b/postfix/src/qmgr/qmgr_transport.c @@ -320,10 +320,10 @@ QMGR_TRANSPORT *qmgr_transport_create(const char *name) */ transport->dest_concurrency_limit = get_mail_conf_int2(name, "_destination_concurrency_limit", - var_dest_con_limit, 0, 0); + var_dest_con_limit, 0, 0); transport->recipient_limit = get_mail_conf_int2(name, "_destination_recipient_limit", - var_dest_rcpt_limit, 0, 0); + var_dest_rcpt_limit, 0, 0); if (transport->dest_concurrency_limit == 0 || transport->dest_concurrency_limit >= var_init_dest_concurrency) diff --git a/postfix/src/smtp/smtp_sasl_glue.c b/postfix/src/smtp/smtp_sasl_glue.c index 290a83702..b0e085fb3 100644 --- a/postfix/src/smtp/smtp_sasl_glue.c +++ b/postfix/src/smtp/smtp_sasl_glue.c @@ -137,8 +137,8 @@ static int smtp_sasl_log(void *unused_context, int priority, const char *message) { switch (priority) { - case SASL_LOG_ERR: - case SASL_LOG_WARNING: + case SASL_LOG_ERR: + case SASL_LOG_WARNING: msg_warn("%s", message); break; case SASL_LOG_INFO: diff --git a/postfix/src/smtp/smtp_session.c b/postfix/src/smtp/smtp_session.c index 4e9558723..7f913d2df 100644 --- a/postfix/src/smtp/smtp_session.c +++ b/postfix/src/smtp/smtp_session.c @@ -71,4 +71,3 @@ void smtp_session_free(SMTP_SESSION *session) myfree(session->namaddr); myfree((char *) session); } - diff --git a/postfix/src/smtpd/Makefile.in b/postfix/src/smtpd/Makefile.in index f445c15f4..c0a433e87 100644 --- a/postfix/src/smtpd/Makefile.in +++ b/postfix/src/smtpd/Makefile.in @@ -67,7 +67,7 @@ depend: $(MAKES) done) | grep -v '[.][o][:][ ][/]' >$$$$ && mv $$$$ Makefile.in @$(EXPORT) make -f Makefile.in Makefile 1>&2 -tests: smtpd_check_test smtpd_check_test2 smtpd_check_test3 smtpd_token_test +tests: smtpd_check_test smtpd_check_test2 smtpd_token_test smtpd_check_test: smtpd_check smtpd_check.in smtpd_check.ref ../postmap/postmap smtpd_check_access @@ -81,12 +81,6 @@ smtpd_check_test2: smtpd_check smtpd_check.in2 smtpd_check.ref2 diff smtpd_check.ref2 smtpd_check.tmp rm -f smtpd_check.tmp smtpd_check_access.* -smtpd_check_test3: smtpd_check smtpd_check.in3 smtpd_check.ref3 - ../postmap/postmap smtpd_check_access - ./smtpd_check smtpd_check.tmp 2>&1 - diff smtpd_check.ref3 smtpd_check.tmp - rm -f smtpd_check.tmp smtpd_check_access.* - smtpd_token_test: smtpd_token smtpd_token.in smtpd_token.ref ./smtpd_token smtpd_token.tmp 2>&1 diff smtpd_token.ref smtpd_token.tmp diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index 5e658807d..76e881f86 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -881,7 +881,7 @@ static int data_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *unused_argv) if (first) { if (strncmp(start + strspn(start, ">"), "From ", 5) == 0) { rec_fprintf(state->cleanup, curr_rec_type, - "Mbox-Line: %s", start); + "Mailbox-Line: %s", start); continue; } first = 0; diff --git a/postfix/src/smtpd/smtpd_check.in3 b/postfix/src/smtpd/smtpd_check.in3 deleted file mode 100644 index e69de29bb..000000000 diff --git a/postfix/src/smtpd/smtpd_check.ref3 b/postfix/src/smtpd/smtpd_check.ref3 deleted file mode 100644 index e69de29bb..000000000 diff --git a/postfix/src/smtpd/smtpd_peer.c b/postfix/src/smtpd/smtpd_peer.c index 23a44a853..2ac0947cd 100644 --- a/postfix/src/smtpd/smtpd_peer.c +++ b/postfix/src/smtpd/smtpd_peer.c @@ -100,7 +100,7 @@ static int h_errno = TRY_AGAIN; /* smtpd_peer_init - initialize peer information */ -void smtpd_peer_init(SMTPD_STATE * state) +void smtpd_peer_init(SMTPD_STATE *state) { struct sockaddr_in sin; SOCKADDR_SIZE len = sizeof(sin); @@ -196,7 +196,7 @@ void smtpd_peer_init(SMTPD_STATE * state) /* smtpd_peer_reset - destroy peer information */ -void smtpd_peer_reset(SMTPD_STATE * state) +void smtpd_peer_reset(SMTPD_STATE *state) { myfree(state->name); myfree(state->addr); diff --git a/postfix/src/smtpd/smtpd_sasl_glue.c b/postfix/src/smtpd/smtpd_sasl_glue.c index c3c17118a..fe4232cc6 100644 --- a/postfix/src/smtpd/smtpd_sasl_glue.c +++ b/postfix/src/smtpd/smtpd_sasl_glue.c @@ -116,8 +116,8 @@ static int smtpd_sasl_log(void *unused_context, int priority, const char *message) { switch (priority) { - case SASL_LOG_ERR: - case SASL_LOG_WARNING: + case SASL_LOG_ERR: + case SASL_LOG_WARNING: msg_warn("%s", message); break; case SASL_LOG_INFO: diff --git a/postfix/src/smtpstone/smtp-sink.c b/postfix/src/smtpstone/smtp-sink.c index cac69ba83..a10b48e8e 100644 --- a/postfix/src/smtpstone/smtp-sink.c +++ b/postfix/src/smtpstone/smtp-sink.c @@ -5,10 +5,10 @@ /* multi-threaded SMTP/LMTP test server /* SYNOPSIS /* .fi -/* \fBsmtp-sink\fR [\fB-cLpv\fR] [\fB-w \fIdelay\fR] +/* \fBsmtp-sink\fR [\fB-cLpv\fR] [\fB-w \fIdelay\fR] /* [\fBinet:\fR][\fIhost\fR]:\fIport\fR \fIbacklog\fR /* -/* \fBsmtp-sink\fR [\fB-cLpv\fR] [\fB-w \fIdelay\fR] +/* \fBsmtp-sink\fR [\fB-cLpv\fR] [\fB-w \fIdelay\fR] /* \fBunix:\fR\fIpathname\fR \fIbacklog\fR /* DESCRIPTION /* \fIsmtp-sink\fR listens on the named host (or address) and port. @@ -328,7 +328,7 @@ static void disconnect(SINK_STATE *state) static void connect_event(int unused_event, char *context) { - int sock = (int) context; + int sock = CAST_CHAR_PTR_TO_INT(context); SINK_STATE *state; int fd; @@ -410,7 +410,7 @@ int main(int argc, char **argv) /* * Start the event handler. */ - event_enable_read(sock, connect_event, (char *) sock); + event_enable_read(sock, connect_event, CAST_INT_TO_CHAR_PTR(sock)); for (;;) event_loop(-1); } diff --git a/postfix/src/util/Makefile.in b/postfix/src/util/Makefile.in index 62bf90753..92c710ad2 100644 --- a/postfix/src/util/Makefile.in +++ b/postfix/src/util/Makefile.in @@ -305,6 +305,7 @@ dict_test: dict_open testdb dict_test.in dict_test.ref # do not edit below this line - it is generated by 'make depend' argv.o: argv.c +argv.o: sys_defs.h argv.o: mymalloc.h argv.o: argv.h argv_split.o: argv_split.c diff --git a/postfix/src/util/argv.c b/postfix/src/util/argv.c index e92f231fc..5886fad9c 100644 --- a/postfix/src/util/argv.c +++ b/postfix/src/util/argv.c @@ -58,7 +58,8 @@ /* System libraries. */ -#include /* 44BSD stdarg.h uses abort() */ +#include +#include /* 44BSD stdarg.h uses abort() */ #include #include diff --git a/postfix/src/util/clean_env.c b/postfix/src/util/clean_env.c index 559d55b89..aee035cca 100644 --- a/postfix/src/util/clean_env.c +++ b/postfix/src/util/clean_env.c @@ -40,6 +40,8 @@ void clean_env(void) char *TZ; char *DISPLAY; char *XAUTHORITY; + char *HOME; + char *PURIFYOPTIONS; extern char **environ; /* @@ -49,6 +51,8 @@ void clean_env(void) TZ = getenv("TZ"); DISPLAY = getenv("DISPLAY"); XAUTHORITY = getenv("XAUTHORITY"); + HOME = getenv("HOME"); + PURIFYOPTIONS = getenv("PURIFYOPTIONS"); /* * Truncate the process environment, if available. On some systems @@ -66,6 +70,10 @@ void clean_env(void) msg_fatal("setenv: %m"); if (XAUTHORITY && setenv("XAUTHORITY", XAUTHORITY, 1)) msg_fatal("setenv: %m"); + if (HOME && setenv("HOME", HOME, 1)) + msg_fatal("setenv: %m"); + if (PURIFYOPTIONS && setenv("PURIFYOPTIONS", PURIFYOPTIONS, 1)) + msg_fatal("setenv: %m"); /* * Update the process environment with configurable initial values. diff --git a/postfix/src/util/dict_ldap.c b/postfix/src/util/dict_ldap.c index ac2c6edd1..39d604781 100644 --- a/postfix/src/util/dict_ldap.c +++ b/postfix/src/util/dict_ldap.c @@ -248,7 +248,7 @@ static int dict_ldap_connect(DICT_LDAP *dict_ldap) * are thanks to LaMont Jones. */ static void dict_ldap_get_values(DICT_LDAP *dict_ldap, LDAPMessage * res, - VSTRING * result) + VSTRING *result) { long i = 0; int rc = 0; @@ -830,4 +830,3 @@ DICT *dict_ldap_open(const char *ldapsource, int dummy, int dict_flags) } #endif - diff --git a/postfix/src/util/dict_ni.c b/postfix/src/util/dict_ni.c index b3737d820..6f1b6e0ea 100644 --- a/postfix/src/util/dict_ni.c +++ b/postfix/src/util/dict_ni.c @@ -65,7 +65,7 @@ typedef struct { /* Hard worker doing lookups. Returned value is statically allocated and reused each call. */ static const char *dict_ni_do_lookup(char *path, char *key_prop, - const char *key_value, char *val_prop) + const char *key_value, char *val_prop) { unsigned int result_cap = 0; static char *result = 0; diff --git a/postfix/src/util/dict_pcre.c b/postfix/src/util/dict_pcre.c index 94d6fc67f..019f3f449 100644 --- a/postfix/src/util/dict_pcre.c +++ b/postfix/src/util/dict_pcre.c @@ -160,7 +160,7 @@ static const char *dict_pcre_lookup(DICT *dict, const char *name) for (pcre_list = dict_pcre->head; pcre_list; pcre_list = pcre_list->next) { if (pcre_list->pattern) { ctxt.matches = pcre_exec(pcre_list->pattern, pcre_list->hints, - name, name_len, 0, 0, ctxt.offsets, PCRE_MAX_CAPTURE * 3); + name, name_len, 0, 0, ctxt.offsets, PCRE_MAX_CAPTURE * 3); if (ctxt.matches != PCRE_ERROR_NOMATCH) { if (ctxt.matches > 0) break; /* Got a match! */ diff --git a/postfix/src/util/events.c b/postfix/src/util/events.c index a3921e280..c07504a26 100644 --- a/postfix/src/util/events.c +++ b/postfix/src/util/events.c @@ -353,7 +353,7 @@ void event_disable_readwrite(int fd) /* event_request_timer - (re)set timer */ -time_t event_request_timer(EVENT_NOTIFY_TIME callback, char *context, int delay) +time_t event_request_timer(EVENT_NOTIFY_TIME callback, char *context, int delay) { char *myname = "event_request_timer"; RING *ring; diff --git a/postfix/src/util/msg_syslog.c b/postfix/src/util/msg_syslog.c index a06aeb2fe..c2892d628 100644 --- a/postfix/src/util/msg_syslog.c +++ b/postfix/src/util/msg_syslog.c @@ -22,7 +22,7 @@ /* /* msg_syslog_facility() is a helper routine that overrides the /* logging facility that is specified with msg_syslog_init(). -/* The result is zero in case of an unknown facility name. +/* The result is zero in case of an unknown facility name. /* SEE ALSO /* syslog(3) syslog library /* msg(3) diagnostics module @@ -153,10 +153,10 @@ static void msg_syslog_print(int level, const char *text) if (level == MSG_INFO) { syslog(syslog_facility | log_level[level], "%.*s", - MSG_SYSLOG_RECLEN, text); + (int) MSG_SYSLOG_RECLEN, text); } else { syslog(syslog_facility | log_level[level], "%s: %.*s", - severity_name[level], MSG_SYSLOG_RECLEN, text); + severity_name[level], (int) MSG_SYSLOG_RECLEN, text); } } diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h index 4221e3807..206209a49 100644 --- a/postfix/src/util/sys_defs.h +++ b/postfix/src/util/sys_defs.h @@ -56,7 +56,6 @@ #endif #if defined(NETBSD1) -#define ANAL_CAST #define USE_DOT_LOCK #endif @@ -654,13 +653,8 @@ extern int h_errno; #error "unsupported platform" #endif -#ifndef ANAL_CAST #define CAST_CHAR_PTR_TO_INT(cptr) ((int) (long) (cptr)) #define CAST_INT_TO_CHAR_PTR(ival) ((char *) (long) (ival)) -#else -#define CAST_CHAR_PTR_TO_INT(cptr) ((int) (cptr)) -#define CAST_INT_TO_CHAR_PTR(ival) ((char *) (ival)) -#endif #ifdef DUP2_DUPS_CLOSE_ON_EXEC /* dup2_pass_on_exec() can be found in util/sys_compat.c */ diff --git a/postfix/src/util/valid_hostname.c b/postfix/src/util/valid_hostname.c index 9f75963eb..29f305fd8 100644 --- a/postfix/src/util/valid_hostname.c +++ b/postfix/src/util/valid_hostname.c @@ -105,7 +105,8 @@ int valid_hostname(const char *name) /* NOT: return (0); this confuses users of the DNS client */ } if (cp - name > VALID_HOSTNAME_LEN) { - msg_warn("%s: bad length %d for %.100s...", myname, cp - name, name); + msg_warn("%s: bad length %d for %.100s...", + myname, (int) (cp - name), name); return (0); } return (1); diff --git a/postfix/src/util/vstring.c b/postfix/src/util/vstring.c index f1669243a..356b114b2 100644 --- a/postfix/src/util/vstring.c +++ b/postfix/src/util/vstring.c @@ -218,7 +218,7 @@ #include #include -#include /* 44BSD stdarg.h uses abort() */ +#include /* 44BSD stdarg.h uses abort() */ #include #include