diff options
Diffstat (limited to '')
| -rw-r--r-- | src/trivial-rewrite/resolve.c | 2 | ||||
| -rw-r--r-- | src/trivial-rewrite/trivial-rewrite.c | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/trivial-rewrite/resolve.c b/src/trivial-rewrite/resolve.c index 40e6aa5..df761e7 100644 --- a/src/trivial-rewrite/resolve.c +++ b/src/trivial-rewrite/resolve.c @@ -427,7 +427,7 @@ static void resolve_addr(RES_CONTEXT *rp, char *sender, char *addr, if (!valid_mailhost_literal(rcpt_domain, DONT_GRIPE)) *flags |= RESOLVE_FLAG_ERROR; } else if (var_smtputf8_enable - && valid_utf8_string(STR(nextrcpt), LEN(nextrcpt)) == 0) { + && valid_utf8_stringz(STR(nextrcpt)) == 0) { *flags |= RESOLVE_FLAG_ERROR; } else if (!valid_utf8_hostname(var_smtputf8_enable, rcpt_domain, DONT_GRIPE)) { diff --git a/src/trivial-rewrite/trivial-rewrite.c b/src/trivial-rewrite/trivial-rewrite.c index 675af80..bb8da09 100644 --- a/src/trivial-rewrite/trivial-rewrite.c +++ b/src/trivial-rewrite/trivial-rewrite.c @@ -122,9 +122,10 @@ /* .PP /* Available in Postfix 2.2 and later: /* .IP "\fBremote_header_rewrite_domain (empty)\fR" -/* Don't rewrite message headers from remote clients at all when -/* this parameter is empty; otherwise, rewrite message headers and -/* append the specified domain name to incomplete addresses. +/* Rewrite or add message headers in mail from remote clients if +/* the remote_header_rewrite_domain parameter value is non-empty, +/* updating incomplete addresses with the domain specified in the +/* remote_header_rewrite_domain parameter, and adding missing headers. /* ROUTING CONTROLS /* .ad /* .fi @@ -141,10 +142,12 @@ /* final delivery to domains listed with $virtual_mailbox_domains. /* .IP "\fBrelay_transport (relay)\fR" /* The default mail delivery transport and next-hop destination for -/* remote delivery to domains listed with $relay_domains. +/* the relay domain address class: recipient domains that match +/* $relay_domains. /* .IP "\fBdefault_transport (smtp)\fR" /* The default mail delivery transport and next-hop destination for -/* destinations that do not match $mydestination, $inet_interfaces, +/* the default domain class: recipient domains that do not match +/* $mydestination, $inet_interfaces, /* $proxy_interfaces, $virtual_alias_domains, $virtual_mailbox_domains, /* or $relay_domains. /* .IP "\fBparent_domain_matches_subdomains (see 'postconf -d' output)\fR" @@ -152,8 +155,8 @@ /* matches subdomains of example.com, /* instead of requiring an explicit ".example.com" pattern. /* .IP "\fBrelayhost (empty)\fR" -/* The next-hop destination(s) for non-local mail; overrides non-local -/* domains in recipient addresses. +/* The next-hop destination(s) for non-local mail; takes precedence +/* over non-local domains in recipient addresses. /* .IP "\fBtransport_maps (empty)\fR" /* Optional lookup tables with mappings from recipient address to /* (message delivery transport, next-hop destination). |