postfix-2.5-20070529

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 091c48df137aadf68a12a7b0aed169820bc025a2..3c6c986e338172aec2cae18adafdace7a62c8dce 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13565,9 +13565,15 @@ Apologies for any names omitted.
 
 20070525
 
-       Bugfix (introduced 20070523) the sasl_set_path() function
+       Bugfix (introduced 20070523): the sasl_set_path() function
        name was mis-speeled.
 
+20070529
+
+       Bugfix (introduced Postfix 2.3): the sendmail/postdrop
+       commands would hang when trying to submit a message larger
+       than the per-message size limit. File: postdrop/postdrop.c.
+
 Wish list:
 
        Update attr_print/scan() so they can send/receive file

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d11c13f5e980bb66a793dffd8cf5c85a5962b75b..b6d1fc8a2f2b899a021256200238f6648cb7a258 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      "20070525"
+#define MAIL_RELEASE_DATE      "20070529"
 #define MAIL_VERSION_NUMBER    "2.5"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postdrop/postdrop.c b/postfix/src/postdrop/postdrop.c
index 7668df8da803489e9585766a5b785cb73b94149d..803363bde1e17fcbddc5f14f6d82d2e31f3845d3 100644 (file)
--- a/postfix/src/postdrop/postdrop.c
+++ b/postfix/src/postdrop/postdrop.c
@@ -438,9 +438,10 @@ int     main(int argc, char **argv)
        if (REC_PUT_BUF(dst->stream, rec_type, buf) < 0) {
            /* rec_get() errors must not clobber errno. */
            saved_errno = errno;
-           while (rec_get_raw(VSTREAM_IN, buf, var_line_limit,
-                              REC_FLAG_NONE) > 0)
-                /* void */ ;
+           while ((rec_type = rec_get_raw(VSTREAM_IN, buf, var_line_limit,
+                                          REC_FLAG_NONE)) != REC_TYPE_END)
+               if (rec_type <= 0)
+                   msg_fatal("uid=%ld: malformed input", (long) uid);
            errno = saved_errno;
            break;
        }