postfix-2.10-20120627

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 611c9d40990290da6c8e368dd8db4b929587086b..cdc9bdd672d6581472ece2924542247ac977edbf 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -17859,3 +17859,9 @@ Apologies for any names omitted.
 
        Cleanup: don't clobber errno when logging a problem.
        File util/msg_output.c.
+
+20120627
+
+       Bugfix (introduced: 20120531-617): in the postscreen module
+       for HAproxy sypport, a VSTREAM buffer size request was not
+       LP64-clean.  File: postscreen/postscreen_haproxy.c.

diff --git a/postfix/makedefs b/postfix/makedefs
index 875ecc213dfa31ad1e74bc71ca6f0294bd140bd0..92a9717c37469ea5e8fe901d2068cea42189c97f 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -666,7 +666,7 @@ CCARGS="$CCARGS -DSNAPSHOT"
 
 # Non-production: needs thorough testing, or major changes are still
 # needed before the code stabilizes.
-CCARGS="$CCARGS -DNONPROD"
+#CCARGS="$CCARGS -DNONPROD"
 
 sed 's/  / /g' <<EOF
 SYSTYPE        = $SYSTYPE

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index f4306c63f2cbd7ac8b231825ebb6952286861f7f..a287560b61aff6baaab0d7e84fb41d10d6f62839 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      "20120621"
+#define MAIL_RELEASE_DATE      "20120627"
 #define MAIL_VERSION_NUMBER    "2.10"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postscreen/postscreen_haproxy.c b/postfix/src/postscreen/postscreen_haproxy.c
index a8cb736895b935e283af2504225620d9efaa82b0..0bc7fd890dd8d9c52d36a449a716cd2c69969d93 100644 (file)
--- a/postfix/src/postscreen/postscreen_haproxy.c
+++ b/postfix/src/postscreen/postscreen_haproxy.c
@@ -145,7 +145,7 @@ static void psc_endpt_haproxy_event(int event, char *context)
        PSC_CLEAR_EVENT_REQUEST(vstream_fileno(state->stream),
                                psc_endpt_haproxy_event, context);
        vstream_control(state->stream,
-                       VSTREAM_CTL_BUFSIZE, VSTREAM_BUFSIZE,
+                       VSTREAM_CTL_BUFSIZE, (ssize_t) VSTREAM_BUFSIZE,
                        VSTREAM_CTL_END);
        state->notify(status, state->stream,
                      &smtp_client_addr, &smtp_client_port,