postfix-2.4-20070202

diff --git a/postfix/html/postkick.1.html b/postfix/html/postkick.1.html
index 67c56befc08c9d4a2bd3e62757b2afec22c60cbf..42e57958147cd1148f352e47d67c29273118bf24 100644 (file)
--- a/postfix/html/postkick.1.html
+++ b/postfix/html/postkick.1.html
@@ -21,7 +21,7 @@ POSTKICK(1)                                                        POSTKICK(1)
        Options:
 
        <b>-c</b> <i>config</i><b>_</b><i>dir</i>
-              Read the <b>main.cf</b> configuration file  in  the  named
+              Read the <a href="postconf.5.html"><b>main.cf</b></a> configuration file  in  the  named
               directory  instead  of  the  default  configuration
               directory.
 
@@ -55,14 +55,14 @@ POSTKICK(1)                                                        POSTKICK(1)
               Enable verbose logging for debugging purposes.
 
 <b>CONFIGURATION PARAMETERS</b>
-       The  following  <b>main.cf</b> parameters are especially relevant
+       The  following  <a href="postconf.5.html"><b>main.cf</b></a> parameters are especially relevant
        to this program.  The text below provides only a parameter
        summary.  See <a href="postconf.5.html"><b>postconf</b>(5)</a> for more details including exam-
        ples.
 
        <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
-              master.cf configuration files.
+              The default location of  the  Postfix  <a href="postconf.5.html">main.cf</a>  and
+              <a href="master.5.html">master.cf</a> configuration files.
 
        <b><a href="postconf.5.html#application_event_drain_time">application_event_drain_time</a> (100s)</b>
               How  long  the  <a href="postkick.1.html"><b>postkick</b>(1)</a>  command  waits  for  a

diff --git a/postfix/makedefs b/postfix/makedefs
index 31b1c9eade21d5783e71b95ddd7b55edc9b30b75..724bea4532fb5e3b2fa6ba209d28f919959e765f 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -266,7 +266,7 @@ case "$SYSTEM.$RELEASE" in
                2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
                esac
                ;;
-     GNU.0.*)
+     GNU.0*|GNU/kFreeBSD.[56]*)
                SYSTYPE=GNU0
                # Postfix no longer needs DB 1.85 compatibility
                if [ -f /usr/include/db.h ]

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6cfd84f5e0e8d8ea8c219851b9394a39b82cddae..20e12eb067592d91d86f4d9e052659f08ffbb56d 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20070201"
+#define MAIL_RELEASE_DATE      "20070202"
 #define MAIL_VERSION_NUMBER    "2.4"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postkick/postkick.c b/postfix/src/postkick/postkick.c
index 721e9ac8e3f454caa1c729481043dfb1b928af88..8446f4069c284684b23a8efb360edfba4656229b 100644 (file)
--- a/postfix/src/postkick/postkick.c
+++ b/postfix/src/postkick/postkick.c
@@ -174,7 +174,18 @@ int     main(int argc, char **argv)
        msg_warn("Cannot contact class %s service %s - perhaps the mail system is down",
                 class, service);
        exit(1);
-    } else {
+    }
+
+    /*
+     * Problem: With triggers over full duplex (i.e. non-FIFO) channels, we
+     * must avoid closing the channel before the server has received the
+     * request. Otherwise some hostile kernel may throw away the request.
+     * 
+     * Solution: The trigger routine registers a read event handler that runs
+     * when the server closes the channel. The event_drain() routine waits
+     * for the event handler to run, but gives up when it takes too long.
+     */
+    else {
        event_drain(var_event_drain);
        exit(0);
     }