postfix-2.5-20070530

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 3c6c986e338172aec2cae18adafdace7a62c8dce..d924587a98083a7f4fd15b36f65771974ac86edf 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13574,6 +13574,14 @@ Apologies for any names omitted.
        commands would hang when trying to submit a message larger
        than the per-message size limit. File: postdrop/postdrop.c.
 
+20070530
+
+       Sabotage the saboteur who insists on breaking Postfix by
+       adding gethostbyname() calls that cause maildir delivery
+       to fail when the machine name is not found in /etc/hosts,
+       or that cause Postfix processes to hang when the network
+       is down.
+
 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 b6d1fc8a2f2b899a021256200238f6648cb7a258..41f73f7ca5b99f3c76c57093c9701b48a96978bb 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      "20070529"
+#define MAIL_RELEASE_DATE      "20070530"
 #define MAIL_VERSION_NUMBER    "2.5"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postdrop/postdrop.c b/postfix/src/postdrop/postdrop.c
index 803363bde1e17fcbddc5f14f6d82d2e31f3845d3..92170708fe59f4442d32db923f99ec00872d6b76 100644 (file)
--- a/postfix/src/postdrop/postdrop.c
+++ b/postfix/src/postdrop/postdrop.c
@@ -439,8 +439,9 @@ int     main(int argc, char **argv)
            /* rec_get() errors must not clobber errno. */
            saved_errno = errno;
            while ((rec_type = rec_get_raw(VSTREAM_IN, buf, var_line_limit,
-                                          REC_FLAG_NONE)) != REC_TYPE_END)
-               if (rec_type <= 0)
+                                          REC_FLAG_NONE)) != REC_TYPE_END
+                  && rec_type != REC_TYPE_EOF)
+               if (rec_type == REC_TYPE_ERROR)
                    msg_fatal("uid=%ld: malformed input", (long) uid);
            errno = saved_errno;
            break;

diff --git a/postfix/src/util/get_hostname.c b/postfix/src/util/get_hostname.c
index fcf4a7f7ffb760e01406453dd2f95cb1880b0299..eb2cfea06ad96b491034844626212b49cd736d35 100644 (file)
--- a/postfix/src/util/get_hostname.c
+++ b/postfix/src/util/get_hostname.c
@@ -61,13 +61,23 @@ const char *get_hostname(void)
      * part of the socket interface library. We avoid the more politically-
      * correct uname() routine because that has no portable way of dealing
      * with long (FQDN) hostnames.
+     * 
+     * DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION. IT BREAKS MAILDIR DELIVERY
+     * AND OTHER THINGS WHEN THE MACHINE NAME IS NOT FOUND IN /ETC/HOSTS OR
+     * CAUSES PROCESSES TO HANG WHEN THE NETWORK IS DISCONNECTED.
+     * 
+     * POSTFIX NO LONGER NEEDS A FULLY QUALIFIED HOSTNAME. INSTEAD POSTFIX WILL
+     * USE A DEFAULT DOMAIN NAME "LOCALDOMAIN".
      */
     if (my_host_name == 0) {
+       /* DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION */
        if (gethostname(namebuf, sizeof(namebuf)) < 0)
            msg_fatal("gethostname: %m");
        namebuf[MAXHOSTNAMELEN] = 0;
+       /* DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION */
        if (valid_hostname(namebuf, DO_GRIPE) == 0)
            msg_fatal("unable to use my own hostname");
+       /* DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION */
        my_host_name = mystrdup(namebuf);
     }
     return (my_host_name);