postfix-2.2-20040828

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 9cddea559d38a279ae08a1f44fd0c92ca5695778..8f186a332a35c752eb36143270a5b24683cc77ab 100644 (file)
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -961,6 +961,8 @@ recipient addresses.  </p>
 <p> Specify one or more of: envelope_sender, envelope_recipient,
 header_sender, header_recipient </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 
 </DD>
 
@@ -4608,6 +4610,8 @@ addresses.  </p>
 <p> Specify one or more of: envelope_recipient, header_recipient
 </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 
 </DD>
 
@@ -5035,6 +5039,8 @@ applied to envelope sender addresses, and to header sender addresses.
 
 <p> Specify one or more of: envelope_sender, header_sender </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 
 </DD>
 
@@ -5729,6 +5735,8 @@ the client will take into consideration.  </p>
 lookup tables. The right-hand side result from "<a href="DATABASE_README.html">type:table</a>" lookups
 is ignored. </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 <p>
 Examples:
 </p>

diff --git a/postfix/html/smtp.8.html b/postfix/html/smtp.8.html
index 097a9613d25d35efbc40432023cd4c6ca5142358..a06853f46f84598d26c1174bc2cea6bec960b9ae 100644 (file)
--- 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.
 
-       <b>smtp_connection_cache_on_demand (yes)</b>
+       <b><a href="postconf.5.html#smtp_connection_cache_on_demand">smtp_connection_cache_on_demand</a> (yes)</b>
               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 739436ebbb4546f3a354c91a8105b26dc54ca7cb..3ac34368fc28855b2626019a63caa6e5de473624 100644 (file)
--- 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 f166396191134edc0d16bbea3b6ce11314581095..ccf72e1f067715dd1bbe1ed548ed14d6acd65fbb 100755 (executable)
--- a/postfix/mantools/postlink
+++ b/postfix/mantools/postlink
@@ -306,6 +306,7 @@ while (<>) {
     s;\bsmtp_bind_address\b;<a href="postconf.5.html#smtp_bind_address">$&</a>;g;
     s;\bsmtp_connect_timeout\b;<a href="postconf.5.html#smtp_connect_timeout">$&</a>;g;
 
+    s;\bsmtp_connection_cache_on_demand\b;<a href="postconf.5.html#smtp_connection_cache_on_demand">$&</a>;g;
     s;\bsmtp_connection_cache_reuse_limit\b;<a href="postconf.5.html#smtp_connection_cache_reuse_limit">$&</a>;g;
     s;\bsmtp_connection_cache_time_limit\b;<a href="postconf.5.html#smtp_connection_cache_time_limit">$&</a>;g;
     s;\bsmtp_connection_cache_destinations\b;<a href="postconf.5.html#smtp_connection_cache_destinations">$&</a>;g;

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 9f34fa4eefe459db678bca4c7f2bed61032f80a5..88cdf51344df49a1ba21610bdb9330ea27b00ff5 100644 (file)
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -691,6 +691,8 @@ recipient addresses.  </p>
 <p> Specify one or more of: envelope_sender, envelope_recipient,
 header_sender, header_recipient </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 %PARAM sender_canonical_classes envelope_sender, header_sender
 
 <p> What addresses are subject to sender_canonical_maps address
@@ -700,6 +702,8 @@ applied to envelope sender addresses, and to header sender addresses.
 
 <p> Specify one or more of: envelope_sender, header_sender </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 %PARAM recipient_canonical_classes envelope_recipient, header_recipient
 
 <p> What addresses are subject to recipient_canonical_maps address
@@ -710,6 +714,8 @@ addresses.  </p>
 <p> Specify one or more of: envelope_recipient, header_recipient
 </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 %PARAM command_directory see "postconf -d" output
 
 <p>
@@ -3726,6 +3732,8 @@ the client will take into consideration.  </p>
 lookup tables. The right-hand side result from "type:table" lookups
 is ignored. </p>
 
+<p> This feature is available in Postfix 2.2 and later. </p>
+
 <p>
 Examples:
 </p>

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index faed0e6fa21b089195b51f27c08aef028d184556..97a44f35e6f8453eae0962929dbe67fb56716476 100644 (file)
--- 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 318d6fee24878ee84a30a9f965c6e944bf584df0..9d33a3ab2421bdac70ab038722fc07f722537d56 100644 (file)
--- 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)