Specify one or more of: envelope_sender, envelope_recipient, header_sender, header_recipient
+This feature is available in Postfix 2.2 and later.
+ @@ -4608,6 +4610,8 @@ addresses.Specify one or more of: envelope_recipient, header_recipient
+This feature is available in Postfix 2.2 and later.
+ @@ -5035,6 +5039,8 @@ applied to envelope sender addresses, and to header sender addresses.Specify one or more of: envelope_sender, header_sender
+This feature is available in Postfix 2.2 and later.
+ @@ -5729,6 +5735,8 @@ the client will take into consideration. lookup tables. The right-hand side result from "type:table" lookups is ignored. +This feature is available in Postfix 2.2 and later.
+Examples:
diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html index 097a9613d..a06853f46 100644 --- a/postfix/html/smtp.8.html +++ b/postfix/html/smtp.8.html @@ -251,7 +251,7 @@ SMTP(8) SMTP(8) Permanently enable SMTP connection caching for the specified destinations. - smtp_connection_cache_on_demand (yes) + smtp_connection_cache_on_demand (yes) Temporarily enable SMTP session caching while a destination has a high volume of mail in the active queue. diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 739436ebb..3ac34368f 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -495,6 +495,8 @@ recipient addresses. .PP Specify one or more of: envelope_sender, envelope_recipient, header_sender, header_recipient +.PP +This feature is available in Postfix 2.2 and later. .SH canonical_maps (default: empty) Optional address mapping lookup tables for message headers and envelopes. The mapping is applied to both sender and recipient @@ -2387,6 +2389,8 @@ applied to envelope recipient addresses, and to header recipient addresses. .PP Specify one or more of: envelope_recipient, header_recipient +.PP +This feature is available in Postfix 2.2 and later. .SH recipient_canonical_maps (default: empty) Optional address mapping lookup tables for envelope and header recipient addresses. @@ -2649,6 +2653,8 @@ mapping. By default, sender_canonical_maps address mapping is applied to envelope sender addresses, and to header sender addresses. .PP Specify one or more of: envelope_sender, header_sender +.PP +This feature is available in Postfix 2.2 and later. .SH sender_canonical_maps (default: empty) Optional address mapping lookup tables for envelope and header sender addresses. @@ -2989,6 +2995,8 @@ Specify mechanism names, "/file/name" patterns or "type:table" lookup tables. The right-hand side result from "type:table" lookups is ignored. .PP +This feature is available in Postfix 2.2 and later. +.PP Examples: .PP .nf diff --git a/postfix/mantools/postlink b/postfix/mantools/postlink index f16639619..ccf72e1f0 100755 --- a/postfix/mantools/postlink +++ b/postfix/mantools/postlink @@ -306,6 +306,7 @@ while (<>) { s;\bsmtp_bind_address\b;$&;g; s;\bsmtp_connect_timeout\b;$&;g; + s;\bsmtp_connection_cache_on_demand\b;$&;g; s;\bsmtp_connection_cache_reuse_limit\b;$&;g; s;\bsmtp_connection_cache_time_limit\b;$&;g; s;\bsmtp_connection_cache_destinations\b;$&;g; diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 9f34fa4ee..88cdf5134 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -691,6 +691,8 @@ recipient addresses.Specify one or more of: envelope_sender, envelope_recipient, header_sender, header_recipient
+This feature is available in Postfix 2.2 and later.
+ %PARAM sender_canonical_classes envelope_sender, header_senderWhat addresses are subject to sender_canonical_maps address @@ -700,6 +702,8 @@ applied to envelope sender addresses, and to header sender addresses.
Specify one or more of: envelope_sender, header_sender
+This feature is available in Postfix 2.2 and later.
+ %PARAM recipient_canonical_classes envelope_recipient, header_recipientWhat addresses are subject to recipient_canonical_maps address @@ -710,6 +714,8 @@ addresses.
Specify one or more of: envelope_recipient, header_recipient
+This feature is available in Postfix 2.2 and later.
+ %PARAM command_directory see "postconf -d" output@@ -3726,6 +3732,8 @@ the client will take into consideration.
lookup tables. The right-hand side result from "type:table" lookups is ignored. +This feature is available in Postfix 2.2 and later.
+Examples:
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index faed0e6fa..97a44f35e 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 "20040827" +#define MAIL_RELEASE_DATE "20040828" #define MAIL_VERSION_NUMBER "2.2" #define VAR_MAIL_VERSION "mail_version" diff --git a/postfix/src/util/sys_compat.c b/postfix/src/util/sys_compat.c index 318d6fee2..9d33a3ab2 100644 --- a/postfix/src/util/sys_compat.c +++ b/postfix/src/util/sys_compat.c @@ -249,8 +249,13 @@ int closefrom(int lowfd) int fd_limit = open_limit(0); int fd; - if (lowfd > fd_limit) { - errno = EINVAL; + /* + * lowfrom does not have an easy to determine upper limit. A process may + * have files open that were inherited from a parent process with a less + * restrictive resource limit. + */ + if (lowfd < 0) { + errno = EBADF; return (-1); } if (fd_limit > 500)