mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-30 21:55:20 +00:00
Code Issues Releases Wiki Activity

postfix-2.3-20050724

Browse Source
This commit is contained in:
Wietse Venema
2005-07-24 00:00:00 -05:00
committed by Viktor Dukhovni
parent 27a0d822ea
commit 01c5f58c4b
39 changed files with 823 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postfix/.indent.pro vendored
View File

@@ -29,6 +29,8 @@
-TCONFIG_BOOL_TABLE -TCONFIG_BOOL_TABLE
-TCONFIG_INT_FN_TABLE -TCONFIG_INT_FN_TABLE
-TCONFIG_INT_TABLE -TCONFIG_INT_TABLE
-TCONFIG_LONG_FN_TABLE
-TCONFIG_LONG_TABLE
-TCONFIG_STR_FN_TABLE -TCONFIG_STR_FN_TABLE
-TCONFIG_STR_TABLE -TCONFIG_STR_TABLE
-TCONFIG_TIME_FN_TABLE -TCONFIG_TIME_FN_TABLE

29
postfix/HISTORY
View File

@@ -10969,7 +10969,7 @@ Apologies for any names omitted.
20050706 20050706
Robustness: the connection cache client now disables caching Robustness: the SMTP client now disables connection caching
when it is unable to communicate with the scache(8) server, when it is unable to communicate with the scache(8) server,
instead of looping forever. File: global/scache_clnt.c. instead of looping forever. File: global/scache_clnt.c.
@@ -11028,8 +11028,35 @@ Apologies for any names omitted.
Bugfix: the smtpd_sasl_authenticated_header code did not Bugfix: the smtpd_sasl_authenticated_header code did not
check if SASL was actually enabled. File: smtpd/smtpd.c. check if SASL was actually enabled. File: smtpd/smtpd.c.
20050720
Feature: reverse client hostname. This is set at connection
time with information from the SMTP client address->name
mapping, and can be overruled with the REVERSE_NAME attribute
in the XCLIENT command. File: smtpd/smtpd_peer.c.
Cleanup: renaming of several confusing restriction names:
reject_unknown_client -> reject_unknown_client_hostname,
reject_unknown_hostname -> reject_unknown_helo_hostname,
reject_invalid_hostname -> reject_invalid_helo_hostname,
and reject_non_fqdn_hostname -> reject_non_fqdn_helo_hostname.
The old names are still recognized and documented. Files:
global/mail_params.h, smtpd/smtpd.c, smtpd/smtpd_check.c.
Feature: reject_unknown_reverse_client_hostname. This rejects
clients that have no address to name mapping (unlike the
reject_unknown_client_hostname feature which requires that
the address->name and name->address mappings resolve to the
client IP address). Files: global/mail_params.h,
smtpd/smtpd_peer.c, smtpd/smtpd.c, smtpd/smtpd_check.c.
Open problems: Open problems:
Med: when the cleanup server bounces local mail that should
be content inspected, the resulting DSN should be content
inspected, otherwise a local user can bypass content
inspection.
Look for systems with XPG basename() declared in <libgen.h>, Look for systems with XPG basename() declared in <libgen.h>,
and prepare for phasing out the Postfix-supplied one. and prepare for phasing out the Postfix-supplied one.
Beware, however, that XPG basename() takes (char *), and Beware, however, that XPG basename() takes (char *), and

2
postfix/README_FILES/MAILDROP_README
View File

@@ -100,7 +100,7 @@ To enable maildrop delivery for specific users only, you can use the Postfix
local(8) delivery agent's mailbox_command_maps feature: local(8) delivery agent's mailbox_command_maps feature:
/etc/postfix/main.cf: /etc/postfix/main.cf:
mailbox_command_maps = /etc/postfix/mailbox_commands mailbox_command_maps = hash:/etc/postfix/mailbox_commands
/etc/postfix/mailbox_commands: /etc/postfix/mailbox_commands:
you /path/to/maildrop -d ${USER} you /path/to/maildrop -d ${USER}

8
postfix/README_FILES/RESTRICTION_CLASS_README
View File

@@ -5,8 +5,8 @@ PPoossttffiixx PPeerr--CClliieenntt//UUsseerr//eettcc.
PPoossttffiixx rreessttrriiccttiioonn ccllaasssseess PPoossttffiixx rreessttrriiccttiioonn ccllaasssseess
The Postfix SMTP server supports access restrictions such as reject_rbl_client The Postfix SMTP server supports access restrictions such as reject_rbl_client
or reject_unknown_client on the right-hand side of SMTP server access(5) or reject_unknown_client_hostname on the right-hand side of SMTP server access
tables. This allows you to implement different junk mail restrictions for (5) tables. This allows you to implement different junk mail restrictions for
different clients or users. different clients or users.
Having to specify lists of access restrictions for every recipient becomes Having to specify lists of access restrictions for every recipient becomes
@@ -23,7 +23,9 @@ Example:
/etc/postfix/main.cf: /etc/postfix/main.cf:
smtpd_restriction_classes = restrictive, permissive smtpd_restriction_classes = restrictive, permissive
restrictive = reject_unknown_sender_domain reject_unknown_client ... # With Postfix < 2.3 specify reject_unknown_client.
restrictive = reject_unknown_sender_domain
reject_unknown_client_hostname ...
permissive = permit permissive = permit
smtpd_recipient_restrictions = smtpd_recipient_restrictions =

10
postfix/README_FILES/SMTPD_ACCESS_README
View File

@@ -117,7 +117,8 @@ Examples of simple restriction lists are:
smtpd_client_restrictions = permit_mynetworks, reject smtpd_client_restrictions = permit_mynetworks, reject
# Don't talk to mail systems that don't know their own hostname. # Don't talk to mail systems that don't know their own hostname.
smtpd_helo_restrictions = reject_unknown_hostname # With Postfix < 2.3, specify reject_unknown_hostname.
smtpd_helo_restrictions = reject_unknown_helo_hostname
# Don't accept mail from domains that don't exist. # Don't accept mail from domains that don't exist.
smtpd_sender_restrictions = reject_unknown_sender_domain smtpd_sender_restrictions = reject_unknown_sender_domain
@@ -221,15 +222,16 @@ access permission:
2 smtpd_recipient_restrictions = 2 smtpd_recipient_restrictions =
3 permit_mynetworks 3 permit_mynetworks
4 check_helo_access hash:/etc/postfix/helo_access 4 check_helo_access hash:/etc/postfix/helo_access
5 reject_unknown_hostname 5 reject_unknown_helo_hostname
6 reject_unauth_destination 6 reject_unauth_destination
7 7
8 /etc/postfix/helo_access: 8 /etc/postfix/helo_access:
9 localhost.localdomain PERMIT 9 localhost.localdomain PERMIT
Line 5 rejects mail from hosts that don't specify a proper hostname in the HELO Line 5 rejects mail from hosts that don't specify a proper hostname in the HELO
command. Lines 4 and 9 make an exception to allow mail from some machine that command (with Postfix < 2.3, specify reject_unknown_hostname). Lines 4 and 9
announces itself with "HELO localhost.localdomain". make an exception to allow mail from some machine that announces itself with
"HELO localhost.localdomain".
The problem with this configuration is that smtpd_recipient_restrictions The problem with this configuration is that smtpd_recipient_restrictions
evaluates to PERMIT for EVERY host that announces itself as evaluates to PERMIT for EVERY host that announces itself as

5
postfix/README_FILES/SMTPD_POLICY_README
View File

@@ -48,6 +48,7 @@ a delegated SMTPD access policy request:
recipient=bar@foo.tld recipient=bar@foo.tld
client_address=1.2.3.4 client_address=1.2.3.4
client_name=another.domain.tld client_name=another.domain.tld
reverse_client_name=another.domain.tld
instance=123.456.7 instance=123.456.7
sasl_method=plain sasl_method=plain
sasl_username=you sasl_username=you
@@ -75,6 +76,10 @@ Notes:
* The client address is an IPv4 dotted quad in the form 1.2.3.4 or it is an * The client address is an IPv4 dotted quad in the form 1.2.3.4 or it is an
IPv6 address in the form 1:2:3::4:5:6. IPv6 address in the form 1:2:3::4:5:6.
* For a discussion of the differences between reverse and verified
client_name information, see the reject_unknown_client_hostname discussion
in the postconf(5) document.
* An attribute name must not contain "=", null or newline, and an attribute * An attribute name must not contain "=", null or newline, and an attribute
value must not contain null or newline. value must not contain null or newline.

2
postfix/html/MAILDROP_README.html
View File

@@ -149,7 +149,7 @@ use the Postfix <a href="local.8.html">local(8)</a> delivery agent's <a href="po
<blockquote> <blockquote>
<pre> <pre>
/etc/postfix/main.cf: /etc/postfix/main.cf:
<a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a> = /etc/postfix/mailbox_commands <a href="postconf.5.html#mailbox_command_maps">mailbox_command_maps</a> = hash:/etc/postfix/mailbox_commands
/etc/postfix/mailbox_commands: /etc/postfix/mailbox_commands:
you /path/to/maildrop -d ${USER} you /path/to/maildrop -d ${USER}

5
postfix/html/RESTRICTION_CLASS_README.html
View File

@@ -21,7 +21,7 @@ Per-Client/User/etc. Access Control</h1>
<h2>Postfix restriction classes</h2> <h2>Postfix restriction classes</h2>
<p> The Postfix SMTP server supports access restrictions such as <p> The Postfix SMTP server supports access restrictions such as
<a href="postconf.5.html#reject_rbl_client">reject_rbl_client</a> or <a href="postconf.5.html#reject_unknown_client">reject_unknown_client</a> on the right-hand side <a href="postconf.5.html#reject_rbl_client">reject_rbl_client</a> or <a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a> on the right-hand side
of SMTP server <a href="access.5.html">access(5)</a> tables. This allows you to implement of SMTP server <a href="access.5.html">access(5)</a> tables. This allows you to implement
different junk mail restrictions for different clients or users. different junk mail restrictions for different clients or users.
</p> </p>
@@ -43,7 +43,8 @@ care about these low-level details. </p>
<pre> <pre>
/etc/postfix/main.cf: /etc/postfix/main.cf:
<a href="postconf.5.html#smtpd_restriction_classes">smtpd_restriction_classes</a> = restrictive, permissive <a href="postconf.5.html#smtpd_restriction_classes">smtpd_restriction_classes</a> = restrictive, permissive
restrictive = <a href="postconf.5.html#reject_unknown_sender_domain">reject_unknown_sender_domain</a> <a href="postconf.5.html#reject_unknown_client">reject_unknown_client</a> ... # With Postfix < 2.3 specify <a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client</a>.
restrictive = <a href="postconf.5.html#reject_unknown_sender_domain">reject_unknown_sender_domain</a> <a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a> ...
permissive = permit permissive = permit
<a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a> = <a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a> =

8
postfix/html/SMTPD_ACCESS_README.html
View File

@@ -172,7 +172,8 @@ described in the <a href="postconf.5.html">postconf(5)</a> manual page. </p>
<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, reject <a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, reject
# Don't talk to mail systems that don't know their own hostname. # Don't talk to mail systems that don't know their own hostname.
<a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> = <a href="postconf.5.html#reject_unknown_hostname">reject_unknown_hostname</a> # With Postfix < 2.3, specify <a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_hostname</a>.
<a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> = <a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_helo_hostname</a>
# Don't accept mail from domains that don't exist. # Don't accept mail from domains that don't exist.
<a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a> = <a href="postconf.5.html#reject_unknown_sender_domain">reject_unknown_sender_domain</a> <a href="postconf.5.html#smtpd_sender_restrictions">smtpd_sender_restrictions</a> = <a href="postconf.5.html#reject_unknown_sender_domain">reject_unknown_sender_domain</a>
@@ -307,7 +308,7 @@ in too much access permission: </p>
2 <a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a> = 2 <a href="postconf.5.html#smtpd_recipient_restrictions">smtpd_recipient_restrictions</a> =
3 <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a> 3 <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>
4 <a href="postconf.5.html#check_helo_access">check_helo_access</a> hash:/etc/postfix/helo_access 4 <a href="postconf.5.html#check_helo_access">check_helo_access</a> hash:/etc/postfix/helo_access
5 <a href="postconf.5.html#reject_unknown_hostname">reject_unknown_hostname</a> 5 <a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_helo_hostname</a>
6 <a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a> 6 <a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a>
7 7
8 /etc/postfix/helo_access: 8 /etc/postfix/helo_access:
@@ -315,7 +316,8 @@ in too much access permission: </p>
</pre> </pre>
<p> Line 5 rejects mail from hosts that don't specify a proper <p> Line 5 rejects mail from hosts that don't specify a proper
hostname in the HELO command. Lines 4 and 9 make an exception to hostname in the HELO command (with Postfix < 2.3, specify
<a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_hostname</a>). Lines 4 and 9 make an exception to
allow mail from some machine that announces itself with "HELO allow mail from some machine that announces itself with "HELO
localhost.localdomain". </p> localhost.localdomain". </p>

6
postfix/html/SMTPD_POLICY_README.html
View File

@@ -80,6 +80,7 @@ sender=foo@bar.tld
recipient=bar@foo.tld recipient=bar@foo.tld
client_address=1.2.3.4 client_address=1.2.3.4
client_name=another.domain.tld client_name=another.domain.tld
reverse_client_name=another.domain.tld
instance=123.456.7 instance=123.456.7
sasl_method=plain sasl_method=plain
sasl_username=you sasl_username=you
@@ -115,6 +116,11 @@ size=12345
1.2.3.4 or it is an IPv6 address in the form 1:2:3::4:5:6. 1.2.3.4 or it is an IPv6 address in the form 1:2:3::4:5:6.
</p> </p>
<li> <p> For a discussion of the differences between reverse
and verified client_name information, see the
<a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a> discussion in the <a href="postconf.5.html">postconf(5)</a>
document. </p>
<li> <p> An attribute name must not contain "=", null or newline, <li> <p> An attribute name must not contain "=", null or newline,
and an attribute value must not contain null or newline. </p> and an attribute value must not contain null or newline. </p>

74
postfix/html/postconf.5.html
View File

@@ -1696,7 +1696,13 @@ The template is subject to exactly one level of $name substitution:
<dt><b>$client_name</b></dt> <dt><b>$client_name</b></dt>
<dd>The client hostname or "unknown". </dd> <dd>The client hostname or "unknown". See <a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a>
for more details. </dd>
<dt><b>$reverse_client_name</b></dt>
<dd>The client hostname from address-&gt;name lookup, or "unknown".
See <a href="postconf.5.html#reject_unknown_reverse_client_hostname">reject_unknown_reverse_client_hostname</a> for more details. </dd>
<dt><b>$helo_name</b></dt> <dt><b>$helo_name</b></dt>
@@ -1879,8 +1885,8 @@ This feature is available in Postfix 2.0 and later.
(default: empty)</b></DT><DD> (default: empty)</b></DT><DD>
<p> <p>
The names of message delivery transports that should not be delivered The names of message delivery transports that should not deliver mail
to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero
or more names of mail delivery transports names that appear in the or more names of mail delivery transports names that appear in the
first field of master.cf. first field of master.cf.
</p> </p>
@@ -2567,7 +2573,7 @@ home directory.
</p> </p>
<p> <p>
Specify a pathname ending "/" for qmail-style delivery. Specify a pathname ending in "/" for qmail-style delivery.
</p> </p>
<p> <p>
@@ -2816,7 +2822,7 @@ block all mail to a site.
<p> <p>
The numerical Postfix SMTP server response code when the client The numerical Postfix SMTP server response code when the client
HELO or EHLO command parameter is rejected by the <a href="postconf.5.html#reject_invalid_hostname">reject_invalid_hostname</a> HELO or EHLO command parameter is rejected by the <a href="postconf.5.html#reject_invalid_helo_hostname">reject_invalid_helo_hostname</a>
restriction. restriction.
</p> </p>
@@ -3373,7 +3379,7 @@ is suitable for, e.g., pop-before-smtp lookup tables. </dd>
<p> Examples: </p> <p> Examples: </p>
<p> The Postfix < 2.2 backwards compatible setting: always rewrite <p> The Postfix &lt; 2.2 backwards compatible setting: always rewrite
message headers, and always append my own domain to incomplete message headers, and always append my own domain to incomplete
header addresses. </p> header addresses. </p>
@@ -4450,7 +4456,7 @@ Sendmail compatibility feature that specifies the location of the
<p> <p>
The numerical Postfix SMTP server reply code when a client request The numerical Postfix SMTP server reply code when a client request
is rejected by the <a href="postconf.5.html#reject_non_fqdn_hostname">reject_non_fqdn_hostname</a>, <a href="postconf.5.html#reject_non_fqdn_sender">reject_non_fqdn_sender</a> is rejected by the <a href="postconf.5.html#reject_non_fqdn_helo_hostname">reject_non_fqdn_helo_hostname</a>, <a href="postconf.5.html#reject_non_fqdn_sender">reject_non_fqdn_sender</a>
or <a href="postconf.5.html#reject_non_fqdn_recipient">reject_non_fqdn_recipient</a> restriction. or <a href="postconf.5.html#reject_non_fqdn_recipient">reject_non_fqdn_recipient</a> restriction.
</p> </p>
@@ -7273,14 +7279,30 @@ any A record under <i>rbl_domain</i>. See the <a href="postconf.5.html#reject_rb
description above for additional RBL related configuration parameters. description above for additional RBL related configuration parameters.
This feature is available in Postfix 2.0 and later. </dd> This feature is available in Postfix 2.0 and later. </dd>
<dt><b><a name="reject_unknown_client">reject_unknown_client</a></b></dt> <dt><b><a name="reject_unknown_client_hostname">reject_unknown_client_hostname</a></b> (with Postfix &lt; 2.3: reject_unknown_client)</dt>
<dd>Reject the request when the client IP address has no PTR (address <dd>Reject the request when 1) the client IP address-&gt;name mapping
to name) record in the DNS, or when the PTR record does not have fails, 2) the name-&gt;address mapping fails, or 3) the name-&gt;address
a matching A (name to address) record. <br> The <a href="postconf.5.html#unknown_client_reject_code">unknown_client_reject_code</a> mapping does not match the client IP address. <br> This is a
parameter specifies the response code for rejected requests (default: stronger restriction than the <a href="postconf.5.html#reject_unknown_reverse_client_hostname">reject_unknown_reverse_client_hostname</a>
450). The reply is always 450 in case the hostname lookup failed feature, which triggers only under condition 1) above. <br> The
due to a temporary problem. </dd> <a href="postconf.5.html#unknown_client_reject_code">unknown_client_reject_code</a> parameter specifies the response code
for rejected requests (default: 450). The reply is always 450 in
case the address-&gt;name or name-&gt;address lookup failed due to
a temporary problem. </dd>
<dt><b><a name="reject_unknown_reverse_client_hostname">reject_unknown_reverse_client_hostname</a></b></dt>
<dd>Reject the request when the client IP address has no address-&gt;name
mapping. <br> This is a weaker restriction than the
<a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a> feature, which requires not only
that the address-&gt;name and name-&gt;address mappings exist, but
also that the two mappings reproduce the client IP address. <br>
The <a href="postconf.5.html#unknown_client_reject_code">unknown_client_reject_code</a> parameter specifies the response
code for rejected requests (default: 450). The reply is always 450
in case the address-&gt;name lookup failed due to a temporary
problem. <br> This feature is available in Postfix version 2.3 and
later. </dd>
</dl> </dl>
@@ -7404,7 +7426,7 @@ Example:
</p> </p>
<pre> <pre>
<a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, <a href="postconf.5.html#reject_unknown_client">reject_unknown_client</a> <a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, <a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a>
</pre> </pre>
@@ -7745,24 +7767,24 @@ Note: a result of "OK" is not allowed for safety reasons. Instead,
use DUNNO in order to exclude specific hosts from blacklists. This use DUNNO in order to exclude specific hosts from blacklists. This
feature is available in Postfix 2.1 and later. </dd> feature is available in Postfix 2.1 and later. </dd>
<dt><b><a name="reject_invalid_hostname">reject_invalid_hostname</a></b></dt> <dt><b><a name="reject_invalid_helo_hostname">reject_invalid_helo_hostname</a></b> (with Postfix &lt; 2.3: reject_invalid_hostname)</dt>
<dd>Reject the request when the HELO or EHLO hostname syntax is <dd>Reject the request when the HELO or EHLO hostname syntax is
invalid. <br> The <a href="postconf.5.html#invalid_hostname_reject_code">invalid_hostname_reject_code</a> specifies the response invalid. <br> The <a href="postconf.5.html#invalid_hostname_reject_code">invalid_hostname_reject_code</a> specifies the response
code to rejected requests (default: 501).</dd> code to rejected requests (default: 501).</dd>
<dt><b><a name="reject_non_fqdn_hostname">reject_non_fqdn_hostname</a></b></dt> <dt><b><a name="reject_non_fqdn_helo_hostname">reject_non_fqdn_helo_hostname</a></b> (with Postfix &lt; 2.3: reject_non_fqdn_hostname)</dt>
<dd>Reject the request when the HELO or EHLO hostname is not in <dd>Reject the request when the HELO or EHLO hostname is not in
fully-qualified domain form, as required by the RFC. <br> The fully-qualified domain form, as required by the RFC. <br> The
<a href="postconf.5.html#non_fqdn_reject_code">non_fqdn_reject_code</a> parameter specifies the response code to <a href="postconf.5.html#non_fqdn_reject_code">non_fqdn_reject_code</a> parameter specifies the response code to
rejected requests (default: 504).</dd> rejected requests (default: 504).</dd>
<dt><b><a name="reject_unknown_hostname">reject_unknown_hostname</a></b></dt> <dt><b><a name="reject_unknown_helo_hostname">reject_unknown_helo_hostname</a></b> (with Postfix &lt; 2.3: reject_unknown_hostname)</dt>
<dd>Reject the request when the HELO or EHLO hostname has no DNS <dd>Reject the request when the HELO or EHLO hostname has no DNS A
A or MX record. <br> The <a href="postconf.5.html#unknown_hostname_reject_code">unknown_hostname_reject_code</a> specifies or MX record. <br> The <a href="postconf.5.html#unknown_hostname_reject_code">unknown_hostname_reject_code</a> specifies the
the response code to rejected requests (default: 450).</dd> response code to rejected requests (default: 450). </dd>
</dl> </dl>
@@ -7792,8 +7814,8 @@ Examples:
</p> </p>
<pre> <pre>
<a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, <a href="postconf.5.html#reject_invalid_hostname">reject_invalid_hostname</a> <a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, <a href="postconf.5.html#reject_invalid_helo_hostname">reject_invalid_helo_hostname</a>
<a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, <a href="postconf.5.html#reject_unknown_hostname">reject_unknown_hostname</a> <a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a> = <a href="postconf.5.html#permit_mynetworks">permit_mynetworks</a>, <a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_helo_hostname</a>
</pre> </pre>
@@ -8116,7 +8138,7 @@ address. <br> The <a href="postconf.5.html#unknown_address_reject_code">unknown_
the response code for rejected requests (default: 450). The response the response code for rejected requests (default: 450). The response
is always 450 in case of a temporary DNS error.</dd> is always 450 in case of a temporary DNS error.</dd>
<dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (Postfix 2.0 name: check_recipient_maps)</dt> <dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (with Postfix 2.0: check_recipient_maps)</dt>
<dd> Reject the request when the RCPT TO address is not listed in <dd> Reject the request when the RCPT TO address is not listed in
the list of valid recipients for its domain class. See the the list of valid recipients for its domain class. See the
@@ -9438,7 +9460,7 @@ Do not change this unless you have a complete understanding of <a href="http://w
<p> <p>
The numerical Postfix SMTP server response code when a client The numerical Postfix SMTP server response code when a client
without valid address &lt;=&gt; name mapping is rejected by the without valid address &lt;=&gt; name mapping is rejected by the
<a href="postconf.5.html#reject_unknown_client">reject_unknown_client</a> restriction. The SMTP server always replies <a href="postconf.5.html#reject_unknown_client_hostname">reject_unknown_client_hostname</a> restriction. The SMTP server always replies
with 450 when the mapping failed due to a temporary error condition. with 450 when the mapping failed due to a temporary error condition.
</p> </p>
@@ -9455,7 +9477,7 @@ Do not change this unless you have a complete understanding of <a href="http://w
<p> <p>
The numerical Postfix SMTP server response code when the hostname The numerical Postfix SMTP server response code when the hostname
specified with the HELO or EHLO command is rejected by the specified with the HELO or EHLO command is rejected by the
<a href="postconf.5.html#reject_unknown_hostname">reject_unknown_hostname</a> restriction. <a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_helo_hostname</a> restriction.
</p> </p>
<p> <p>

79
postfix/html/smtpd.8.html
View File

@@ -781,8 +781,8 @@ SMTPD(8) SMTPD(8)
<b><a href="postconf.5.html#invalid_hostname_reject_code">invalid_hostname_reject_code</a> (501)</b> <b><a href="postconf.5.html#invalid_hostname_reject_code">invalid_hostname_reject_code</a> (501)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when the client HELO or EHLO command parameter is when the client HELO or EHLO command parameter is
rejected by the <a href="postconf.5.html#reject_invalid_hostname">reject_invalid_hostname</a> restric- rejected by the <a href="postconf.5.html#reject_invalid_helo_hostname">reject_invalid_helo_hostname</a>
tion. restriction.
<b><a href="postconf.5.html#maps_rbl_reject_code">maps_rbl_reject_code</a> (554)</b> <b><a href="postconf.5.html#maps_rbl_reject_code">maps_rbl_reject_code</a> (554)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
@@ -794,46 +794,47 @@ SMTPD(8) SMTPD(8)
<b><a href="postconf.5.html#non_fqdn_reject_code">non_fqdn_reject_code</a> (504)</b> <b><a href="postconf.5.html#non_fqdn_reject_code">non_fqdn_reject_code</a> (504)</b>
The numerical Postfix SMTP server reply code when a The numerical Postfix SMTP server reply code when a
client request is rejected by the client request is rejected by the
<a href="postconf.5.html#reject_non_fqdn_hostname">reject_non_fqdn_hostname</a>, <a href="postconf.5.html#reject_non_fqdn_sender">reject_non_fqdn_sender</a> or <a href="postconf.5.html#reject_non_fqdn_helo_hostname">reject_non_fqdn_helo_hostname</a>,
<a href="postconf.5.html#reject_non_fqdn_recipient">reject_non_fqdn_recipient</a> restriction. <a href="postconf.5.html#reject_non_fqdn_sender">reject_non_fqdn_sender</a> or <a href="postconf.5.html#reject_non_fqdn_recipient">reject_non_fqdn_recipient</a>
restriction.
<b><a href="postconf.5.html#reject_code">reject_code</a> (554)</b> <b><a href="postconf.5.html#reject_code">reject_code</a> (554)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when a remote SMTP client request is rejected by when a remote SMTP client request is rejected by
the "reject" restriction. the "reject" restriction.
<b><a href="postconf.5.html#relay_domains_reject_code">relay_domains_reject_code</a> (554)</b> <b><a href="postconf.5.html#relay_domains_reject_code">relay_domains_reject_code</a> (554)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when a client request is rejected by the when a client request is rejected by the
<a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a> recipient restriction. <a href="postconf.5.html#reject_unauth_destination">reject_unauth_destination</a> recipient restriction.
<b><a href="postconf.5.html#unknown_address_reject_code">unknown_address_reject_code</a> (450)</b> <b><a href="postconf.5.html#unknown_address_reject_code">unknown_address_reject_code</a> (450)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when a sender or recipient address is rejected by when a sender or recipient address is rejected by
the <a href="postconf.5.html#reject_unknown_sender_domain">reject_unknown_sender_domain</a> or the <a href="postconf.5.html#reject_unknown_sender_domain">reject_unknown_sender_domain</a> or
<a href="postconf.5.html#reject_unknown_recipient_domain">reject_unknown_recipient_domain</a> restriction. <a href="postconf.5.html#reject_unknown_recipient_domain">reject_unknown_recipient_domain</a> restriction.
<b><a href="postconf.5.html#unknown_client_reject_code">unknown_client_reject_code</a> (450)</b> <b><a href="postconf.5.html#unknown_client_reject_code">unknown_client_reject_code</a> (450)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when a client without valid address &lt;=&gt; name map- when a client without valid address &lt;=&gt; name map-
ping is rejected by the <a href="postconf.5.html#reject_unknown_client">reject_unknown_client</a> ping is rejected by the reject_unknown_client_host-
restriction. name restriction.
<b><a href="postconf.5.html#unknown_hostname_reject_code">unknown_hostname_reject_code</a> (450)</b> <b><a href="postconf.5.html#unknown_hostname_reject_code">unknown_hostname_reject_code</a> (450)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when the hostname specified with the HELO or EHLO when the hostname specified with the HELO or EHLO
command is rejected by the <a href="postconf.5.html#reject_unknown_hostname">reject_unknown_hostname</a> command is rejected by the
restriction. <a href="postconf.5.html#reject_unknown_helo_hostname">reject_unknown_helo_hostname</a> restriction.
Available in Postfix version 2.0 and later: Available in Postfix version 2.0 and later:
<b><a href="postconf.5.html#default_rbl_reply">default_rbl_reply</a> (see 'postconf -d' output)</b> <b><a href="postconf.5.html#default_rbl_reply">default_rbl_reply</a> (see 'postconf -d' output)</b>
The default SMTP server response template for a The default SMTP server response template for a
request that is rejected by an RBL-based restric- request that is rejected by an RBL-based restric-
tion. tion.
<b><a href="postconf.5.html#multi_recipient_bounce_reject_code">multi_recipient_bounce_reject_code</a> (550)</b> <b><a href="postconf.5.html#multi_recipient_bounce_reject_code">multi_recipient_bounce_reject_code</a> (550)</b>
The numerical Postfix SMTP server response code The numerical Postfix SMTP server response code
when a remote SMTP client request is blocked by the when a remote SMTP client request is blocked by the
<a href="postconf.5.html#reject_multi_recipient_bounce">reject_multi_recipient_bounce</a> restriction. <a href="postconf.5.html#reject_multi_recipient_bounce">reject_multi_recipient_bounce</a> restriction.
@@ -842,16 +843,16 @@ SMTPD(8) SMTPD(8)
<b>MISCELLANEOUS CONTROLS</b> <b>MISCELLANEOUS CONTROLS</b>
<b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b> <b><a href="postconf.5.html#config_directory">config_directory</a> (see 'postconf -d' output)</b>
The default location of the Postfix main.cf and The default location of the Postfix main.cf and
master.cf configuration files. master.cf configuration files.
<b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b> <b><a href="postconf.5.html#daemon_timeout">daemon_timeout</a> (18000s)</b>
How much time a Postfix daemon process may take to How much time a Postfix daemon process may take to
handle a request before it is terminated by a handle a request before it is terminated by a
built-in watchdog timer. built-in watchdog timer.
<b><a href="postconf.5.html#command_directory">command_directory</a> (see 'postconf -d' output)</b> <b><a href="postconf.5.html#command_directory">command_directory</a> (see 'postconf -d' output)</b>
The location of all postfix administrative com- The location of all postfix administrative com-
mands. mands.
<b><a href="postconf.5.html#double_bounce_sender">double_bounce_sender</a> (double-bounce)</b> <b><a href="postconf.5.html#double_bounce_sender">double_bounce_sender</a> (double-bounce)</b>
@@ -872,36 +873,36 @@ SMTPD(8) SMTPD(8)
and most Postfix daemon processes. and most Postfix daemon processes.
<b><a href="postconf.5.html#max_idle">max_idle</a> (100s)</b> <b><a href="postconf.5.html#max_idle">max_idle</a> (100s)</b>
The maximum amount of time that an idle Postfix The maximum amount of time that an idle Postfix
daemon process waits for the next service request daemon process waits for the next service request
before exiting. before exiting.
<b><a href="postconf.5.html#max_use">max_use</a> (100)</b> <b><a href="postconf.5.html#max_use">max_use</a> (100)</b>
The maximal number of connection requests before a The maximal number of connection requests before a
Postfix daemon process terminates. Postfix daemon process terminates.
<b><a href="postconf.5.html#myhostname">myhostname</a> (see 'postconf -d' output)</b> <b><a href="postconf.5.html#myhostname">myhostname</a> (see 'postconf -d' output)</b>
The internet hostname of this mail system. The internet hostname of this mail system.
<b><a href="postconf.5.html#mynetworks">mynetworks</a> (see 'postconf -d' output)</b> <b><a href="postconf.5.html#mynetworks">mynetworks</a> (see 'postconf -d' output)</b>
The list of "trusted" SMTP clients that have more The list of "trusted" SMTP clients that have more
privileges than "strangers". privileges than "strangers".
<b><a href="postconf.5.html#myorigin">myorigin</a> ($<a href="postconf.5.html#myhostname">myhostname</a>)</b> <b><a href="postconf.5.html#myorigin">myorigin</a> ($<a href="postconf.5.html#myhostname">myhostname</a>)</b>
The domain name that locally-posted mail appears to The domain name that locally-posted mail appears to
come from, and that locally posted mail is deliv- come from, and that locally posted mail is deliv-
ered to. ered to.
<b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b> <b><a href="postconf.5.html#process_id">process_id</a> (read-only)</b>
The process ID of a Postfix command or daemon The process ID of a Postfix command or daemon
process. process.
<b><a href="postconf.5.html#process_name">process_name</a> (read-only)</b> <b><a href="postconf.5.html#process_name">process_name</a> (read-only)</b>
The process name of a Postfix command or daemon The process name of a Postfix command or daemon
process. process.
<b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b> <b><a href="postconf.5.html#queue_directory">queue_directory</a> (see 'postconf -d' output)</b>
The location of the Postfix top-level queue direc- The location of the Postfix top-level queue direc-
tory. tory.
<b><a href="postconf.5.html#recipient_delimiter">recipient_delimiter</a> (empty)</b> <b><a href="postconf.5.html#recipient_delimiter">recipient_delimiter</a> (empty)</b>
@@ -909,22 +910,22 @@ SMTPD(8) SMTPD(8)
sions (user+foo). sions (user+foo).
<b><a href="postconf.5.html#smtpd_banner">smtpd_banner</a> ($<a href="postconf.5.html#myhostname">myhostname</a> ESMTP $<a href="postconf.5.html#mail_name">mail_name</a>)</b> <b><a href="postconf.5.html#smtpd_banner">smtpd_banner</a> ($<a href="postconf.5.html#myhostname">myhostname</a> ESMTP $<a href="postconf.5.html#mail_name">mail_name</a>)</b>
The text that follows the 220 status code in the The text that follows the 220 status code in the
SMTP greeting banner. SMTP greeting banner.
<b><a href="postconf.5.html#syslog_facility">syslog_facility</a> (mail)</b> <b><a href="postconf.5.html#syslog_facility">syslog_facility</a> (mail)</b>
The syslog facility of Postfix logging. The syslog facility of Postfix logging.
<b><a href="postconf.5.html#syslog_name">syslog_name</a> (postfix)</b> <b><a href="postconf.5.html#syslog_name">syslog_name</a> (postfix)</b>
The mail system name that is prepended to the The mail system name that is prepended to the
process name in syslog records, so that "smtpd" process name in syslog records, so that "smtpd"
becomes, for example, "postfix/smtpd". becomes, for example, "postfix/smtpd".
Available in Postfix version 2.2 and later: Available in Postfix version 2.2 and later:
<b><a href="postconf.5.html#smtpd_forbidden_commands">smtpd_forbidden_commands</a> (CONNECT, GET, POST)</b> <b><a href="postconf.5.html#smtpd_forbidden_commands">smtpd_forbidden_commands</a> (CONNECT, GET, POST)</b>
List of commands that causes the Postfix SMTP List of commands that causes the Postfix SMTP
server to immediately terminate the session with a server to immediately terminate the session with a
221 code. 221 code.
<b>SEE ALSO</b> <b>SEE ALSO</b>
@@ -953,7 +954,7 @@ SMTPD(8) SMTPD(8)
<a href="XFORWARD_README.html">XFORWARD_README</a>, Postfix XFORWARD extension <a href="XFORWARD_README.html">XFORWARD_README</a>, Postfix XFORWARD extension
<b>LICENSE</b> <b>LICENSE</b>
The Secure Mailer license must be distributed with this The Secure Mailer license must be distributed with this
software. software.
<b>AUTHOR(S)</b> <b>AUTHOR(S)</b>

79
postfix/man/man5/postconf.5
View File

@@ -921,7 +921,11 @@ The client hostname and IP address, formatted as name[address].
.IP "\fB$client_address\fR" .IP "\fB$client_address\fR"
The client IP address. The client IP address.
.IP "\fB$client_name\fR" .IP "\fB$client_name\fR"
The client hostname or "unknown". The client hostname or "unknown". See reject_unknown_client_hostname
for more details.
.IP "\fB$reverse_client_name\fR"
The client hostname from address->name lookup, or "unknown".
See reject_unknown_reverse_client_hostname for more details.
.IP "\fB$helo_name\fR" .IP "\fB$helo_name\fR"
The hostname given in HELO or EHLO command or empty string. The hostname given in HELO or EHLO command or empty string.
.IP "\fB$rbl_class\fR" .IP "\fB$rbl_class\fR"
@@ -1016,8 +1020,8 @@ of failed delivery attempts and generates non-delivery notifications.
.PP .PP
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
.SH defer_transports (default: empty) .SH defer_transports (default: empty)
The names of message delivery transports that should not be delivered The names of message delivery transports that should not deliver mail
to unless someone issues "\fBsendmail -q\fR" or equivalent. Specify zero unless someone issues "\fBsendmail -q\fR" or equivalent. Specify zero
or more names of mail delivery transports names that appear in the or more names of mail delivery transports names that appear in the
first field of master.cf. first field of master.cf.
.PP .PP
@@ -1343,7 +1347,7 @@ This feature is available in Postfix 2.0 and later.
Optional pathname of a mailbox file relative to a \fBlocal\fR(8) user's Optional pathname of a mailbox file relative to a \fBlocal\fR(8) user's
home directory. home directory.
.PP .PP
Specify a pathname ending "/" for qmail-style delivery. Specify a pathname ending in "/" for qmail-style delivery.
.PP .PP
The precedence of \fBlocal\fR(8) delivery features from high to low is: The precedence of \fBlocal\fR(8) delivery features from high to low is:
aliases, .forward files, mailbox_transport, mailbox_command_maps, aliases, .forward files, mailbox_transport, mailbox_command_maps,
@@ -1504,7 +1508,7 @@ Warning: with concurrency of 1, one bad message can be enough to
block all mail to a site. block all mail to a site.
.SH invalid_hostname_reject_code (default: 501) .SH invalid_hostname_reject_code (default: 501)
The numerical Postfix SMTP server response code when the client The numerical Postfix SMTP server response code when the client
HELO or EHLO command parameter is rejected by the reject_invalid_hostname HELO or EHLO command parameter is rejected by the reject_invalid_helo_hostname
restriction. restriction.
.PP .PP
Do not change this unless you have a complete understanding of RFC 821. Do not change this unless you have a complete understanding of RFC 821.
@@ -2434,7 +2438,7 @@ Sendmail compatibility feature that specifies the location of the
\fBlocal\fR(8) \fBaliases\fR(5) database. \fBlocal\fR(8) \fBaliases\fR(5) database.
.SH non_fqdn_reject_code (default: 504) .SH non_fqdn_reject_code (default: 504)
The numerical Postfix SMTP server reply code when a client request The numerical Postfix SMTP server reply code when a client request
is rejected by the reject_non_fqdn_hostname, reject_non_fqdn_sender is rejected by the reject_non_fqdn_helo_hostname, reject_non_fqdn_sender
or reject_non_fqdn_recipient restriction. or reject_non_fqdn_recipient restriction.
.SH notify_classes (default: resource, software) .SH notify_classes (default: resource, software)
The list of error classes that are reported to the postmaster. The The list of error classes that are reported to the postmaster. The
@@ -4103,15 +4107,36 @@ the request when the reversed client network address is listed with
any A record under \fIrbl_domain\fR. See the reject_rbl_client any A record under \fIrbl_domain\fR. See the reject_rbl_client
description above for additional RBL related configuration parameters. description above for additional RBL related configuration parameters.
This feature is available in Postfix 2.0 and later. This feature is available in Postfix 2.0 and later.
.IP "\fBreject_unknown_client\fR" .IP "\fBreject_unknown_client_hostname\fR (with Postfix < 2.3: reject_unknown_client)"
Reject the request when the client IP address has no PTR (address Reject the request when 1) the client IP address->name mapping
to name) record in the DNS, or when the PTR record does not have fails, 2) the name->address mapping fails, or 3) the name->address
a matching A (name to address) record. mapping does not match the client IP address.
.br .br
The unknown_client_reject_code This is a
parameter specifies the response code for rejected requests (default: stronger restriction than the reject_unknown_reverse_client_hostname
450). The reply is always 450 in case the hostname lookup failed feature, which triggers only under condition 1) above.
due to a temporary problem. .br
The
unknown_client_reject_code parameter specifies the response code
for rejected requests (default: 450). The reply is always 450 in
case the address->name or name->address lookup failed due to
a temporary problem.
.IP "\fBreject_unknown_reverse_client_hostname\fR"
Reject the request when the client IP address has no address->name
mapping.
.br
This is a weaker restriction than the
reject_unknown_client_hostname feature, which requires not only
that the address->name and name->address mappings exist, but
also that the two mappings reproduce the client IP address.
.br
The unknown_client_reject_code parameter specifies the response
code for rejected requests (default: 450). The reply is always 450
in case the address->name lookup failed due to a temporary
problem.
.br
This feature is available in Postfix version 2.3 and
later.
.PP .PP
In addition, you can use any of the following In addition, you can use any of the following
generic restrictions. These restrictions are applicable in generic restrictions. These restrictions are applicable in
@@ -4211,7 +4236,7 @@ Example:
.nf .nf
.na .na
.ft C .ft C
smtpd_client_restrictions = permit_mynetworks, reject_unknown_client smtpd_client_restrictions = permit_mynetworks, reject_unknown_client_hostname
.fi .fi
.ad .ad
.ft R .ft R
@@ -4405,25 +4430,25 @@ for the HELO or EHLO hostname, and execute the corresponding action.
Note: a result of "OK" is not allowed for safety reasons. Instead, Note: a result of "OK" is not allowed for safety reasons. Instead,
use DUNNO in order to exclude specific hosts from blacklists. This use DUNNO in order to exclude specific hosts from blacklists. This
feature is available in Postfix 2.1 and later. feature is available in Postfix 2.1 and later.
.IP "\fBreject_invalid_hostname\fR" .IP "\fBreject_invalid_helo_hostname\fR (with Postfix < 2.3: reject_invalid_hostname)"
Reject the request when the HELO or EHLO hostname syntax is Reject the request when the HELO or EHLO hostname syntax is
invalid. invalid.
.br .br
The invalid_hostname_reject_code specifies the response The invalid_hostname_reject_code specifies the response
code to rejected requests (default: 501). code to rejected requests (default: 501).
.IP "\fBreject_non_fqdn_hostname\fR" .IP "\fBreject_non_fqdn_helo_hostname\fR (with Postfix < 2.3: reject_non_fqdn_hostname)"
Reject the request when the HELO or EHLO hostname is not in Reject the request when the HELO or EHLO hostname is not in
fully-qualified domain form, as required by the RFC. fully-qualified domain form, as required by the RFC.
.br .br
The The
non_fqdn_reject_code parameter specifies the response code to non_fqdn_reject_code parameter specifies the response code to
rejected requests (default: 504). rejected requests (default: 504).
.IP "\fBreject_unknown_hostname\fR" .IP "\fBreject_unknown_helo_hostname\fR (with Postfix < 2.3: reject_unknown_hostname)"
Reject the request when the HELO or EHLO hostname has no DNS Reject the request when the HELO or EHLO hostname has no DNS A
A or MX record. or MX record.
.br .br
The unknown_hostname_reject_code specifies The unknown_hostname_reject_code specifies the
the response code to rejected requests (default: 450). response code to rejected requests (default: 450).
.PP .PP
Other restrictions that are valid in this context: Other restrictions that are valid in this context:
.IP \(bu .IP \(bu
@@ -4445,8 +4470,8 @@ Examples:
.nf .nf
.na .na
.ft C .ft C
smtpd_helo_restrictions = permit_mynetworks, reject_invalid_hostname smtpd_helo_restrictions = permit_mynetworks, reject_invalid_helo_hostname
smtpd_helo_restrictions = permit_mynetworks, reject_unknown_hostname smtpd_helo_restrictions = permit_mynetworks, reject_unknown_helo_hostname
.fi .fi
.ad .ad
.ft R .ft R
@@ -4630,7 +4655,7 @@ address.
The unknown_address_reject_code parameter specifies The unknown_address_reject_code parameter specifies
the response code for rejected requests (default: 450). The response the response code for rejected requests (default: 450). The response
is always 450 in case of a temporary DNS error. is always 450 in case of a temporary DNS error.
.IP "\fBreject_unlisted_recipient\fR (Postfix 2.0 name: check_recipient_maps)" .IP "\fBreject_unlisted_recipient\fR (with Postfix 2.0: check_recipient_maps)"
Reject the request when the RCPT TO address is not listed in Reject the request when the RCPT TO address is not listed in
the list of valid recipients for its domain class. See the the list of valid recipients for its domain class. See the
smtpd_reject_unlisted_recipient parameter description for details. smtpd_reject_unlisted_recipient parameter description for details.
@@ -5450,14 +5475,14 @@ Do not change this unless you have a complete understanding of RFC 821.
.SH unknown_client_reject_code (default: 450) .SH unknown_client_reject_code (default: 450)
The numerical Postfix SMTP server response code when a client The numerical Postfix SMTP server response code when a client
without valid address <=> name mapping is rejected by the without valid address <=> name mapping is rejected by the
reject_unknown_client restriction. The SMTP server always replies reject_unknown_client_hostname restriction. The SMTP server always replies
with 450 when the mapping failed due to a temporary error condition. with 450 when the mapping failed due to a temporary error condition.
.PP .PP
Do not change this unless you have a complete understanding of RFC 821. Do not change this unless you have a complete understanding of RFC 821.
.SH unknown_hostname_reject_code (default: 450) .SH unknown_hostname_reject_code (default: 450)
The numerical Postfix SMTP server response code when the hostname The numerical Postfix SMTP server response code when the hostname
specified with the HELO or EHLO command is rejected by the specified with the HELO or EHLO command is rejected by the
reject_unknown_hostname restriction. reject_unknown_helo_hostname restriction.
.PP .PP
Do not change this unless you have a complete understanding of RFC 821. Do not change this unless you have a complete understanding of RFC 821.
.SH unknown_local_recipient_reject_code (default: 550) .SH unknown_local_recipient_reject_code (default: 550)

8
postfix/man/man8/smtpd.8
View File

@@ -632,7 +632,7 @@ The numerical Postfix SMTP server response code when a remote SMTP
client request is rejected by the "defer" restriction. client request is rejected by the "defer" restriction.
.IP "\fBinvalid_hostname_reject_code (501)\fR" .IP "\fBinvalid_hostname_reject_code (501)\fR"
The numerical Postfix SMTP server response code when the client The numerical Postfix SMTP server response code when the client
HELO or EHLO command parameter is rejected by the reject_invalid_hostname HELO or EHLO command parameter is rejected by the reject_invalid_helo_hostname
restriction. restriction.
.IP "\fBmaps_rbl_reject_code (554)\fR" .IP "\fBmaps_rbl_reject_code (554)\fR"
The numerical Postfix SMTP server response code when a remote SMTP The numerical Postfix SMTP server response code when a remote SMTP
@@ -640,7 +640,7 @@ client request is blocked by the reject_rbl_client, reject_rhsbl_client,
reject_rhsbl_sender or reject_rhsbl_recipient restriction. reject_rhsbl_sender or reject_rhsbl_recipient restriction.
.IP "\fBnon_fqdn_reject_code (504)\fR" .IP "\fBnon_fqdn_reject_code (504)\fR"
The numerical Postfix SMTP server reply code when a client request The numerical Postfix SMTP server reply code when a client request
is rejected by the reject_non_fqdn_hostname, reject_non_fqdn_sender is rejected by the reject_non_fqdn_helo_hostname, reject_non_fqdn_sender
or reject_non_fqdn_recipient restriction. or reject_non_fqdn_recipient restriction.
.IP "\fBreject_code (554)\fR" .IP "\fBreject_code (554)\fR"
The numerical Postfix SMTP server response code when a remote SMTP The numerical Postfix SMTP server response code when a remote SMTP
@@ -656,11 +656,11 @@ or reject_unknown_recipient_domain restriction.
.IP "\fBunknown_client_reject_code (450)\fR" .IP "\fBunknown_client_reject_code (450)\fR"
The numerical Postfix SMTP server response code when a client The numerical Postfix SMTP server response code when a client
without valid address <=> name mapping is rejected by the without valid address <=> name mapping is rejected by the
reject_unknown_client restriction. reject_unknown_client_hostname restriction.
.IP "\fBunknown_hostname_reject_code (450)\fR" .IP "\fBunknown_hostname_reject_code (450)\fR"
The numerical Postfix SMTP server response code when the hostname The numerical Postfix SMTP server response code when the hostname
specified with the HELO or EHLO command is rejected by the specified with the HELO or EHLO command is rejected by the
reject_unknown_hostname restriction. reject_unknown_helo_hostname restriction.
.PP .PP
Available in Postfix version 2.0 and later: Available in Postfix version 2.0 and later:
.IP "\fBdefault_rbl_reply (see 'postconf -d' output)\fR" .IP "\fBdefault_rbl_reply (see 'postconf -d' output)\fR"

14
postfix/mantools/postlink
View File

@@ -605,16 +605,22 @@ while (<>) {
s;\bpermit_sasl_authenticated\b;<a href="postconf.5.html#permit_sasl_authenticated">$&</a>;g; s;\bpermit_sasl_authenticated\b;<a href="postconf.5.html#permit_sasl_authenticated">$&</a>;g;
s;\bpermit_tls_clientcerts\b;<a href="postconf.5.html#permit_tls_clientcerts">$&</a>;g; s;\bpermit_tls_clientcerts\b;<a href="postconf.5.html#permit_tls_clientcerts">$&</a>;g;
s;\bpermit_tls_all_clientcerts\b;<a href="postconf.5.html#permit_tls_all_clientcerts">$&</a>;g; s;\bpermit_tls_all_clientcerts\b;<a href="postconf.5.html#permit_tls_all_clientcerts">$&</a>;g;
s;\breject_unknown_client\b;<a href="postconf.5.html#reject_unknown_client">$&</a>;g; s;\breject_unknown_client_hostname\b;<a href="postconf.5.html#reject_unknown_client_hostname">$&</a>;g;
s;\breject_unknown_client\b;<a href="postconf.5.html#reject_unknown_client_hostname">$&</a>;g;
s;\breject_unknown_reverse_client_hostname\b;<a href="postconf.5.html#reject_unknown_reverse_client_hostname">$&</a>;g;
s;\breject_unknown_forward_client_hostname\b;<a href="postconf.5.html#reject_unknown_forward_client_hostname">$&</a>;g;
s;\breject_rbl_client\b;<a href="postconf.5.html#reject_rbl_client">$&</a>;g; s;\breject_rbl_client\b;<a href="postconf.5.html#reject_rbl_client">$&</a>;g;
s;\breject_rhsbl_client\b;<a href="postconf.5.html#reject_rhsbl_client">$&</a>;g; s;\breject_rhsbl_client\b;<a href="postconf.5.html#reject_rhsbl_client">$&</a>;g;
# Access restrictions - helo # Access restrictions - helo
s;\bcheck_helo_access\b;<a href="postconf.5.html#check_helo_access">$&</a>;g; s;\bcheck_helo_access\b;<a href="postconf.5.html#check_helo_access">$&</a>;g;
s;\breject_invalid_hostname\b;<a href="postconf.5.html#reject_invalid_hostname">$&</a>;g; s;\breject_invalid_helo_hostname\b;<a href="postconf.5.html#reject_invalid_helo_hostname">$&</a>;g;
s;\breject_non_fqdn_hostname\b;<a href="postconf.5.html#reject_non_fqdn_hostname">$&</a>;g; s;\breject_invalid_hostname\b;<a href="postconf.5.html#reject_invalid_helo_hostname">$&</a>;g;
s;\breject_unknown_hostname\b;<a href="postconf.5.html#reject_unknown_hostname">$&</a>;g; s;\breject_non_fqdn_helo_hostname\b;<a href="postconf.5.html#reject_non_fqdn_helo_hostname">$&</a>;g;
s;\breject_non_fqdn_hostname\b;<a href="postconf.5.html#reject_non_fqdn_helo_hostname">$&</a>;g;
s;\breject_unknown_helo_hostname\b;<a href="postconf.5.html#reject_unknown_helo_hostname">$&</a>;g;
s;\breject_unknown_hostname\b;<a href="postconf.5.html#reject_unknown_helo_hostname">$&</a>;g;
# Access restrictions - sender # Access restrictions - sender

2
postfix/proto/MAILDROP_README.html
View File

@@ -149,7 +149,7 @@ use the Postfix local(8) delivery agent's mailbox_command_maps feature:
<blockquote> <blockquote>
<pre> <pre>
/etc/postfix/main.cf: /etc/postfix/main.cf:
mailbox_command_maps = /etc/postfix/mailbox_commands mailbox_command_maps = hash:/etc/postfix/mailbox_commands
/etc/postfix/mailbox_commands: /etc/postfix/mailbox_commands:
you /path/to/maildrop -d ${USER} you /path/to/maildrop -d ${USER}

5
postfix/proto/RESTRICTION_CLASS_README.html
View File

@@ -21,7 +21,7 @@ Per-Client/User/etc. Access Control</h1>
<h2>Postfix restriction classes</h2> <h2>Postfix restriction classes</h2>
<p> The Postfix SMTP server supports access restrictions such as <p> The Postfix SMTP server supports access restrictions such as
reject_rbl_client or reject_unknown_client on the right-hand side reject_rbl_client or reject_unknown_client_hostname on the right-hand side
of SMTP server access(5) tables. This allows you to implement of SMTP server access(5) tables. This allows you to implement
different junk mail restrictions for different clients or users. different junk mail restrictions for different clients or users.
</p> </p>
@@ -43,7 +43,8 @@ care about these low-level details. </p>
<pre> <pre>
/etc/postfix/main.cf: /etc/postfix/main.cf:
smtpd_restriction_classes = restrictive, permissive smtpd_restriction_classes = restrictive, permissive
restrictive = reject_unknown_sender_domain reject_unknown_client ... # With Postfix < 2.3 specify reject_unknown_client.
restrictive = reject_unknown_sender_domain reject_unknown_client_hostname ...
permissive = permit permissive = permit
smtpd_recipient_restrictions = smtpd_recipient_restrictions =

8
postfix/proto/SMTPD_ACCESS_README.html
View File

@@ -172,7 +172,8 @@ described in the postconf(5) manual page. </p>
smtpd_client_restrictions = permit_mynetworks, reject smtpd_client_restrictions = permit_mynetworks, reject
# Don't talk to mail systems that don't know their own hostname. # Don't talk to mail systems that don't know their own hostname.
smtpd_helo_restrictions = reject_unknown_hostname # With Postfix < 2.3, specify reject_unknown_hostname.
smtpd_helo_restrictions = reject_unknown_helo_hostname
# Don't accept mail from domains that don't exist. # Don't accept mail from domains that don't exist.
smtpd_sender_restrictions = reject_unknown_sender_domain smtpd_sender_restrictions = reject_unknown_sender_domain
@@ -307,7 +308,7 @@ in too much access permission: </p>
2 smtpd_recipient_restrictions = 2 smtpd_recipient_restrictions =
3 permit_mynetworks 3 permit_mynetworks
4 check_helo_access hash:/etc/postfix/helo_access 4 check_helo_access hash:/etc/postfix/helo_access
5 reject_unknown_hostname 5 reject_unknown_helo_hostname
6 reject_unauth_destination 6 reject_unauth_destination
7 7
8 /etc/postfix/helo_access: 8 /etc/postfix/helo_access:
@@ -315,7 +316,8 @@ in too much access permission: </p>
</pre> </pre>
<p> Line 5 rejects mail from hosts that don't specify a proper <p> Line 5 rejects mail from hosts that don't specify a proper
hostname in the HELO command. Lines 4 and 9 make an exception to hostname in the HELO command (with Postfix < 2.3, specify
reject_unknown_hostname). Lines 4 and 9 make an exception to
allow mail from some machine that announces itself with "HELO allow mail from some machine that announces itself with "HELO
localhost.localdomain". </p> localhost.localdomain". </p>

6
postfix/proto/SMTPD_POLICY_README.html
View File

@@ -80,6 +80,7 @@ sender=foo@bar.tld
recipient=bar@foo.tld recipient=bar@foo.tld
client_address=1.2.3.4 client_address=1.2.3.4
client_name=another.domain.tld client_name=another.domain.tld
reverse_client_name=another.domain.tld
instance=123.456.7 instance=123.456.7
sasl_method=plain sasl_method=plain
sasl_username=you sasl_username=you
@@ -115,6 +116,11 @@ size=12345
1.2.3.4 or it is an IPv6 address in the form 1:2:3::4:5:6. 1.2.3.4 or it is an IPv6 address in the form 1:2:3::4:5:6.
</p> </p>
<li> <p> For a discussion of the differences between reverse
and verified client_name information, see the
reject_unknown_client_hostname discussion in the postconf(5)
document. </p>
<li> <p> An attribute name must not contain "=", null or newline, <li> <p> An attribute name must not contain "=", null or newline,
and an attribute value must not contain null or newline. </p> and an attribute value must not contain null or newline. </p>

93
postfix/proto/postconf.proto
View File

@@ -978,7 +978,19 @@ The template is subject to exactly one level of $name substitution:
<dt><b>$client_name</b></dt> <dt><b>$client_name</b></dt>
<dd>The client hostname or "unknown". </dd> <dd>The client hostname or "unknown". See reject_unknown_client_hostname
for more details. </dd>
<dt><b>$reverse_client_name</b></dt>
<dd>The client hostname from address-&gt;name lookup, or "unknown".
See reject_unknown_reverse_client_hostname for more details. </dd>
#<dt><b>$forward_client_name</b></dt>
#
#<dd>The client hostname from address-&gt;name lookup followed by
#name-&gt;address lookup, or "unknown". See
#reject_unknown_forward_client_hostname for more details. </dd>
<dt><b>$helo_name</b></dt> <dt><b>$helo_name</b></dt>
@@ -1121,8 +1133,8 @@ Do not change this unless you have a complete understanding of RFC 821.
%PARAM defer_transports %PARAM defer_transports
<p> <p>
The names of message delivery transports that should not be delivered The names of message delivery transports that should not deliver mail
to unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero unless someone issues "<b>sendmail -q</b>" or equivalent. Specify zero
or more names of mail delivery transports names that appear in the or more names of mail delivery transports names that appear in the
first field of master.cf. first field of master.cf.
</p> </p>
@@ -1545,7 +1557,7 @@ home directory.
</p> </p>
<p> <p>
Specify a pathname ending "/" for qmail-style delivery. Specify a pathname ending in "/" for qmail-style delivery.
</p> </p>
<p> <p>
@@ -1751,7 +1763,7 @@ block all mail to a site.
<p> <p>
The numerical Postfix SMTP server response code when the client The numerical Postfix SMTP server response code when the client
HELO or EHLO command parameter is rejected by the reject_invalid_hostname HELO or EHLO command parameter is rejected by the reject_invalid_helo_hostname
restriction. restriction.
</p> </p>
@@ -4476,14 +4488,43 @@ any A record under <i>rbl_domain</i>. See the reject_rbl_client
description above for additional RBL related configuration parameters. description above for additional RBL related configuration parameters.
This feature is available in Postfix 2.0 and later. </dd> This feature is available in Postfix 2.0 and later. </dd>
<dt><b><a name="reject_unknown_client">reject_unknown_client</a></b></dt> <dt><b><a name="reject_unknown_client_hostname">reject_unknown_client_hostname</a></b> (with Postfix &lt; 2.3: reject_unknown_client)</dt>
<dd>Reject the request when the client IP address has no PTR (address <dd>Reject the request when 1) the client IP address-&gt;name mapping
to name) record in the DNS, or when the PTR record does not have fails, 2) the name-&gt;address mapping fails, or 3) the name-&gt;address
a matching A (name to address) record. <br> The unknown_client_reject_code mapping does not match the client IP address. <br> This is a
parameter specifies the response code for rejected requests (default: stronger restriction than the reject_unknown_reverse_client_hostname
450). The reply is always 450 in case the hostname lookup failed feature, which triggers only under condition 1) above. <br> The
due to a temporary problem. </dd> unknown_client_reject_code parameter specifies the response code
for rejected requests (default: 450). The reply is always 450 in
case the address-&gt;name or name-&gt;address lookup failed due to
a temporary problem. </dd>
<dt><b><a name="reject_unknown_reverse_client_hostname">reject_unknown_reverse_client_hostname</a></b></dt>
<dd>Reject the request when the client IP address has no address-&gt;name
mapping. <br> This is a weaker restriction than the
reject_unknown_client_hostname feature, which requires not only
that the address-&gt;name and name-&gt;address mappings exist, but
also that the two mappings reproduce the client IP address. <br>
The unknown_client_reject_code parameter specifies the response
code for rejected requests (default: 450). The reply is always 450
in case the address-&gt;name lookup failed due to a temporary
problem. <br> This feature is available in Postfix version 2.3 and
later. </dd>
#<dt><b><a name="reject_unknown_forward_client_hostname">reject_unknown_forward_client_hostname</a></b></dt>
#
#<dd>Reject the request when the client IP address has no address-&gt;name
#or name -&gt;address mapping. <br> This is a weaker restriction
#than the reject_unknown_client_hostname feature, which requires not
#only that the address-&gt;name and name-&gt;address mappings exist,
#but also that the two mappings reproduce the client IP address.
#<br> The unknown_client_reject_code parameter specifies the response
#code for rejected requests (default: 450). The reply is always 450
#in case the address-&gt;name or name -&gt;address lookup failed due
#to a temporary problem. <br> This feature is available in Postfix
#version 2.3 and later. </dd>
</dl> </dl>
@@ -4607,7 +4648,7 @@ Example:
</p> </p>
<pre> <pre>
smtpd_client_restrictions = permit_mynetworks, reject_unknown_client smtpd_client_restrictions = permit_mynetworks, reject_unknown_client_hostname
</pre> </pre>
%CLASS smtpd-tarpit Tarpit features %CLASS smtpd-tarpit Tarpit features
@@ -4839,24 +4880,24 @@ Note: a result of "OK" is not allowed for safety reasons. Instead,
use DUNNO in order to exclude specific hosts from blacklists. This use DUNNO in order to exclude specific hosts from blacklists. This
feature is available in Postfix 2.1 and later. </dd> feature is available in Postfix 2.1 and later. </dd>
<dt><b><a name="reject_invalid_hostname">reject_invalid_hostname</a></b></dt> <dt><b><a name="reject_invalid_helo_hostname">reject_invalid_helo_hostname</a></b> (with Postfix &lt; 2.3: reject_invalid_hostname)</dt>
<dd>Reject the request when the HELO or EHLO hostname syntax is <dd>Reject the request when the HELO or EHLO hostname syntax is
invalid. <br> The invalid_hostname_reject_code specifies the response invalid. <br> The invalid_hostname_reject_code specifies the response
code to rejected requests (default: 501).</dd> code to rejected requests (default: 501).</dd>
<dt><b><a name="reject_non_fqdn_hostname">reject_non_fqdn_hostname</a></b></dt> <dt><b><a name="reject_non_fqdn_helo_hostname">reject_non_fqdn_helo_hostname</a></b> (with Postfix &lt; 2.3: reject_non_fqdn_hostname)</dt>
<dd>Reject the request when the HELO or EHLO hostname is not in <dd>Reject the request when the HELO or EHLO hostname is not in
fully-qualified domain form, as required by the RFC. <br> The fully-qualified domain form, as required by the RFC. <br> The
non_fqdn_reject_code parameter specifies the response code to non_fqdn_reject_code parameter specifies the response code to
rejected requests (default: 504).</dd> rejected requests (default: 504).</dd>
<dt><b><a name="reject_unknown_hostname">reject_unknown_hostname</a></b></dt> <dt><b><a name="reject_unknown_helo_hostname">reject_unknown_helo_hostname</a></b> (with Postfix &lt; 2.3: reject_unknown_hostname)</dt>
<dd>Reject the request when the HELO or EHLO hostname has no DNS <dd>Reject the request when the HELO or EHLO hostname has no DNS A
A or MX record. <br> The unknown_hostname_reject_code specifies or MX record. <br> The unknown_hostname_reject_code specifies the
the response code to rejected requests (default: 450).</dd> response code to rejected requests (default: 450). </dd>
</dl> </dl>
@@ -4886,8 +4927,8 @@ Examples:
</p> </p>
<pre> <pre>
smtpd_helo_restrictions = permit_mynetworks, reject_invalid_hostname smtpd_helo_restrictions = permit_mynetworks, reject_invalid_helo_hostname
smtpd_helo_restrictions = permit_mynetworks, reject_unknown_hostname smtpd_helo_restrictions = permit_mynetworks, reject_unknown_helo_hostname
</pre> </pre>
%PARAM smtpd_history_flush_threshold 100 %PARAM smtpd_history_flush_threshold 100
@@ -5115,7 +5156,7 @@ address. <br> The unknown_address_reject_code parameter specifies
the response code for rejected requests (default: 450). The response the response code for rejected requests (default: 450). The response
is always 450 in case of a temporary DNS error.</dd> is always 450 in case of a temporary DNS error.</dd>
<dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (Postfix 2.0 name: check_recipient_maps)</dt> <dt><b><a name="reject_unlisted_recipient">reject_unlisted_recipient</a></b> (with Postfix 2.0: check_recipient_maps)</dt>
<dd> Reject the request when the RCPT TO address is not listed in <dd> Reject the request when the RCPT TO address is not listed in
the list of valid recipients for its domain class. See the the list of valid recipients for its domain class. See the
@@ -5694,7 +5735,7 @@ Do not change this unless you have a complete understanding of RFC 821.
<p> <p>
The numerical Postfix SMTP server response code when a client The numerical Postfix SMTP server response code when a client
without valid address &lt;=&gt; name mapping is rejected by the without valid address &lt;=&gt; name mapping is rejected by the
reject_unknown_client restriction. The SMTP server always replies reject_unknown_client_hostname restriction. The SMTP server always replies
with 450 when the mapping failed due to a temporary error condition. with 450 when the mapping failed due to a temporary error condition.
</p> </p>
@@ -5707,7 +5748,7 @@ Do not change this unless you have a complete understanding of RFC 821.
<p> <p>
The numerical Postfix SMTP server response code when the hostname The numerical Postfix SMTP server response code when the hostname
specified with the HELO or EHLO command is rejected by the specified with the HELO or EHLO command is rejected by the
reject_unknown_hostname restriction. reject_unknown_helo_hostname restriction.
</p> </p>
<p> <p>
@@ -6757,7 +6798,7 @@ local(8) aliases(5) database.
<p> <p>
The numerical Postfix SMTP server reply code when a client request The numerical Postfix SMTP server reply code when a client request
is rejected by the reject_non_fqdn_hostname, reject_non_fqdn_sender is rejected by the reject_non_fqdn_helo_hostname, reject_non_fqdn_sender
or reject_non_fqdn_recipient restriction. or reject_non_fqdn_recipient restriction.
</p> </p>
@@ -7798,7 +7839,7 @@ is suitable for, e.g., pop-before-smtp lookup tables. </dd>
<p> Examples: </p> <p> Examples: </p>
<p> The Postfix < 2.2 backwards compatible setting: always rewrite <p> The Postfix &lt; 2.2 backwards compatible setting: always rewrite
message headers, and always append my own domain to incomplete message headers, and always append my own domain to incomplete
header addresses. </p> header addresses. </p>

15
postfix/src/global/Makefile.in
View File

@@ -27,7 +27,7 @@ SRCS = abounce.c anvil_clnt.c been_here.c bounce.c bounce_log.c \
ehlo_mask.c \ ehlo_mask.c \
wildcard_inet_addr.c valid_mailhost_addr.c dsn_util.c dsn_mask.c \ wildcard_inet_addr.c valid_mailhost_addr.c dsn_util.c dsn_mask.c \
dsn_attr_map.c dsn.c dsn_buf.c rcpt_buf.c rcpt_print.c dsn_print.c \ dsn_attr_map.c dsn.c dsn_buf.c rcpt_buf.c rcpt_print.c dsn_print.c \
dsb_scan.c dsb_scan.c mail_conf_long.c
OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \
canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \ canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \
clnt_stream.o debug_peer.o debug_process.o defer.o db_common.o \ clnt_stream.o debug_peer.o debug_process.o defer.o db_common.o \
@@ -56,7 +56,7 @@ OBJS = abounce.o anvil_clnt.o been_here.o bounce.o bounce_log.o \
ehlo_mask.o \ ehlo_mask.o \
wildcard_inet_addr.o valid_mailhost_addr.o dsn_util.o dsn_mask.o \ wildcard_inet_addr.o valid_mailhost_addr.o dsn_util.o dsn_mask.o \
dsn_attr_map.o dsn.o dsn_buf.o rcpt_buf.o rcpt_print.o dsn_print.o \ dsn_attr_map.o dsn.o dsn_buf.o rcpt_buf.o rcpt_print.o dsn_print.o \
dsb_scan.o dsb_scan.o mail_conf_long.o
HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \ HDRS = abounce.h anvil_clnt.h been_here.h bounce.h bounce_log.h \
canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \ canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \
debug_peer.h debug_process.h defer.h deliver_completed.h \ debug_peer.h debug_process.h defer.h deliver_completed.h \
@@ -968,6 +968,17 @@ mail_conf_int.o: ../../include/vstream.h
mail_conf_int.o: ../../include/vstring.h mail_conf_int.o: ../../include/vstring.h
mail_conf_int.o: mail_conf.h mail_conf_int.o: mail_conf.h
mail_conf_int.o: mail_conf_int.c mail_conf_int.o: mail_conf_int.c
mail_conf_long.o: ../../include/argv.h
mail_conf_long.o: ../../include/dict.h
mail_conf_long.o: ../../include/msg.h
mail_conf_long.o: ../../include/mymalloc.h
mail_conf_long.o: ../../include/stringops.h
mail_conf_long.o: ../../include/sys_defs.h
mail_conf_long.o: ../../include/vbuf.h
mail_conf_long.o: ../../include/vstream.h
mail_conf_long.o: ../../include/vstring.h
mail_conf_long.o: mail_conf.h
mail_conf_long.o: mail_conf_long.c
mail_conf_raw.o: ../../include/msg.h mail_conf_raw.o: ../../include/msg.h
mail_conf_raw.o: ../../include/mymalloc.h mail_conf_raw.o: ../../include/mymalloc.h
mail_conf_raw.o: ../../include/sys_defs.h mail_conf_raw.o: ../../include/sys_defs.h

26
postfix/src/global/mail_conf.h
View File

@@ -46,11 +46,13 @@ extern const char *mail_conf_lookup_eval(const char *);
*/ */
extern char *get_mail_conf_str(const char *, const char *, int, int); extern char *get_mail_conf_str(const char *, const char *, int, int);
extern int get_mail_conf_int(const char *, int, int, int); extern int get_mail_conf_int(const char *, int, int, int);
extern long get_mail_conf_long(const char *, long, long, long);
extern int get_mail_conf_bool(const char *, int); extern int get_mail_conf_bool(const char *, int);
extern int get_mail_conf_time(const char *, const char *, int, int); extern int get_mail_conf_time(const char *, const char *, int, int);
extern char *get_mail_conf_raw(const char *, const char *, int, int); extern char *get_mail_conf_raw(const char *, const char *, int, int);
extern int get_mail_conf_int2(const char *, const char *, int, int, int); extern int get_mail_conf_int2(const char *, const char *, int, int, int);
extern long get_mail_conf_long2(const char *, const char *, long, long, long);
extern int get_mail_conf_time2(const char *, const char *, const char *, int, int); extern int get_mail_conf_time2(const char *, const char *, const char *, int, int);
/* /*
@@ -58,6 +60,7 @@ extern int get_mail_conf_time2(const char *, const char *, const char *, int, in
*/ */
extern char *get_mail_conf_str_fn(const char *, const char *(*) (void), int, int); extern char *get_mail_conf_str_fn(const char *, const char *(*) (void), int, int);
extern int get_mail_conf_int_fn(const char *, int (*) (void), int, int); extern int get_mail_conf_int_fn(const char *, int (*) (void), int, int);
extern long get_mail_conf_long_fn(const char *, long (*) (void), long, long);
extern int get_mail_conf_bool_fn(const char *, int (*) (void)); extern int get_mail_conf_bool_fn(const char *, int (*) (void));
extern int get_mail_conf_time_fn(const char *, const char *(*) (void), int, int, int); extern int get_mail_conf_time_fn(const char *, const char *(*) (void), int, int, int);
extern char *get_mail_conf_raw_fn(const char *, const char *(*) (void), int, int); extern char *get_mail_conf_raw_fn(const char *, const char *(*) (void), int, int);
@@ -67,6 +70,7 @@ extern char *get_mail_conf_raw_fn(const char *, const char *(*) (void), int, int
*/ */
extern void set_mail_conf_str(const char *, const char *); extern void set_mail_conf_str(const char *, const char *);
extern void set_mail_conf_int(const char *, int); extern void set_mail_conf_int(const char *, int);
extern void set_mail_conf_long(const char *, long);
extern void set_mail_conf_bool(const char *, int); extern void set_mail_conf_bool(const char *, int);
extern void set_mail_conf_time(const char *, const char *); extern void set_mail_conf_time(const char *, const char *);
@@ -88,7 +92,7 @@ typedef struct {
char **target; /* pointer to global variable */ char **target; /* pointer to global variable */
int min; /* min length or zero */ int min; /* min length or zero */
int max; /* max length or zero */ int max; /* max length or zero */
} CONFIG_RAW_TABLE; } CONFIG_RAW_TABLE;
typedef struct { typedef struct {
const char *name; /* config variable name */ const char *name; /* config variable name */
@@ -98,6 +102,14 @@ typedef struct {
int max; /* upper bound or zero */ int max; /* upper bound or zero */
} CONFIG_INT_TABLE; } CONFIG_INT_TABLE;
typedef struct {
const char *name; /* config variable name */
long defval; /* default value */
long *target; /* pointer to global variable */
long min; /* lower bound or zero */
long max; /* upper bound or zero */
} CONFIG_LONG_TABLE;
typedef struct { typedef struct {
const char *name; /* config variable name */ const char *name; /* config variable name */
int defval; /* default value */ int defval; /* default value */
@@ -114,6 +126,7 @@ typedef struct {
extern void get_mail_conf_str_table(CONFIG_STR_TABLE *); extern void get_mail_conf_str_table(CONFIG_STR_TABLE *);
extern void get_mail_conf_int_table(CONFIG_INT_TABLE *); extern void get_mail_conf_int_table(CONFIG_INT_TABLE *);
extern void get_mail_conf_long_table(CONFIG_LONG_TABLE *);
extern void get_mail_conf_bool_table(CONFIG_BOOL_TABLE *); extern void get_mail_conf_bool_table(CONFIG_BOOL_TABLE *);
extern void get_mail_conf_time_table(CONFIG_TIME_TABLE *); extern void get_mail_conf_time_table(CONFIG_TIME_TABLE *);
extern void get_mail_conf_raw_table(CONFIG_RAW_TABLE *); extern void get_mail_conf_raw_table(CONFIG_RAW_TABLE *);
@@ -136,7 +149,7 @@ typedef struct {
char **target; /* pointer to global variable */ char **target; /* pointer to global variable */
int min; /* lower bound or zero */ int min; /* lower bound or zero */
int max; /* upper bound or zero */ int max; /* upper bound or zero */
} CONFIG_RAW_FN_TABLE; } CONFIG_RAW_FN_TABLE;
typedef struct { typedef struct {
const char *name; /* config variable name */ const char *name; /* config variable name */
@@ -146,6 +159,14 @@ typedef struct {
int max; /* upper bound or zero */ int max; /* upper bound or zero */
} CONFIG_INT_FN_TABLE; } CONFIG_INT_FN_TABLE;
typedef struct {
const char *name; /* config variable name */
long (*defval) (void); /* default value provider */
long *target; /* pointer to global variable */
long min; /* lower bound or zero */
long max; /* upper bound or zero */
} CONFIG_LONG_FN_TABLE;
typedef struct { typedef struct {
const char *name; /* config variable name */ const char *name; /* config variable name */
int (*defval) (void); /* default value provider */ int (*defval) (void); /* default value provider */
@@ -154,6 +175,7 @@ typedef struct {
extern void get_mail_conf_str_fn_table(CONFIG_STR_FN_TABLE *); extern void get_mail_conf_str_fn_table(CONFIG_STR_FN_TABLE *);
extern void get_mail_conf_int_fn_table(CONFIG_INT_FN_TABLE *); extern void get_mail_conf_int_fn_table(CONFIG_INT_FN_TABLE *);
extern void get_mail_conf_long_fn_table(CONFIG_LONG_FN_TABLE *);
extern void get_mail_conf_bool_fn_table(CONFIG_BOOL_FN_TABLE *); extern void get_mail_conf_bool_fn_table(CONFIG_BOOL_FN_TABLE *);
extern void get_mail_conf_raw_fn_table(CONFIG_RAW_FN_TABLE *); extern void get_mail_conf_raw_fn_table(CONFIG_RAW_FN_TABLE *);

193
postfix/src/global/mail_conf_long.c Normal file
View File

@@ -0,0 +1,193 @@
/*++
/* NAME
/* mail_conf_long 3
/* SUMMARY
/* long integer-valued configuration parameter support
/* SYNOPSIS
/* #include <mail_conf.h>
/*
/* int get_mail_conf_long(name, defval, min, max);
/* const char *name;
/* long defval;
/* long min;
/* long max;
/*
/* int get_mail_conf_long_fn(name, defval, min, max);
/* const char *name;
/* long (*defval)(void);
/* long min;
/* long max;
/*
/* void set_mail_conf_long(name, value)
/* const char *name;
/* long value;
/*
/* void get_mail_conf_long_table(table)
/* CONFIG_LONG_TABLE *table;
/*
/* void get_mail_conf_long_fn_table(table)
/* CONFIG_LONG_TABLE *table;
/* AUXILIARY FUNCTIONS
/* int get_mail_conf_long2(name1, name2, defval, min, max);
/* const char *name1;
/* const char *name2;
/* long defval;
/* long min;
/* long max;
/* DESCRIPTION
/* This module implements configuration parameter support
/* for long integer values.
/*
/* get_mail_conf_long() looks up the named entry in the global
/* configuration dictionary. The default value is returned
/* when no value was found.
/* \fImin\fR is zero or specifies a lower limit on the long
/* integer value; \fImax\fR is zero or specifies an upper limit
/* on the long integer value.
/*
/* get_mail_conf_long_fn() is similar but specifies a function that
/* provides the default value. The function is called only
/* when the default value is needed.
/*
/* set_mail_conf_long() updates the named entry in the global
/* configuration dictionary. This has no effect on values that
/* have been looked up earlier via the get_mail_conf_XXX() routines.
/*
/* get_mail_conf_long_table() and get_mail_conf_long_fn_table() initialize
/* lists of variables, as directed by their table arguments. A table
/* must be terminated by a null entry.
/*
/* get_mail_conf_long2() concatenates the two names and is otherwise
/* identical to get_mail_conf_long().
/* DIAGNOSTICS
/* Fatal errors: malformed numerical value.
/* SEE ALSO
/* config(3) general configuration
/* mail_conf_str(3) string-valued configuration parameters
/* LICENSE
/* .ad
/* .fi
/* 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
/*--*/
/* System library. */
#include <sys_defs.h>
#include <stdlib.h>
#include <stdio.h> /* sscanf() */
/* Utility library. */
#include <msg.h>
#include <mymalloc.h>
#include <dict.h>
#include <stringops.h>
/* Global library. */
#include "mail_conf.h"
/* convert_mail_conf_long - look up and convert integer parameter value */
static int convert_mail_conf_long(const char *name, long *longval)
{
const char *strval;
char junk;
if ((strval = mail_conf_lookup_eval(name)) != 0) {
if (sscanf(strval, "%ld%c", longval, &junk) != 1)
msg_fatal("bad numerical configuration: %s = %s", name, strval);
return (1);
}
return (0);
}
/* check_mail_conf_long - validate integer value */
static void check_mail_conf_long(const char *name, long longval, long min, long max)
{
if (min && longval < min)
msg_fatal("invalid %s parameter value %ld < %ld", name, longval, min);
if (max && longval > max)
msg_fatal("invalid %s parameter value %ld > %ld", name, longval, max);
}
/* get_mail_conf_long - evaluate integer-valued configuration variable */
long get_mail_conf_long(const char *name, long defval, long min, long max)
{
long longval;
if (convert_mail_conf_long(name, &longval) == 0)
set_mail_conf_long(name, longval = defval);
check_mail_conf_long(name, longval, min, max);
return (longval);
}
/* get_mail_conf_long2 - evaluate integer-valued configuration variable */
long get_mail_conf_long2(const char *name1, const char *name2, long defval,
long min, long max)
{
long longval;
char *name;
name = concatenate(name1, name2, (char *) 0);
if (convert_mail_conf_long(name, &longval) == 0)
set_mail_conf_long(name, longval = defval);
check_mail_conf_long(name, longval, min, max);
myfree(name);
return (longval);
}
/* get_mail_conf_long_fn - evaluate integer-valued configuration variable */
typedef long (*stupid_indent_long) (void);
long get_mail_conf_long_fn(const char *name, stupid_indent_long defval,
long min, long max)
{
long longval;
if (convert_mail_conf_long(name, &longval) == 0)
set_mail_conf_long(name, longval = defval());
check_mail_conf_long(name, longval, min, max);
return (longval);
}
/* set_mail_conf_long - update integer-valued configuration dictionary entry */
void set_mail_conf_long(const char *name, long value)
{
char buf[BUFSIZ]; /* yeah! crappy code! */
sprintf(buf, "%ld", value); /* yeah! more crappy code! */
mail_conf_update(name, buf);
}
/* get_mail_conf_long_table - look up table of integers */
void get_mail_conf_long_table(CONFIG_LONG_TABLE *table)
{
while (table->name) {
table->target[0] = get_mail_conf_long(table->name, table->defval,
table->min, table->max);
table++;
}
}
/* get_mail_conf_long_fn_table - look up integers, defaults are functions */
void get_mail_conf_long_fn_table(CONFIG_LONG_FN_TABLE *table)
{
while (table->name) {
table->target[0] = get_mail_conf_long_fn(table->name, table->defval,
table->min, table->max);
table++;
}
}

6
postfix/src/global/mail_params.h
View File

@@ -1586,6 +1586,9 @@ extern int var_defer_code;
#define SLEEP "sleep" #define SLEEP "sleep"
#define REJECT_UNKNOWN_CLIENT "reject_unknown_client" #define REJECT_UNKNOWN_CLIENT "reject_unknown_client"
#define REJECT_UNKNOWN_CLIENT_HOSTNAME "reject_unknown_client_hostname"
#define REJECT_UNKNOWN_REVERSE_HOSTNAME "reject_unknown_reverse_client_hostname"
#define REJECT_UNKNOWN_FORWARD_HOSTNAME "reject_unknown_forward_client_hostname"
#define VAR_UNK_CLIENT_CODE "unknown_client_reject_code" #define VAR_UNK_CLIENT_CODE "unknown_client_reject_code"
#define DEF_UNK_CLIENT_CODE 450 #define DEF_UNK_CLIENT_CODE 450
extern int var_unk_client_code; extern int var_unk_client_code;
@@ -1596,16 +1599,19 @@ extern int var_unk_client_code;
#define PERMIT_NAKED_IP_ADDR "permit_naked_ip_address" #define PERMIT_NAKED_IP_ADDR "permit_naked_ip_address"
#define REJECT_INVALID_HELO_HOSTNAME "reject_invalid_helo_hostname"
#define REJECT_INVALID_HOSTNAME "reject_invalid_hostname" #define REJECT_INVALID_HOSTNAME "reject_invalid_hostname"
#define VAR_BAD_NAME_CODE "invalid_hostname_reject_code" #define VAR_BAD_NAME_CODE "invalid_hostname_reject_code"
#define DEF_BAD_NAME_CODE 501 /* SYNTAX */ #define DEF_BAD_NAME_CODE 501 /* SYNTAX */
extern int var_bad_name_code; extern int var_bad_name_code;
#define REJECT_UNKNOWN_HELO_HOSTNAME "reject_unknown_helo_hostname"
#define REJECT_UNKNOWN_HOSTNAME "reject_unknown_hostname" #define REJECT_UNKNOWN_HOSTNAME "reject_unknown_hostname"
#define VAR_UNK_NAME_CODE "unknown_hostname_reject_code" #define VAR_UNK_NAME_CODE "unknown_hostname_reject_code"
#define DEF_UNK_NAME_CODE 450 #define DEF_UNK_NAME_CODE 450
extern int var_unk_name_code; extern int var_unk_name_code;
#define REJECT_NON_FQDN_HELO_HOSTNAME "reject_non_fqdn_helo_hostname"
#define REJECT_NON_FQDN_HOSTNAME "reject_non_fqdn_hostname" #define REJECT_NON_FQDN_HOSTNAME "reject_non_fqdn_hostname"
#define REJECT_NON_FQDN_SENDER "reject_non_fqdn_sender" #define REJECT_NON_FQDN_SENDER "reject_non_fqdn_sender"
#define REJECT_NON_FQDN_RCPT "reject_non_fqdn_recipient" #define REJECT_NON_FQDN_RCPT "reject_non_fqdn_recipient"

6
postfix/src/global/mail_proto.h
View File

@@ -159,8 +159,10 @@ extern char *mail_pathname(const char *, const char *);
#define MAIL_ATTR_ENC_8BIT "8bit" /* 8BITMIME equivalent */ #define MAIL_ATTR_ENC_8BIT "8bit" /* 8BITMIME equivalent */
#define MAIL_ATTR_ENC_7BIT "7bit" /* 7BIT equivalent */ #define MAIL_ATTR_ENC_7BIT "7bit" /* 7BIT equivalent */
#define MAIL_ATTR_ENC_NONE "" /* encoding unknown */ #define MAIL_ATTR_ENC_NONE "" /* encoding unknown */
#define MAIL_ATTR_CLIENT "client" /* client name[addr] */ #define MAIL_ATTR_CLIENT "client"/* client name[addr] */
#define MAIL_ATTR_CLIENT_NAME "client_name" /* client hostname */ #define MAIL_ATTR_CLIENT_NAME "client_name" /* client hostname */
#define MAIL_ATTR_REVERSE_CLIENT_NAME "reverse_client_name"
#define MAIL_ATTR_FORWARD_CLIENT_NAME "forward_client_name"
#define MAIL_ATTR_CLIENT_ADDR "client_address" /* client address */ #define MAIL_ATTR_CLIENT_ADDR "client_address" /* client address */
#define MAIL_ATTR_HELO_NAME "helo_name" /* SMTP helo name */ #define MAIL_ATTR_HELO_NAME "helo_name" /* SMTP helo name */
#define MAIL_ATTR_PROTO_NAME "protocol_name" /* SMTP/ESMTP/QMQP/... */ #define MAIL_ATTR_PROTO_NAME "protocol_name" /* SMTP/ESMTP/QMQP/... */
@@ -174,6 +176,8 @@ extern char *mail_pathname(const char *, const char *);
*/ */
#define XCLIENT_CMD "XCLIENT" /* XCLIENT command */ #define XCLIENT_CMD "XCLIENT" /* XCLIENT command */
#define XCLIENT_NAME "NAME" /* client name */ #define XCLIENT_NAME "NAME" /* client name */
#define XCLIENT_REVERSE_NAME "REVERSE_NAME" /* reverse client name */
#define XCLIENT_FORWARD_NAME "FORWARD_NAME" /* forward client name */
#define XCLIENT_ADDR "ADDR" /* client address */ #define XCLIENT_ADDR "ADDR" /* client address */
#define XCLIENT_PROTO "PROTO" /* client protocol */ #define XCLIENT_PROTO "PROTO" /* client protocol */
#define XCLIENT_HELO "HELO" /* client helo */ #define XCLIENT_HELO "HELO" /* client helo */

2
postfix/src/global/mail_version.h
View File

@@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20050716" #define MAIL_RELEASE_DATE "20050724"
#define MAIL_VERSION_NUMBER "2.3" #define MAIL_VERSION_NUMBER "2.3"
#ifdef SNAPSHOT #ifdef SNAPSHOT

4
postfix/src/oqmgr/qmgr_queue.c
View File

@@ -23,9 +23,9 @@
/* QMGR_QUEUE *qmgr_queue_select(transport) /* QMGR_QUEUE *qmgr_queue_select(transport)
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;
/* /*
/* void qmgr_queue_throttle(queue, del_stat) /* void qmgr_queue_throttle(queue, dsn)
/* QMGR_QUEUE *queue; /* QMGR_QUEUE *queue;
/* DEL_STAT *del_stat; /* DSN *dsn;
/* /*
/* void qmgr_queue_unthrottle(queue) /* void qmgr_queue_unthrottle(queue)
/* QMGR_QUEUE *queue; /* QMGR_QUEUE *queue;

4
postfix/src/oqmgr/qmgr_transport.c
View File

@@ -18,9 +18,9 @@
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;
/* void (*notify)(QMGR_TRANSPORT *transport, VSTREAM *fp); /* void (*notify)(QMGR_TRANSPORT *transport, VSTREAM *fp);
/* /*
/* void qmgr_transport_throttle(transport, del_stat) /* void qmgr_transport_throttle(transport, dsn)
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;
/* DEL_STAT *del_stat; /* DSN *dsn;
/* /*
/* void qmgr_transport_unthrottle(transport) /* void qmgr_transport_unthrottle(transport)
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;

4
postfix/src/qmgr/qmgr_queue.c
View File

@@ -20,9 +20,9 @@
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;
/* const char *name; /* const char *name;
/* /*
/* void qmgr_queue_throttle(queue, del_stat) /* void qmgr_queue_throttle(queue, dsn)
/* QMGR_QUEUE *queue; /* QMGR_QUEUE *queue;
/* DEL_STAT *del_stat; /* DSN *dsn;
/* /*
/* void qmgr_queue_unthrottle(queue) /* void qmgr_queue_unthrottle(queue)
/* QMGR_QUEUE *queue; /* QMGR_QUEUE *queue;

4
postfix/src/qmgr/qmgr_transport.c
View File

@@ -18,9 +18,9 @@
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;
/* void (*notify)(QMGR_TRANSPORT *transport, VSTREAM *fp); /* void (*notify)(QMGR_TRANSPORT *transport, VSTREAM *fp);
/* /*
/* void qmgr_transport_throttle(transport, del_stat) /* void qmgr_transport_throttle(transport, dsn)
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;
/* DEL_STAT *del_stat; /* DSN *dsn;
/* /*
/* void qmgr_transport_unthrottle(transport) /* void qmgr_transport_unthrottle(transport)
/* QMGR_TRANSPORT *transport; /* QMGR_TRANSPORT *transport;

2
postfix/src/qmqpd/qmqpd_peer.c
View File

@@ -138,6 +138,8 @@ void qmqpd_peer_init(QMQPD_STATE *state)
msg_fatal("%s: cannot convert %s from string to binary: %s", msg_fatal("%s: cannot convert %s from string to binary: %s",
myname, state->addr, MAI_STRERROR(aierr)); myname, state->addr, MAI_STRERROR(aierr));
sa_len = res0->ai_addrlen; sa_len = res0->ai_addrlen;
if (sa_len > sizeof(ss))
sa_len = sizeof(ss);
memcpy((char *) sa, res0->ai_addr, sa_len); memcpy((char *) sa, res0->ai_addr, sa_len);
freeaddrinfo(res0); freeaddrinfo(res0);
} }

75
postfix/src/smtpd/smtpd.c
View File

@@ -584,7 +584,7 @@
/* client request is rejected by the "defer" restriction. /* client request is rejected by the "defer" restriction.
/* .IP "\fBinvalid_hostname_reject_code (501)\fR" /* .IP "\fBinvalid_hostname_reject_code (501)\fR"
/* The numerical Postfix SMTP server response code when the client /* The numerical Postfix SMTP server response code when the client
/* HELO or EHLO command parameter is rejected by the reject_invalid_hostname /* HELO or EHLO command parameter is rejected by the reject_invalid_helo_hostname
/* restriction. /* restriction.
/* .IP "\fBmaps_rbl_reject_code (554)\fR" /* .IP "\fBmaps_rbl_reject_code (554)\fR"
/* The numerical Postfix SMTP server response code when a remote SMTP /* The numerical Postfix SMTP server response code when a remote SMTP
@@ -592,7 +592,7 @@
/* reject_rhsbl_sender or reject_rhsbl_recipient restriction. /* reject_rhsbl_sender or reject_rhsbl_recipient restriction.
/* .IP "\fBnon_fqdn_reject_code (504)\fR" /* .IP "\fBnon_fqdn_reject_code (504)\fR"
/* The numerical Postfix SMTP server reply code when a client request /* The numerical Postfix SMTP server reply code when a client request
/* is rejected by the reject_non_fqdn_hostname, reject_non_fqdn_sender /* is rejected by the reject_non_fqdn_helo_hostname, reject_non_fqdn_sender
/* or reject_non_fqdn_recipient restriction. /* or reject_non_fqdn_recipient restriction.
/* .IP "\fBreject_code (554)\fR" /* .IP "\fBreject_code (554)\fR"
/* The numerical Postfix SMTP server response code when a remote SMTP /* The numerical Postfix SMTP server response code when a remote SMTP
@@ -608,11 +608,11 @@
/* .IP "\fBunknown_client_reject_code (450)\fR" /* .IP "\fBunknown_client_reject_code (450)\fR"
/* The numerical Postfix SMTP server response code when a client /* The numerical Postfix SMTP server response code when a client
/* without valid address <=> name mapping is rejected by the /* without valid address <=> name mapping is rejected by the
/* reject_unknown_client restriction. /* reject_unknown_client_hostname restriction.
/* .IP "\fBunknown_hostname_reject_code (450)\fR" /* .IP "\fBunknown_hostname_reject_code (450)\fR"
/* The numerical Postfix SMTP server response code when the hostname /* The numerical Postfix SMTP server response code when the hostname
/* specified with the HELO or EHLO command is rejected by the /* specified with the HELO or EHLO command is rejected by the
/* reject_unknown_hostname restriction. /* reject_unknown_helo_hostname restriction.
/* .PP /* .PP
/* Available in Postfix version 2.0 and later: /* Available in Postfix version 2.0 and later:
/* .IP "\fBdefault_rbl_reply (see 'postconf -d' output)\fR" /* .IP "\fBdefault_rbl_reply (see 'postconf -d' output)\fR"
@@ -1211,7 +1211,9 @@ static int ehlo_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
if (xclient_allowed) if (xclient_allowed)
ENQUEUE_FIX_REPLY(state, reply_buf, XCLIENT_CMD ENQUEUE_FIX_REPLY(state, reply_buf, XCLIENT_CMD
" " XCLIENT_NAME " " XCLIENT_ADDR " " XCLIENT_NAME " " XCLIENT_ADDR
" " XCLIENT_PROTO " " XCLIENT_HELO); " " XCLIENT_PROTO " " XCLIENT_HELO
" " XCLIENT_REVERSE_NAME
" " XCLIENT_FORWARD_NAME);
if ((discard_mask & EHLO_MASK_XFORWARD) == 0) if ((discard_mask & EHLO_MASK_XFORWARD) == 0)
if (xforward_allowed) if (xforward_allowed)
ENQUEUE_FIX_REPLY(state, reply_buf, XFORWARD_CMD ENQUEUE_FIX_REPLY(state, reply_buf, XFORWARD_CMD
@@ -2590,7 +2592,7 @@ static int xclient_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
const char *bare_value; const char *bare_value;
char *attr_name; char *attr_name;
int update_namaddr = 0; int update_namaddr = 0;
int peer_code; int name_status;
static NAME_CODE peer_codes[] = { static NAME_CODE peer_codes[] = {
XCLIENT_UNAVAILABLE, SMTPD_PEER_CODE_PERM, XCLIENT_UNAVAILABLE, SMTPD_PEER_CODE_PERM,
XCLIENT_TEMPORARY, SMTPD_PEER_CODE_TEMP, XCLIENT_TEMPORARY, SMTPD_PEER_CODE_TEMP,
@@ -2646,12 +2648,13 @@ static int xclient_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
printable(attr_value, '?'); printable(attr_value, '?');
/* /*
* NAME=substitute SMTP client hostname. Also updates the client * NAME=substitute SMTP client hostname (and reverse/forward name, in
* hostname lookup status code. * case of success). Also updates the client hostname lookup status
* code.
*/ */
if (STREQ(attr_name, XCLIENT_NAME)) { if (STREQ(attr_name, XCLIENT_NAME)) {
peer_code = name_code(peer_codes, NAME_CODE_FLAG_NONE, attr_value); name_status = name_code(peer_codes, NAME_CODE_FLAG_NONE, attr_value);
if (peer_code != SMTPD_PEER_CODE_OK) { if (name_status != SMTPD_PEER_CODE_OK) {
attr_value = CLIENT_NAME_UNKNOWN; attr_value = CLIENT_NAME_UNKNOWN;
} else { } else {
if (!valid_hostname(attr_value, DONT_GRIPE)) { if (!valid_hostname(attr_value, DONT_GRIPE)) {
@@ -2661,11 +2664,61 @@ static int xclient_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
return (-1); return (-1);
} }
} }
state->peer_code = peer_code; state->name_status = name_status;
UPDATE_STR(state->name, attr_value); UPDATE_STR(state->name, attr_value);
update_namaddr = 1; update_namaddr = 1;
if (name_status == SMTPD_PEER_CODE_OK) {
UPDATE_STR(state->reverse_name, attr_value);
state->reverse_name_status = name_status;
#ifdef FORWARD_CLIENT_NAME
UPDATE_STR(state->forward_name, attr_value);
state->forward_name_status = name_status;
#endif
}
} }
/*
* REVERSE_NAME=substitute SMTP client reverse hostname. Also updates
* the client reverse hostname lookup status code.
*/
if (STREQ(attr_name, XCLIENT_REVERSE_NAME)) {
name_status = name_code(peer_codes, NAME_CODE_FLAG_NONE, attr_value);
if (name_status != SMTPD_PEER_CODE_OK) {
attr_value = CLIENT_NAME_UNKNOWN;
} else {
if (!valid_hostname(attr_value, DONT_GRIPE)) {
state->error_mask |= MAIL_ERROR_PROTOCOL;
smtpd_chat_reply(state, "501 5.5.4 Bad %s syntax: %s",
XCLIENT_REVERSE_NAME, attr_value);
return (-1);
}
}
state->reverse_name_status = name_status;
UPDATE_STR(state->reverse_name, attr_value);
}
/*
* FORWARD_NAME=substitute SMTP client forward hostname. Also updates
* the client forward hostname lookup status code.
*/
#ifdef FORWARD_CLIENT_NAME
if (STREQ(attr_name, XCLIENT_FORWARD_NAME)) {
name_status = name_code(peer_codes, NAME_CODE_FLAG_NONE, attr_value);
if (name_status != SMTPD_PEER_CODE_OK) {
attr_value = CLIENT_NAME_UNKNOWN;
} else {
if (!valid_hostname(attr_value, DONT_GRIPE)) {
state->error_mask |= MAIL_ERROR_PROTOCOL;
smtpd_chat_reply(state, "501 5.5.4 Bad %s syntax: %s",
XCLIENT_FORWARD_NAME, attr_value);
return (-1);
}
}
state->forward_name_status = name_status;
UPDATE_STR(state->forward_name, attr_value);
}
#endif
/* /*
* ADDR=substitute SMTP client network address. * ADDR=substitute SMTP client network address.
*/ */

12
postfix/src/smtpd/smtpd.h
View File

@@ -74,12 +74,20 @@ typedef struct SMTPD_STATE {
VSTRING *addr_buf; /* internalized address buffer */ VSTRING *addr_buf; /* internalized address buffer */
char *service; /* for event rate control */ char *service; /* for event rate control */
time_t time; /* start of MAIL FROM transaction */ time_t time; /* start of MAIL FROM transaction */
char *name; /* client hostname */ char *name; /* verified client hostname */
char *reverse_name; /* unverified client hostname */
#ifdef FORWARD_CLIENT_NAME
char *forward_name; /* unverified client hostname */
#endif
char *addr; /* client host address string */ char *addr; /* client host address string */
char *namaddr; /* combined name and address */ char *namaddr; /* combined name and address */
char *rfc_addr; /* address for RFC 2821 */ char *rfc_addr; /* address for RFC 2821 */
struct sockaddr_storage sockaddr; /* binary client endpoint */ struct sockaddr_storage sockaddr; /* binary client endpoint */
int peer_code; /* 2=ok, 4=soft, 5=hard */ int name_status; /* 2=ok, 4=soft, 5=hard */
int reverse_name_status; /* 2=ok, 4=soft, 5=hard */
#ifdef FORWARD_CLIENT_NAME
int forward_name_status; /* 2=ok, 4=soft, 5=hard */
#endif
int error_count; /* reset after DOT */ int error_count; /* reset after DOT */
int error_mask; /* client errors */ int error_mask; /* client errors */
int notify_mask; /* what to report to postmaster */ int notify_mask; /* what to report to postmaster */

92
postfix/src/smtpd/smtpd_check.c
View File

@@ -915,6 +915,46 @@ static const char *check_mail_addr_find(SMTPD_STATE *state,
return (result); return (result);
} }
/* reject_unknown_reverse_name - fail if reverse client hostname is unknown */
static int reject_unknown_reverse_name(SMTPD_STATE *state)
{
char *myname = "reject_unknown_reverse_name";
if (msg_verbose)
msg_info("%s: %s", myname, state->reverse_name);
if (state->reverse_name_status != SMTPD_PEER_CODE_OK)
return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
state->reverse_name_status == SMTPD_PEER_CODE_PERM ?
var_unk_client_code : 450, "4.7.1",
"Client host rejected: cannot find your reverse hostname, [%s]",
state->addr));
return (SMTPD_CHECK_DUNNO);
}
#ifdef FORWARD_CLIENT_NAME
/* reject_unknown_forward_name - fail if reverse client hostname is unknown */
static int reject_unknown_forward_name(SMTPD_STATE *state)
{
char *myname = "reject_unknown_forward_name";
if (msg_verbose)
msg_info("%s: %s", myname, state->forward_name);
if (state->forward_name_status != SMTPD_PEER_CODE_OK)
return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
state->forward_name_status == SMTPD_PEER_CODE_PERM ?
var_unk_client_code : 450, "4.7.1",
"Client host rejected: cannot find your forward hostname, [%s]",
state->addr));
return (SMTPD_CHECK_DUNNO);
}
#endif
/* reject_unknown_client - fail if client hostname is unknown */ /* reject_unknown_client - fail if client hostname is unknown */
static int reject_unknown_client(SMTPD_STATE *state) static int reject_unknown_client(SMTPD_STATE *state)
@@ -924,9 +964,9 @@ static int reject_unknown_client(SMTPD_STATE *state)
if (msg_verbose) if (msg_verbose)
msg_info("%s: %s %s", myname, state->name, state->addr); msg_info("%s: %s %s", myname, state->name, state->addr);
if (strcasecmp(state->name, "unknown") == 0) if (state->name_status != SMTPD_PEER_CODE_OK)
return (smtpd_check_reject(state, MAIL_ERROR_POLICY, return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
state->peer_code == SMTPD_PEER_CODE_PERM ? state->name_status == SMTPD_PEER_CODE_PERM ?
var_unk_client_code : 450, "4.7.1", var_unk_client_code : 450, "4.7.1",
"Client host rejected: cannot find your hostname, [%s]", "Client host rejected: cannot find your hostname, [%s]",
state->addr)); state->addr));
@@ -2700,6 +2740,12 @@ static const char *smtpd_expand_lookup(const char *name, int unused_mode,
return (state->addr); return (state->addr);
} else if (STREQ(name, MAIL_ATTR_CLIENT_NAME)) { } else if (STREQ(name, MAIL_ATTR_CLIENT_NAME)) {
return (state->name); return (state->name);
} else if (STREQ(name, MAIL_ATTR_REVERSE_CLIENT_NAME)) {
return (state->reverse_name);
#ifdef FORWARD_CLIENT_NAME
} else if (STREQ(name, MAIL_ATTR_FORWARD_CLIENT_NAME)) {
return (state->forward_name);
#endif
} else if (STREQ(name, MAIL_ATTR_HELO_NAME)) { } else if (STREQ(name, MAIL_ATTR_HELO_NAME)) {
return (state->helo_name ? state->helo_name : ""); return (state->helo_name ? state->helo_name : "");
} else if (STREQN(name, MAIL_ATTR_SENDER, CONST_LEN(MAIL_ATTR_SENDER))) { } else if (STREQN(name, MAIL_ATTR_SENDER, CONST_LEN(MAIL_ATTR_SENDER))) {
@@ -3143,6 +3189,12 @@ static int check_policy_service(SMTPD_STATE *state, const char *server,
ATTR_TYPE_STR, MAIL_ATTR_PROTO_NAME, state->protocol, ATTR_TYPE_STR, MAIL_ATTR_PROTO_NAME, state->protocol,
ATTR_TYPE_STR, MAIL_ATTR_CLIENT_ADDR, state->addr, ATTR_TYPE_STR, MAIL_ATTR_CLIENT_ADDR, state->addr,
ATTR_TYPE_STR, MAIL_ATTR_CLIENT_NAME, state->name, ATTR_TYPE_STR, MAIL_ATTR_CLIENT_NAME, state->name,
ATTR_TYPE_STR, MAIL_ATTR_REVERSE_CLIENT_NAME,
state->reverse_name,
#ifdef FORWARD_CLIENT_NAME
ATTR_TYPE_STR, MAIL_ATTR_FORWARD_CLIENT_NAME,
state->forward_name,
#endif
ATTR_TYPE_STR, MAIL_ATTR_HELO_NAME, ATTR_TYPE_STR, MAIL_ATTR_HELO_NAME,
state->helo_name ? state->helo_name : "", state->helo_name ? state->helo_name : "",
ATTR_TYPE_STR, MAIL_ATTR_SENDER, ATTR_TYPE_STR, MAIL_ATTR_SENDER,
@@ -3356,8 +3408,15 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
/* /*
* Client name/address restrictions. * Client name/address restrictions.
*/ */
else if (strcasecmp(name, REJECT_UNKNOWN_CLIENT) == 0) { else if (strcasecmp(name, REJECT_UNKNOWN_CLIENT_HOSTNAME) == 0
|| strcasecmp(name, REJECT_UNKNOWN_CLIENT) == 0) {
status = reject_unknown_client(state); status = reject_unknown_client(state);
} else if (strcasecmp(name, REJECT_UNKNOWN_REVERSE_HOSTNAME) == 0) {
status = reject_unknown_reverse_name(state);
#ifdef FORWARD_CLIENT_NAME
} else if (strcasecmp(name, REJECT_UNKNOWN_FORWARD_HOSTNAME) == 0) {
status = reject_unknown_forward_name(state);
#endif
} else if (strcasecmp(name, PERMIT_INET_INTERFACES) == 0) { } else if (strcasecmp(name, PERMIT_INET_INTERFACES) == 0) {
status = permit_inet_interfaces(state); status = permit_inet_interfaces(state);
} else if (strcasecmp(name, PERMIT_MYNETWORKS) == 0) { } else if (strcasecmp(name, PERMIT_MYNETWORKS) == 0) {
@@ -3399,7 +3458,8 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
status = check_domain_access(state, *cpp, state->helo_name, status = check_domain_access(state, *cpp, state->helo_name,
FULL, &found, state->helo_name, FULL, &found, state->helo_name,
SMTPD_NAME_HELO, def_acl); SMTPD_NAME_HELO, def_acl);
} else if (strcasecmp(name, REJECT_INVALID_HOSTNAME) == 0) { } else if (strcasecmp(name, REJECT_INVALID_HELO_HOSTNAME) == 0
|| strcasecmp(name, REJECT_INVALID_HOSTNAME) == 0) {
if (state->helo_name) { if (state->helo_name) {
if (*state->helo_name != '[') if (*state->helo_name != '[')
status = reject_invalid_hostname(state, state->helo_name, status = reject_invalid_hostname(state, state->helo_name,
@@ -3408,7 +3468,8 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
status = reject_invalid_hostaddr(state, state->helo_name, status = reject_invalid_hostaddr(state, state->helo_name,
state->helo_name, SMTPD_NAME_HELO); state->helo_name, SMTPD_NAME_HELO);
} }
} else if (strcasecmp(name, REJECT_UNKNOWN_HOSTNAME) == 0) { } else if (strcasecmp(name, REJECT_UNKNOWN_HELO_HOSTNAME) == 0
|| strcasecmp(name, REJECT_UNKNOWN_HOSTNAME) == 0) {
if (state->helo_name) { if (state->helo_name) {
if (*state->helo_name != '[') if (*state->helo_name != '[')
status = reject_unknown_hostname(state, state->helo_name, status = reject_unknown_hostname(state, state->helo_name,
@@ -3440,7 +3501,8 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
SMTPD_NAME_HELO, def_acl); SMTPD_NAME_HELO, def_acl);
forbid_whitelist(state, name, status, state->helo_name); forbid_whitelist(state, name, status, state->helo_name);
} }
} else if (strcasecmp(name, REJECT_NON_FQDN_HOSTNAME) == 0) { } else if (strcasecmp(name, REJECT_NON_FQDN_HELO_HOSTNAME) == 0
||strcasecmp(name, REJECT_NON_FQDN_HOSTNAME) == 0) {
if (state->helo_name) { if (state->helo_name) {
if (*state->helo_name != '[') if (*state->helo_name != '[')
status = reject_non_fqdn_hostname(state, state->helo_name, status = reject_non_fqdn_hostname(state, state->helo_name,
@@ -4873,11 +4935,25 @@ int main(int argc, char **argv)
if (strcasecmp(args->argv[0], "client") == 0) { if (strcasecmp(args->argv[0], "client") == 0) {
state.where = "CONNECT"; state.where = "CONNECT";
UPDATE_STRING(state.name, args->argv[1]); UPDATE_STRING(state.name, args->argv[1]);
UPDATE_STRING(state.reverse_name, args->argv[1]);
#ifdef FORWARD_CLIENT_NAME
UPDATE_STRING(state.forward_name, args->argv[1]);
#endif
UPDATE_STRING(state.addr, args->argv[2]); UPDATE_STRING(state.addr, args->argv[2]);
if (args->argc == 4) if (args->argc == 4)
state.peer_code = atoi(args->argv[3]); state.name_status =
state.reverse_name_status =
#ifdef FORWARD_CLIENT_NAME
state.forward_name_status =
#endif
atoi(args->argv[3]);
else else
state.peer_code = SMTPD_PEER_CODE_OK; state.name_status =
state.reverse_name_status =
#ifdef FORWARD_CLIENT_NAME
state.forward_name_status =
#endif
SMTPD_PEER_CODE_OK;
if (state.namaddr) if (state.namaddr)
myfree(state.namaddr); myfree(state.namaddr);
state.namaddr = concatenate(state.name, "[", state.addr, state.namaddr = concatenate(state.name, "[", state.addr,

123
postfix/src/smtpd/smtpd_peer.c
View File

@@ -17,28 +17,69 @@
/* Where information is unavailable, the name and/or address /* Where information is unavailable, the name and/or address
/* are set to "unknown". /* are set to "unknown".
/* /*
/* This module uses the local name service via getaddrinfo()
/* and getnameinfo(). It does not query the DNS directly.
/*
/* smtpd_peer_init() updates the following fields: /* smtpd_peer_init() updates the following fields:
/* .IP name /* .IP name
/* The client hostname. An unknown name is represented by the /* The verified client hostname. This name is represented by
/* string "unknown". This includes names that could not be /* the string "unknown" when 1) the address->name lookup failed,
/* verified with forward DNS lookups. /* 2) the name->address mapping fails, or 3) the name->address
/* does not produce the client IP address.
/* .IP reverse_name
/* The unverified client hostname as found with address->name
/* lookup; it is not verified for consistency with the client
/* IP address result from name->address lookup.
/* .IP forward_name
/* The unverified client hostname as found with address->name
/* lookup followed by name->address lookup; it is not verified
/* for consistency with the result from address->name lookup.
/* For example, when the address->name lookup produces as
/* hostname an alias, the name->address lookup will produce
/* as hostname the expansion of that alias, so that the two
/* lookups produce different names.
/* .IP addr /* .IP addr
/* Printable representation of the client address. /* Printable representation of the client address.
/* .IP namaddr /* .IP namaddr
/* String of the form: "name[addr]". /* String of the form: "name[addr]".
/* .IP peer_code /* .IP rfc_addr
/* The peer_code result field specifies how the client name /* String of the form "ipv4addr" or "ipv6:ipv6addr" for use
/* in Received: message headers.
/* .IP name_status
/* The name_status result field specifies how the name
/* information should be interpreted: /* information should be interpreted:
/* .RS /* .RS
/* .IP 2 /* .IP 2
/* Both name lookup and name verification succeeded. /* The address->name lookup and name->address lookup produced
/* the client IP address.
/* .IP 4 /* .IP 4
/* The name lookup or name verification failed with a recoverable /* The address->name lookup or name->address lookup failed
/* error (no address->name mapping or no name->address mapping). /* with a recoverable error.
/* .IP 5 /* .IP 5
/* The name lookup or verification failed with an unrecoverable /* The address->name lookup or name->address lookup failed
/* error (no address->name mapping, bad hostname syntax, no /* with an unrecoverable error, or the result did not match
/* name->address mapping, client address not listed for hostname). /* the client IP address.
/* .RE
/* .IP reverse_name_status
/* The reverse_name_status result field specifies how the
/* reverse_name information should be interpreted:
/* .RS .IP 2
/* The address->name lookup succeeded.
/* .IP 4
/* The address->name lookup failed with a recoverable error.
/* .IP 5
/* The address->name lookup failed with an unrecoverable error.
/* .RE .IP forward_name_status
/* The forward_name_status result field specifies how the
/* forward_name information should be interpreted:
/* .RS .IP 2
/* The address->name and name->address lookup succeeded.
/* .IP 4
/* The address->name lookup or name->address failed with a
/* recoverable error.
/* .IP 5
/* The address->name lookup or name->address failed with an
/* unrecoverable error.
/* .RE /* .RE
/* .PP /* .PP
/* smtpd_peer_reset() releases memory allocated by smtpd_peer_init(). /* smtpd_peer_reset() releases memory allocated by smtpd_peer_init().
@@ -106,9 +147,17 @@ void smtpd_peer_init(SMTPD_STATE *state)
*/ */
if (errno == ECONNRESET || errno == ECONNABORTED) { if (errno == ECONNRESET || errno == ECONNABORTED) {
state->name = mystrdup(CLIENT_NAME_UNKNOWN); state->name = mystrdup(CLIENT_NAME_UNKNOWN);
state->reverse_name = mystrdup(CLIENT_NAME_UNKNOWN);
#ifdef FORWARD_CLIENT_NAME
state->forward_name = mystrdup(CLIENT_NAME_UNKNOWN);
#endif
state->addr = mystrdup(CLIENT_ADDR_UNKNOWN); state->addr = mystrdup(CLIENT_ADDR_UNKNOWN);
state->rfc_addr = mystrdup(CLIENT_ADDR_UNKNOWN); state->rfc_addr = mystrdup(CLIENT_ADDR_UNKNOWN);
state->peer_code = SMTPD_PEER_CODE_PERM; state->name_status = SMTPD_PEER_CODE_PERM;
state->reverse_name_status = SMTPD_PEER_CODE_PERM;
#ifdef FORWARD_CLIENT_NAME
state->forward_name_status = SMTPD_PEER_CODE_PERM;
#endif
} }
/* /*
@@ -153,6 +202,8 @@ void smtpd_peer_init(SMTPD_STATE *state)
msg_fatal("%s: cannot convert %s from string to binary: %s", msg_fatal("%s: cannot convert %s from string to binary: %s",
myname, state->addr, MAI_STRERROR(aierr)); myname, state->addr, MAI_STRERROR(aierr));
sa_len = res0->ai_addrlen; sa_len = res0->ai_addrlen;
if (sa_len > sizeof(state->sockaddr))
sa_len = sizeof(state->sockaddr);
memcpy((char *) sa, res0->ai_addr, sa_len); memcpy((char *) sa, res0->ai_addr, sa_len);
freeaddrinfo(res0); /* 200412 */ freeaddrinfo(res0); /* 200412 */
} }
@@ -197,20 +248,32 @@ void smtpd_peer_init(SMTPD_STATE *state)
#define REJECT_PEER_NAME(state, code) { \ #define REJECT_PEER_NAME(state, code) { \
myfree(state->name); \ myfree(state->name); \
state->name = mystrdup(CLIENT_NAME_UNKNOWN); \ state->name = mystrdup(CLIENT_NAME_UNKNOWN); \
state->peer_code = code; \ state->name_status = code; \
} }
if ((aierr = sockaddr_to_hostname(sa, sa_len, &client_name, if ((aierr = sockaddr_to_hostname(sa, sa_len, &client_name,
(MAI_SERVNAME_STR *) 0, 0)) != 0) { (MAI_SERVNAME_STR *) 0, 0)) != 0) {
state->name = mystrdup(CLIENT_NAME_UNKNOWN); state->name = mystrdup(CLIENT_NAME_UNKNOWN);
state->peer_code = (TEMP_AI_ERROR(aierr) ? state->reverse_name = mystrdup(CLIENT_NAME_UNKNOWN);
SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM); #ifdef FORWARD_CLIENT_NAME
state->forward_name = mystrdup(CLIENT_NAME_UNKNOWN);
#endif
state->name_status = (TEMP_AI_ERROR(aierr) ?
SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM);
state->reverse_name_status = (TEMP_AI_ERROR(aierr) ?
SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM);
#ifdef FORWARD_CLIENT_NAME
state->forward_name_status = (TEMP_AI_ERROR(aierr) ?
SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM);
#endif
} else { } else {
struct addrinfo *res0; struct addrinfo *res0;
struct addrinfo *res; struct addrinfo *res;
state->name = mystrdup(client_name.buf); state->name = mystrdup(client_name.buf);
state->peer_code = SMTPD_PEER_CODE_OK; state->reverse_name = mystrdup(client_name.buf);
state->name_status = SMTPD_PEER_CODE_OK;
state->reverse_name_status = SMTPD_PEER_CODE_OK;
/* /*
* Reject the hostname if it does not list the peer address. * Reject the hostname if it does not list the peer address.
@@ -222,9 +285,23 @@ void smtpd_peer_init(SMTPD_STATE *state)
if (aierr) { if (aierr) {
msg_warn("%s: hostname %s verification failed: %s", msg_warn("%s: hostname %s verification failed: %s",
state->addr, state->name, MAI_STRERROR(aierr)); state->addr, state->name, MAI_STRERROR(aierr));
#ifdef FORWARD_CLIENT_NAME
state->forward_name = mystrdup(CLIENT_NAME_UNKNOWN);
state->forward_name_status = (TEMP_AI_ERROR(aierr) ?
SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM);
#endif
REJECT_PEER_NAME(state, (TEMP_AI_ERROR(aierr) ? REJECT_PEER_NAME(state, (TEMP_AI_ERROR(aierr) ?
SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM)); SMTPD_PEER_CODE_TEMP : SMTPD_PEER_CODE_PERM));
} else { } else {
#ifdef FORWARD_CLIENT_NAME
if (res0) {
state->forward_name = mystrdup(res0->ai_canonname);
state->forward_name_status = SMTPD_PEER_CODE_OK;
} else {
state->forward_name = mystrdup(CLIENT_NAME_UNKNOWN);
state->forward_name_status = SMTPD_PEER_CODE_PERM;
}
#endif
for (res = res0; /* void */ ; res = res->ai_next) { for (res = res0; /* void */ ; res = res->ai_next) {
if (res == 0) { if (res == 0) {
msg_warn("%s: address not listed for hostname %s", msg_warn("%s: address not listed for hostname %s",
@@ -251,9 +328,17 @@ void smtpd_peer_init(SMTPD_STATE *state)
*/ */
else { else {
state->name = mystrdup("localhost"); state->name = mystrdup("localhost");
state->reverse_name = mystrdup("localhost");
#ifdef FORWARD_CLIENT_NAME
state->forward_name = mystrdup("localhost");
#endif
state->addr = mystrdup("127.0.0.1"); /* XXX bogus. */ state->addr = mystrdup("127.0.0.1"); /* XXX bogus. */
state->rfc_addr = mystrdup("127.0.0.1");/* XXX bogus. */ state->rfc_addr = mystrdup("127.0.0.1");/* XXX bogus. */
state->peer_code = SMTPD_PEER_CODE_OK; state->name_status = SMTPD_PEER_CODE_OK;
state->reverse_name_status = SMTPD_PEER_CODE_OK;
#ifdef FORWARD_CLIENT_NAME
state->forward_name_status = SMTPD_PEER_CODE_OK;
#endif
} }
/* /*
@@ -268,6 +353,10 @@ void smtpd_peer_init(SMTPD_STATE *state)
void smtpd_peer_reset(SMTPD_STATE *state) void smtpd_peer_reset(SMTPD_STATE *state)
{ {
myfree(state->name); myfree(state->name);
myfree(state->reverse_name);
#ifdef FORWARD_CLIENT_NAME
myfree(state->forward_name);
#endif
myfree(state->addr); myfree(state->addr);
myfree(state->namaddr); myfree(state->namaddr);
myfree(state->rfc_addr); myfree(state->rfc_addr);

3
postfix/src/smtpstone/qmqp-source.c
View File

@@ -543,6 +543,9 @@ int main(int argc, char **argv)
msg_fatal("%s: %s", argv[optind], MAI_STRERROR(aierr)); msg_fatal("%s: %s", argv[optind], MAI_STRERROR(aierr));
myfree(buf); myfree(buf);
sa = (struct sockaddr *) & ss; sa = (struct sockaddr *) & ss;
if (res->ai_addrlen > sizeof(ss))
msg_fatal("address length %d > buffer length %d",
(int) res->ai_addrlen, (int) sizeof(ss));
memcpy((char *) sa, res->ai_addr, res->ai_addrlen); memcpy((char *) sa, res->ai_addr, res->ai_addrlen);
sa_length = res->ai_addrlen; sa_length = res->ai_addrlen;
#ifdef HAS_SA_LEN #ifdef HAS_SA_LEN

3
postfix/src/smtpstone/smtp-source.c
View File

@@ -924,6 +924,9 @@ int main(int argc, char **argv)
msg_fatal("%s: %s", argv[optind], MAI_STRERROR(aierr)); msg_fatal("%s: %s", argv[optind], MAI_STRERROR(aierr));
myfree(buf); myfree(buf);
sa = (struct sockaddr *) & ss; sa = (struct sockaddr *) & ss;
if (res->ai_addrlen > sizeof(ss))
msg_fatal("address length %d > buffer length %d",
(int) res->ai_addrlen, (int) sizeof(ss));
memcpy((char *) sa, res->ai_addr, res->ai_addrlen); memcpy((char *) sa, res->ai_addr, res->ai_addrlen);
sa_length = res->ai_addrlen; sa_length = res->ai_addrlen;
#ifdef HAS_SA_LEN #ifdef HAS_SA_LEN

2
postfix/src/util/vstream.c
View File

@@ -65,7 +65,7 @@
/* /*
/* ssize_t vstream_fwrite(stream, buf, len) /* ssize_t vstream_fwrite(stream, buf, len)
/* VSTREAM *stream; /* VSTREAM *stream;
/* char *buf; /* const char *buf;
/* ssize_t len; /* ssize_t len;
/* /*
/* void vstream_control(stream, name, ...) /* void vstream_control(stream, name, ...)

2
postfix/src/util/vstring.c
View File

@@ -285,6 +285,8 @@ static void vstring_extend(VBUF *bp, ssize_t incr)
* *
* The length overflow tests here and in vstring_alloc() should protect us * The length overflow tests here and in vstring_alloc() should protect us
* against all length overflow problems within vstring library routines. * against all length overflow problems within vstring library routines.
* (The tests are redundant as long as mymalloc() and myrealloc() reject
* negative length parameters).
*/ */
new_len = bp->len + (bp->len > incr ? bp->len : incr); new_len = bp->len + (bp->len > incr ? bp->len : incr);
if (new_len < 0) if (new_len < 0)