From: Wietse Venema Date: Sun, 19 Dec 2004 05:00:00 +0000 (-0500) Subject: postfix-2.2-20041219 X-Git-Tag: v2.2.0-RC1~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3415cc07d46eb78938cc99e7a86bc2fee4f1bba1;p=thirdparty%2Fpostfix.git postfix-2.2-20041219 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index a7256d330..f986ee5c6 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -9973,9 +9973,9 @@ Apologies for any names omitted. Feature: selective suppression of SMTP extensions (pipelining, starttls, auth, etc.); this is useful to work around broken clients or servers. Specify a list of EHLO keywords with - the smtp(d)_disable_ehlo_keywords parameters, or specify + the smtp(d)_discard_ehlo_keywords parameters, or specify one or more lookup tables, indexed by remote network address, - with the smtp(d)_disable_ehlo_keyword_address_maps parameters. + with the smtp(d)_discard_ehlo_keyword_address_maps parameters. EHLO keyword lists are case insensitive. Files: util/name_mask.[hc], global/ehlo_mask.[hc], smtpd/smtpd.c, smtp/smtp.c, smtp/smtp_proto.c. diff --git a/postfix/README_FILES/BACKSCATTER_README b/postfix/README_FILES/BACKSCATTER_README index bee27caf9..b13457e48 100644 --- a/postfix/README_FILES/BACKSCATTER_README +++ b/postfix/README_FILES/BACKSCATTER_README @@ -131,8 +131,9 @@ This is of course practical only when you have very few systems that send HELO commands like this, and when you never have to send mail to a user on such a host. -An alternative would be to remove the hostname with address masquerading, as -described in the ADDRESS_REWRITING_README document. +An alternative would be to remove the hostname from "hostname.porcupine.org" +with address masquerading, as described in the ADDRESS_REWRITING_README +document. BBlloocckkiinngg bbaacckkssccaatttteerr mmaaiill wwiitthh ffoorrggeedd sseennddeerr iinnffoorrmmaattiioonn @@ -195,5 +196,6 @@ http://www.t29.dk/antiantivirus.txt. A plea to virus or spam scanner operators: please do not make the problem worse by sending return mail to forged sender addresses. You're only harassing -innocent people. +innocent people. If you must return mail to the purported sender, please return +the full message headers, so that the sender can defend against forgeries. diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index 5b4095ec8..aa1c54149 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -10,13 +10,14 @@ issued for snapshot releases. Major changes with snapshot Postfix-2.2-20041218 ================================================ -Fine control for SMTP inter-operability problems. You can now -selectively turn off SMTP extensions (pipelining, starttls, auth, -etc.), to work around specific broken clients or servers. Specify -a list of EHLO keywords with the smtp(d)_disable_ehlo_keywords -parameters, or specify one or more lookup tables, indexed by remote -network address, with the smtp(d)_disable_ehlo_keyword_address_maps -parameters. The EHLO keywords lists are case insensitive. +Fine control for SMTP inter-operability problems, by discarding +keywords sent or received with the EHLO handshake. Typically one +would discard "pipelining", "starttls", or "auth". Specify a list +of EHLO keywords with the smtp(d)_discard_ehlo_keywords parameters, +or specify one or more lookup tables, indexed by remote network +address, with the smtp(d)_discard_ehlo_keyword_address_maps +parameters. Note: this only discards words from the EHLO conversation; +it does not turn off the actual features in the SMTP server. More client attributes for delivery to command with the local(8) and pipe(8) delivery agents: client_hostname, client_address, diff --git a/postfix/html/BACKSCATTER_README.html b/postfix/html/BACKSCATTER_README.html index 0af36f398..268921926 100644 --- a/postfix/html/BACKSCATTER_README.html +++ b/postfix/html/BACKSCATTER_README.html @@ -209,7 +209,8 @@ mapping translates this temporary address into user@porcupine.org. that send HELO commands like this, and when you never have to send mail to a user on such a host.

-

An alternative would be to remove the hostname with address +

An alternative would be to remove the hostname from +"hostname.porcupine.org" with address masquerading, as described in the ADDRESS_REWRITING_README document.

@@ -295,7 +296,9 @@ or http://www.t29.dk/antiantivirus

A plea to virus or spam scanner operators: please do not make the problem worse by sending return mail to forged sender addresses. -You're only harassing innocent people.

+You're only harassing innocent people. If you must return mail to +the purported sender, please return the full message headers, so +that the sender can defend against forgeries.

diff --git a/postfix/html/local.8.html b/postfix/html/local.8.html index 5cf0428c7..23b1e2e6b 100644 --- a/postfix/html/local.8.html +++ b/postfix/html/local.8.html @@ -203,7 +203,7 @@ LOCAL(8) LOCAL(8) SENDER The entire sender address. Additional remote client information is made available via - the following pseudo variables: + the following environment variables: CLIENT_ADDRESS Remote client network address. Available as of diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index feffbb610..e771364c9 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -5679,7 +5679,7 @@ into concurrency per recipient.

-
smtp_disable_ehlo_keyword_address_maps +
smtp_discard_ehlo_keyword_address_maps (default: empty)

Lookup tables, indexed by the remote SMTP server address, with @@ -5690,13 +5690,13 @@ from a remote SMTP server.

-
smtp_disable_ehlo_keywords +
smtp_discard_ehlo_keywords (default: empty)

A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response -from a remote SMTP server. Use the smtp_disable_ehlo_keyword_address_maps -feature to disable EHLO keywords selectively.

+from a remote SMTP server. Use the smtp_discard_ehlo_keyword_address_maps +feature to discard EHLO keywords selectively.

@@ -5721,7 +5721,7 @@ client, for example: 
   /etc/postfix/master.cf:
-        mysmtp ... smtp -o smtp_helo_name">smtp_helo_name=foo.bar.com
+        mysmtp ... smtp -o smtp_helo_name=foo.bar.com

@@ -6726,7 +6726,7 @@ is being rejected. -

smtpd_disable_ehlo_keyword_address_maps +
smtpd_discard_ehlo_keyword_address_maps (default: empty)

Lookup tables, indexed by the remote SMTP client address, with @@ -6737,13 +6737,13 @@ to a remote SMTP client.

-
smtpd_disable_ehlo_keywords +
smtpd_discard_ehlo_keywords (default: empty)

A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response -to a remote SMTP client. Use the smtpd_disable_ehlo_keyword_address_maps -feature to disable EHLO keywords selectively.

+to a remote SMTP client. Use the smtpd_discard_ehlo_keyword_address_maps +feature to discard EHLO keywords selectively.

diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html index 6fd034d7c..2d764607d 100644 --- a/postfix/html/smtp.8.html +++ b/postfix/html/smtp.8.html @@ -136,14 +136,14 @@ SMTP(8) SMTP(8) Available in Postfix version 2.2 and later: - smtp_disable_ehlo_keyword_address_maps (empty) + smtp_discard_ehlo_keyword_address_maps (empty) Lookup tables, indexed by the remote SMTP server address, with case insensitive lists of EHLO key- words (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response from a remote SMTP server. - smtp_disable_ehlo_keywords (empty) + smtp_discard_ehlo_keywords (empty) A case insensitive list of EHLO keywords (pipelin- ing, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response from a remote SMTP diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html index 567313e84..bc6fb70e4 100644 --- a/postfix/html/smtpd.8.html +++ b/postfix/html/smtpd.8.html @@ -105,14 +105,14 @@ SMTPD(8) SMTPD(8) Available in Postfix version 2.2 and later: - smtpd_disable_ehlo_keyword_address_maps (empty) + smtpd_discard_ehlo_keyword_address_maps (empty) Lookup tables, indexed by the remote SMTP client address, with case insensitive lists of EHLO key- words (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response to a remote SMTP client. - smtpd_disable_ehlo_keywords (empty) + smtpd_discard_ehlo_keywords (empty) A case insensitive list of EHLO keywords (pipelin- ing, starttls, auth, etc.) that the SMTP server will not send in the EHLO response to a remote SMTP diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 9be873ba1..3e1559eed 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -3048,16 +3048,16 @@ the entry in the master.cf file. Setting this parameter to a value of 1 changes the meaning of smtp_destination_concurrency_limit from concurrency per domain into concurrency per recipient. -.SH smtp_disable_ehlo_keyword_address_maps (default: empty) +.SH smtp_discard_ehlo_keyword_address_maps (default: empty) Lookup tables, indexed by the remote SMTP server address, with case insensitive lists of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response from a remote SMTP server. -.SH smtp_disable_ehlo_keywords (default: empty) +.SH smtp_discard_ehlo_keywords (default: empty) A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response -from a remote SMTP server. Use the smtp_disable_ehlo_keyword_address_maps -feature to disable EHLO keywords selectively. +from a remote SMTP server. Use the smtp_discard_ehlo_keyword_address_maps +feature to discard EHLO keywords selectively. .SH smtp_helo_name (default: $myhostname) The hostname to send in the SMTP EHLO or HELO command. .PP @@ -3654,16 +3654,16 @@ The default setting has one major benefit: it allows Postfix to log recipient address information when rejecting a client name/address or sender address, so that it is possible to find out whose mail is being rejected. -.SH smtpd_disable_ehlo_keyword_address_maps (default: empty) +.SH smtpd_discard_ehlo_keyword_address_maps (default: empty) Lookup tables, indexed by the remote SMTP client address, with case insensitive lists of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response to a remote SMTP client. -.SH smtpd_disable_ehlo_keywords (default: empty) +.SH smtpd_discard_ehlo_keywords (default: empty) A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response -to a remote SMTP client. Use the smtpd_disable_ehlo_keyword_address_maps -feature to disable EHLO keywords selectively. +to a remote SMTP client. Use the smtpd_discard_ehlo_keyword_address_maps +feature to discard EHLO keywords selectively. .SH smtpd_end_of_data_restrictions (default: empty) Optional access restrictions that the Postfix SMTP server applies in the context of the SMTP END-OF-DATA command. diff --git a/postfix/man/man8/local.8 b/postfix/man/man8/local.8 index 4816bf5be..8eeb39e9a 100644 --- a/postfix/man/man8/local.8 +++ b/postfix/man/man8/local.8 @@ -212,7 +212,7 @@ The entire recipient address. The entire sender address. .PP Additional remote client information is made available via -the following pseudo variables: +the following environment variables: .IP \fBCLIENT_ADDRESS\fR Remote client network address. Available as of Postfix 2.2. .IP \fBCLIENT_HELO\fR diff --git a/postfix/man/man8/smtp.8 b/postfix/man/man8/smtp.8 index 0e6c2a7a8..806325d56 100644 --- a/postfix/man/man8/smtp.8 +++ b/postfix/man/man8/smtp.8 @@ -130,12 +130,12 @@ Skip SMTP servers that greet with a 4XX status code (go away, try again later). .PP Available in Postfix version 2.2 and later: -.IP "\fBsmtp_disable_ehlo_keyword_address_maps (empty)\fR" +.IP "\fBsmtp_discard_ehlo_keyword_address_maps (empty)\fR" Lookup tables, indexed by the remote SMTP server address, with case insensitive lists of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response from a remote SMTP server. -.IP "\fBsmtp_disable_ehlo_keywords (empty)\fR" +.IP "\fBsmtp_discard_ehlo_keywords (empty)\fR" A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response from a remote SMTP server. diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8 index e33616534..bc774a3ff 100644 --- a/postfix/man/man8/smtpd.8 +++ b/postfix/man/man8/smtpd.8 @@ -104,12 +104,12 @@ access restriction is specified. What SMTP clients Postfix will not offer AUTH support to. .PP Available in Postfix version 2.2 and later: -.IP "\fBsmtpd_disable_ehlo_keyword_address_maps (empty)\fR" +.IP "\fBsmtpd_discard_ehlo_keyword_address_maps (empty)\fR" Lookup tables, indexed by the remote SMTP client address, with case insensitive lists of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response to a remote SMTP client. -.IP "\fBsmtpd_disable_ehlo_keywords (empty)\fR" +.IP "\fBsmtpd_discard_ehlo_keywords (empty)\fR" A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response to a remote SMTP client. diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink index 848ecaed5..86fce3dcb 100755 --- a/postfix/mantools/postlink +++ b/postfix/mantools/postlink @@ -330,9 +330,8 @@ while (<>) { s;\bsmtp_destination_recip[-]*\n* *[]*ient_limit\b;$&;g; s;\bvir[-]*\n*[ ]*tual_destination_concurrency_limit\b;$&;g; s;\bvir[-]*\n*[ ]*tual_destination_recip[-]*\n* *[]*ient_limit\b;$&;g; - s;\bsmtp_disable_ehlo_keyword_address_maps\b;$&;g; - s;\bsmtp_disable_ehlo_keywords\b;$&;g; - s;\bsmtp_helo_name\b;$&;g; + s;\bsmtp_discard_ehlo_keyword_address_maps\b;$&;g; + s;\bsmtp_discard_ehlo_keywords\b;$&;g; s;\bsmtp_helo_name\b;$&;g; s;\bsmtp_helo_timeout\b;$&;g; s;\bsmtp_host_lookup\b;$&;g; @@ -369,8 +368,8 @@ while (<>) { s;\bsmtpd_client_restrictions\b;$&;g; s;\bsmtpd_data_restrictions\b;$&;g; s;\bsmtpd_delay_reject\b;$&;g; - s;\bsmtpd_disable_ehlo_keyword_address_maps\b;$&;g; - s;\bsmtpd_disable_ehlo_keywords\b;$&;g; + s;\bsmtpd_discard_ehlo_keyword_address_maps\b;$&;g; + s;\bsmtpd_discard_ehlo_keywords\b;$&;g; s;\bsmtpd_end_of_data_restrictions\b;$&;g; s;\bsmtpd_error_sleep_time\b;$&;g; s;\bsmtpd_etrn_restrictions\b;$&;g; diff --git a/postfix/proto/BACKSCATTER_README.html b/postfix/proto/BACKSCATTER_README.html index 258d85fde..6c0bb061d 100644 --- a/postfix/proto/BACKSCATTER_README.html +++ b/postfix/proto/BACKSCATTER_README.html @@ -209,7 +209,8 @@ mapping translates this temporary address into user@porcupine.org. that send HELO commands like this, and when you never have to send mail to a user on such a host.

-

An alternative would be to remove the hostname with address +

An alternative would be to remove the hostname from +"hostname.porcupine.org" with address masquerading, as described in the ADDRESS_REWRITING_README document.

@@ -295,7 +296,9 @@ or http://www.t29.dk/antiantivirus.txt.

A plea to virus or spam scanner operators: please do not make the problem worse by sending return mail to forged sender addresses. -You're only harassing innocent people.

+You're only harassing innocent people. If you must return mail to +the purported sender, please return the full message headers, so +that the sender can defend against forgeries.

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 888419d94..f1134870c 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -7259,28 +7259,28 @@ remote domains. Available before Postfix version 2.0. With Postfix 2.1 and later, this is replaced by separate controls: virtual_alias_domains and virtual_alias_maps.

-%PARAM smtp_disable_ehlo_keywords +%PARAM smtp_discard_ehlo_keywords

A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response -from a remote SMTP server. Use the smtp_disable_ehlo_keyword_address_maps -feature to disable EHLO keywords selectively.

+from a remote SMTP server. Use the smtp_discard_ehlo_keyword_address_maps +feature to discard EHLO keywords selectively.

-%PARAM smtpd_disable_ehlo_keywords +%PARAM smtpd_discard_ehlo_keywords

A case insensitive list of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP server will not send in the EHLO response -to a remote SMTP client. Use the smtpd_disable_ehlo_keyword_address_maps -feature to disable EHLO keywords selectively.

+to a remote SMTP client. Use the smtpd_discard_ehlo_keyword_address_maps +feature to discard EHLO keywords selectively.

-%PARAM smtp_disable_ehlo_keyword_address_maps +%PARAM smtp_discard_ehlo_keyword_address_maps

Lookup tables, indexed by the remote SMTP server address, with case insensitive lists of EHLO keywords (pipelining, starttls, auth, etc.) that the SMTP client will ignore in the EHLO response from a remote SMTP server.

-%PARAM smtpd_disable_ehlo_keyword_address_maps +%PARAM smtpd_discard_ehlo_keyword_address_maps

Lookup tables, indexed by the remote SMTP client address, with case insensitive lists of EHLO keywords (pipelining, starttls, diff --git a/postfix/src/global/ehlo_mask.c b/postfix/src/global/ehlo_mask.c index ea42bf7c0..6ae567346 100644 --- a/postfix/src/global/ehlo_mask.c +++ b/postfix/src/global/ehlo_mask.c @@ -96,8 +96,7 @@ const char *str_ehlo_mask(int mask_bits) * We don't allow non-existent bits. Doing so makes no sense at this * time. */ - return (str_name_mask_opt("ehlo bitmask", ehlo_mask_table, - mask_bits, NAME_MASK_NONE)); + return (str_name_mask("ehlo bitmask", ehlo_mask_table, mask_bits)); } #ifdef TEST diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h index 76aadc51b..14d1f0dd2 100644 --- a/postfix/src/global/mail_params.h +++ b/postfix/src/global/mail_params.h @@ -2117,19 +2117,19 @@ extern char *var_local_rwr_clients; /* * EHLO keyword filter. */ -#define VAR_SMTPD_EHLO_DIS_WORDS "smtpd_disable_ehlo_keywords" +#define VAR_SMTPD_EHLO_DIS_WORDS "smtpd_discard_ehlo_keywords" #define DEF_SMTPD_EHLO_DIS_WORDS "" extern char *var_smtpd_ehlo_dis_words; -#define VAR_SMTPD_EHLO_DIS_MAPS "smtpd_disable_ehlo_keyword_address_maps" +#define VAR_SMTPD_EHLO_DIS_MAPS "smtpd_discard_ehlo_keyword_address_maps" #define DEF_SMTPD_EHLO_DIS_MAPS "" extern char *var_smtpd_ehlo_dis_maps; -#define VAR_SMTP_EHLO_DIS_WORDS "smtp_disable_ehlo_keywords" +#define VAR_SMTP_EHLO_DIS_WORDS "smtp_discard_ehlo_keywords" #define DEF_SMTP_EHLO_DIS_WORDS "" extern char *var_smtp_ehlo_dis_words; -#define VAR_SMTP_EHLO_DIS_MAPS "smtp_disable_ehlo_keyword_address_maps" +#define VAR_SMTP_EHLO_DIS_MAPS "smtp_discard_ehlo_keyword_address_maps" #define DEF_SMTP_EHLO_DIS_MAPS "" extern char *var_smtp_ehlo_dis_maps; diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 395e08a9f..bca7472cd 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ -#define MAIL_RELEASE_DATE "20041218" +#define MAIL_RELEASE_DATE "20041219" #define MAIL_VERSION_NUMBER "2.2" #define VAR_MAIL_VERSION "mail_version" diff --git a/postfix/src/local/local.c b/postfix/src/local/local.c index 19465075d..086f502be 100644 --- a/postfix/src/local/local.c +++ b/postfix/src/local/local.c @@ -198,7 +198,7 @@ /* The entire sender address. /* .PP /* Additional remote client information is made available via -/* the following pseudo variables: +/* the following environment variables: /* .IP \fBCLIENT_ADDRESS\fR /* Remote client network address. Available as of Postfix 2.2. /* .IP \fBCLIENT_HELO\fR diff --git a/postfix/src/master/master.c b/postfix/src/master/master.c index e1b21ab13..70c3c2fb1 100644 --- a/postfix/src/master/master.c +++ b/postfix/src/master/master.c @@ -385,7 +385,8 @@ int main(int argc, char **argv) master_config(); master_sigsetup(); master_flow_init(); - msg_info("daemon started -- version %s", var_mail_version); + msg_info("daemon started -- version %s, configuration %s", + var_mail_version, var_config_dir); /* * Process events. The event handler will execute the read/write/timer diff --git a/postfix/src/smtp/smtp.c b/postfix/src/smtp/smtp.c index 11d6d5031..997f80f32 100644 --- a/postfix/src/smtp/smtp.c +++ b/postfix/src/smtp/smtp.c @@ -112,12 +112,12 @@ /* again later). /* .PP /* Available in Postfix version 2.2 and later: -/* .IP "\fBsmtp_disable_ehlo_keyword_address_maps (empty)\fR" +/* .IP "\fBsmtp_discard_ehlo_keyword_address_maps (empty)\fR" /* Lookup tables, indexed by the remote SMTP server address, with /* case insensitive lists of EHLO keywords (pipelining, starttls, /* auth, etc.) that the SMTP client will ignore in the EHLO response /* from a remote SMTP server. -/* .IP "\fBsmtp_disable_ehlo_keywords (empty)\fR" +/* .IP "\fBsmtp_discard_ehlo_keywords (empty)\fR" /* A case insensitive list of EHLO keywords (pipelining, starttls, /* auth, etc.) that the SMTP client will ignore in the EHLO response /* from a remote SMTP server. @@ -412,7 +412,7 @@ int smtp_errno; int smtp_host_lookup_mask; STRING_LIST *smtp_cache_dest; SCACHE *smtp_scache; -MAPS *smtp_ehlo_disable_maps; +MAPS *smtp_ehlo_dis_maps; /* deliver_message - deliver message with extreme prejudice */ @@ -560,9 +560,9 @@ static void pre_init(char *unused_name, char **unused_argv) * EHLO keyword filter. */ if (*var_smtp_ehlo_dis_maps) - smtp_ehlo_disable_maps = maps_create(VAR_SMTPD_EHLO_DIS_MAPS, - var_smtp_ehlo_dis_maps, - DICT_FLAG_LOCK); + smtp_ehlo_dis_maps = maps_create(VAR_SMTPD_EHLO_DIS_MAPS, + var_smtp_ehlo_dis_maps, + DICT_FLAG_LOCK); } /* pre_accept - see if tables have changed */ diff --git a/postfix/src/smtp/smtp.h b/postfix/src/smtp/smtp.h index d368b8c8d..9fe55b15a 100644 --- a/postfix/src/smtp/smtp.h +++ b/postfix/src/smtp/smtp.h @@ -144,7 +144,7 @@ extern int smtp_host_lookup_mask; /* host lookup methods to use */ extern SCACHE *smtp_scache; /* connection cache instance */ extern STRING_LIST *smtp_cache_dest; /* cached destinations */ -extern MAPS *smtp_ehlo_disable_maps; /* ehlo keyword filter */ +extern MAPS *smtp_ehlo_dis_maps; /* ehlo keyword filter */ /* * smtp_session.c diff --git a/postfix/src/smtp/smtp_proto.c b/postfix/src/smtp/smtp_proto.c index e3fc7ca52..1da9afe0b 100644 --- a/postfix/src/smtp/smtp_proto.c +++ b/postfix/src/smtp/smtp_proto.c @@ -230,7 +230,7 @@ int smtp_helo(SMTP_STATE *state, int misc_flags) }; SOCKOPT_SIZE optlen; const char *ehlo_words; - int disable_mask; + int discard_mask; /* * Prepare for disaster. @@ -310,12 +310,12 @@ int smtp_helo(SMTP_STATE *state, int misc_flags) * Determine what server EHLO keywords to ignore, typically to avoid * inter-operability problems. */ - if (smtp_ehlo_disable_maps == 0 - || (ehlo_words = maps_find(smtp_ehlo_disable_maps, state->session->addr, 0)) == 0) + if (smtp_ehlo_dis_maps == 0 + || (ehlo_words = maps_find(smtp_ehlo_dis_maps, state->session->addr, 0)) == 0) ehlo_words = var_smtp_ehlo_dis_words; - disable_mask = ehlo_mask(ehlo_words); - if (disable_mask) - msg_info("disabled EHLO keywords: %s", str_ehlo_mask(disable_mask)); + discard_mask = ehlo_mask(ehlo_words); + if (discard_mask) + msg_info("discarding EHLO keywords: %s", str_ehlo_mask(discard_mask)); /* * Pick up some useful features offered by the SMTP server. XXX Until we @@ -331,18 +331,18 @@ int smtp_helo(SMTP_STATE *state, int misc_flags) while ((words = mystrtok(&lines, "\n")) != 0) { if (mystrtok(&words, "- ") && (word = mystrtok(&words, " \t=")) != 0) { if (strcasecmp(word, "8BITMIME") == 0) { - if ((disable_mask & EHLO_MASK_8BITMIME) == 0) + if ((discard_mask & EHLO_MASK_8BITMIME) == 0) session->features |= SMTP_FEATURE_8BITMIME; } else if (strcasecmp(word, "PIPELINING") == 0) { - if ((disable_mask & EHLO_MASK_PIPELINING) == 0) + if ((discard_mask & EHLO_MASK_PIPELINING) == 0) session->features |= SMTP_FEATURE_PIPELINING; } else if (strcasecmp(word, "XFORWARD") == 0) { - if ((disable_mask & EHLO_MASK_XFORWARD) == 0) + if ((discard_mask & EHLO_MASK_XFORWARD) == 0) while ((word = mystrtok(&words, " \t")) != 0) session->features |= name_code(xforward_features, NAME_CODE_FLAG_NONE, word); } else if (strcasecmp(word, "SIZE") == 0) { - if ((disable_mask & EHLO_MASK_SIZE) == 0) { + if ((discard_mask & EHLO_MASK_SIZE) == 0) { session->features |= SMTP_FEATURE_SIZE; if ((word = mystrtok(&words, " \t")) != 0) { if (!alldig(word)) @@ -354,7 +354,7 @@ int smtp_helo(SMTP_STATE *state, int misc_flags) } #ifdef USE_SASL_AUTH } else if (var_smtp_sasl_enable && strcasecmp(word, "AUTH") == 0) { - if ((disable_mask & EHLO_MASK_AUTH) == 0) + if ((discard_mask & EHLO_MASK_AUTH) == 0) smtp_sasl_helo_auth(session, words); #endif } else if (strcasecmp(word, var_myhostname) == 0) { diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index d5d54c4e2..8b94bdc77 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -88,12 +88,12 @@ /* What SMTP clients Postfix will not offer AUTH support to. /* .PP /* Available in Postfix version 2.2 and later: -/* .IP "\fBsmtpd_disable_ehlo_keyword_address_maps (empty)\fR" +/* .IP "\fBsmtpd_discard_ehlo_keyword_address_maps (empty)\fR" /* Lookup tables, indexed by the remote SMTP client address, with /* case insensitive lists of EHLO keywords (pipelining, starttls, /* auth, etc.) that the SMTP server will not send in the EHLO response /* to a remote SMTP client. -/* .IP "\fBsmtpd_disable_ehlo_keywords (empty)\fR" +/* .IP "\fBsmtpd_discard_ehlo_keywords (empty)\fR" /* A case insensitive list of EHLO keywords (pipelining, starttls, /* auth, etc.) that the SMTP server will not send in the EHLO response /* to a remote SMTP client. @@ -831,7 +831,7 @@ char *var_smtpd_ehlo_dis_maps; /* * EHLO keyword filter */ -static MAPS *ehlo_disable_maps; +static MAPS *ehlo_discard_maps; /* * VERP command name. @@ -975,9 +975,9 @@ static int helo_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) static int ehlo_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) { char *err; - int todo_mask; + int discard_mask; const char *ehlo_words; - VSTRING *ehlo_buf; + VSTRING *reply_buf; /* * XXX 2821 new feature: Section 4.1.4 specifies that a server must clear @@ -1022,83 +1022,83 @@ static int ehlo_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) * Determine what server EHLO keywords to suppress, typically to avoid * inter-operability problems. */ - if (ehlo_disable_maps == 0 - || (ehlo_words = maps_find(ehlo_disable_maps, state->addr, 0)) == 0) + if (ehlo_discard_maps == 0 + || (ehlo_words = maps_find(ehlo_discard_maps, state->addr, 0)) == 0) ehlo_words = var_smtpd_ehlo_dis_words; - todo_mask = ~ehlo_mask(ehlo_words); - if (~todo_mask) - msg_info("disabled EHLO keywords: %s", str_ehlo_mask(~todo_mask)); + discard_mask = ehlo_mask(ehlo_words); + if (discard_mask) + msg_info("discarding EHLO keywords: %s", str_ehlo_mask(discard_mask)); /* * Build the EHLO response, suppressing features as requested. We store - * each output line in one-element output queue, where it sits until we + * each output line in a one-element output queue, where it sits until we * know if we need to prepend "250-" or "250 " to it. Each time we * enqueue a reply line we flush the one that sits in the queue. We use a * couple ugly macros to avoid making mistakes in code that repeats a * lot. */ -#define ENQUEUE_FIX_REPLY(state, ehlo_buf, cmd) \ +#define ENQUEUE_FIX_REPLY(state, reply_buf, cmd) \ do { \ - smtpd_chat_reply((state), "250-%s", STR(ehlo_buf)); \ - vstring_strcpy((ehlo_buf), (cmd)); \ + smtpd_chat_reply((state), "250-%s", STR(reply_buf)); \ + vstring_strcpy((reply_buf), (cmd)); \ } while (0) -#define ENQUEUE_FMT_REPLY(state, ehlo_buf, fmt, arg) \ +#define ENQUEUE_FMT_REPLY(state, reply_buf, fmt, arg) \ do { \ - smtpd_chat_reply((state), "250-%s", STR(ehlo_buf)); \ - vstring_sprintf((ehlo_buf), (fmt), (arg)); \ + smtpd_chat_reply((state), "250-%s", STR(reply_buf)); \ + vstring_sprintf((reply_buf), (fmt), (arg)); \ } while (0) - ehlo_buf = vstring_alloc(10); - vstring_strcpy(ehlo_buf, var_myhostname); - if (todo_mask & EHLO_MASK_PIPELINING) - ENQUEUE_FIX_REPLY(state, ehlo_buf, "PIPELINING"); - if (todo_mask & EHLO_MASK_SIZE) { + reply_buf = vstring_alloc(10); + vstring_strcpy(reply_buf, var_myhostname); + if ((discard_mask & EHLO_MASK_PIPELINING) == 0) + ENQUEUE_FIX_REPLY(state, reply_buf, "PIPELINING"); + if ((discard_mask & EHLO_MASK_SIZE) == 0) { if (var_message_limit) - ENQUEUE_FMT_REPLY(state, ehlo_buf, "SIZE %lu", + ENQUEUE_FMT_REPLY(state, reply_buf, "SIZE %lu", (unsigned long) var_message_limit); /* XXX */ else - ENQUEUE_FIX_REPLY(state, ehlo_buf, "SIZE"); + ENQUEUE_FIX_REPLY(state, reply_buf, "SIZE"); } - if (todo_mask & EHLO_MASK_VRFY) + if ((discard_mask & EHLO_MASK_VRFY) == 0) if (var_disable_vrfy_cmd == 0) - ENQUEUE_FIX_REPLY(state, ehlo_buf, "VRFY"); - if (todo_mask & EHLO_MASK_ETRN) - ENQUEUE_FIX_REPLY(state, ehlo_buf, "ETRN"); + ENQUEUE_FIX_REPLY(state, reply_buf, "VRFY"); + if ((discard_mask & EHLO_MASK_ETRN) == 0) + ENQUEUE_FIX_REPLY(state, reply_buf, "ETRN"); #ifdef USE_SASL_AUTH - if (todo_mask & EHLO_MASK_AUTH) { + if ((discard_mask & EHLO_MASK_AUTH) == 0) { if (var_smtpd_sasl_enable && !sasl_client_exception(state)) { - ENQUEUE_FMT_REPLY(state, ehlo_buf, "AUTH %s", + ENQUEUE_FMT_REPLY(state, reply_buf, "AUTH %s", state->sasl_mechanism_list); if (var_broken_auth_clients) - ENQUEUE_FMT_REPLY(state, ehlo_buf, "AUTH=%s", + ENQUEUE_FMT_REPLY(state, reply_buf, "AUTH=%s", state->sasl_mechanism_list); } } #endif - if (todo_mask & EHLO_MASK_VERP) + if ((discard_mask & EHLO_MASK_VERP) == 0) if (namadr_list_match(verp_clients, state->name, state->addr)) - ENQUEUE_FIX_REPLY(state, ehlo_buf, VERP_CMD); + ENQUEUE_FIX_REPLY(state, reply_buf, VERP_CMD); /* XCLIENT must not override its own access control. */ - if (todo_mask & EHLO_MASK_XCLIENT) + if ((discard_mask & EHLO_MASK_XCLIENT) == 0) if (xclient_allowed) - ENQUEUE_FIX_REPLY(state, ehlo_buf, XCLIENT_CMD + ENQUEUE_FIX_REPLY(state, reply_buf, XCLIENT_CMD " " XCLIENT_NAME " " XCLIENT_ADDR " " XCLIENT_PROTO " " XCLIENT_HELO); - if (todo_mask & EHLO_MASK_XFORWARD) + if ((discard_mask & EHLO_MASK_XFORWARD) == 0) if (xforward_allowed) - ENQUEUE_FIX_REPLY(state, ehlo_buf, XFORWARD_CMD + ENQUEUE_FIX_REPLY(state, reply_buf, XFORWARD_CMD " " XFORWARD_NAME " " XFORWARD_ADDR " " XFORWARD_PROTO " " XFORWARD_HELO " " XFORWARD_DOMAIN); - if (todo_mask & EHLO_MASK_8BITMIME) - ENQUEUE_FIX_REPLY(state, ehlo_buf, "8BITMIME"); - smtpd_chat_reply(state, "250 %s", STR(ehlo_buf)); + if ((discard_mask & EHLO_MASK_8BITMIME) == 0) + ENQUEUE_FIX_REPLY(state, reply_buf, "8BITMIME"); + smtpd_chat_reply(state, "250 %s", STR(reply_buf)); /* * Clean up. */ - vstring_free(ehlo_buf); + vstring_free(reply_buf); return (0); } @@ -2891,7 +2891,7 @@ static void pre_jail_init(char *unused_name, char **unused_argv) * EHLO keyword filter. */ if (*var_smtpd_ehlo_dis_maps) - ehlo_disable_maps = maps_create(VAR_SMTPD_EHLO_DIS_MAPS, + ehlo_discard_maps = maps_create(VAR_SMTPD_EHLO_DIS_MAPS, var_smtpd_ehlo_dis_maps, DICT_FLAG_LOCK); }