postfix-1.1.11-20020826

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index e32bf3bf91d11ce85ddc21a6419f91fce23a9785..00e71864adaa2b3905aaa78d5e07ca413fdc375e 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, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE      "20020823"
+#define MAIL_RELEASE_DATE      "20020826"
 
 #define VAR_MAIL_VERSION       "mail_version"
 #define DEF_MAIL_VERSION       "1.1.11-" MAIL_RELEASE_DATE

diff --git a/postfix/src/lmtp/lmtp_connect.c b/postfix/src/lmtp/lmtp_connect.c
index cb7e24663844835358452bcb0f143a9e21a3874b..6479d634dc12b4d73daaaeba2a274bca58fb7497 100644 (file)
--- a/postfix/src/lmtp/lmtp_connect.c
+++ b/postfix/src/lmtp/lmtp_connect.c
@@ -246,7 +246,7 @@ static LMTP_SESSION *lmtp_connect_sock(int sock, struct sockaddr * sa, int len,
      */
     stream = vstream_fdopen(sock, O_RDWR);
     if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) {
-       vstring_sprintf(why, "connect to %s[%s]: server dropped connection",
+       vstring_sprintf(why, "connect to %s[%s]: server dropped connection without sending the initial greeting",
                        name, addr);
        lmtp_errno = LMTP_RETRY;
        vstream_fclose(stream);

diff --git a/postfix/src/smtp/smtp_connect.c b/postfix/src/smtp/smtp_connect.c
index 8c947052017ac76692596c0dd8adc4fd8a22e70e..c6ea16c4357bc0718df071defb120ebeead71f4a 100644 (file)
--- a/postfix/src/smtp/smtp_connect.c
+++ b/postfix/src/smtp/smtp_connect.c
@@ -233,7 +233,7 @@ static SMTP_SESSION *smtp_connect_addr(DNS_RR *addr, unsigned port,
      */
     stream = vstream_fdopen(sock, O_RDWR);
     if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) {
-       vstring_sprintf(why, "connect to %s[%s]: server dropped connection",
+       vstring_sprintf(why, "connect to %s[%s]: server dropped connection without sending the initial greeting",
                        addr->name, inet_ntoa(sin.sin_addr));
        smtp_errno = SMTP_RETRY;
        vstream_fclose(stream);

diff --git a/postfix/src/util/dict_open.c b/postfix/src/util/dict_open.c
index 52a5dddc14b291287caa0e20850f3d0f3b8ca9b2..6cc082485e7ed875e1a79c3c42e8be8603525f81 100644 (file)
--- a/postfix/src/util/dict_open.c
+++ b/postfix/src/util/dict_open.c
@@ -245,7 +245,8 @@ DICT   *dict_open(const char *dict_spec, int open_flags, int dict_flags)
     DICT   *dict;
 
     if ((dict_name = split_at(saved_dict_spec, ':')) == 0)
-       msg_fatal("open dictionary: need \"type:name\" form: %s", dict_spec);
+       msg_fatal("open dictionary: need \"type:name\" form instead of: \"%s\"",
+                 dict_spec);
 
     dict = dict_open3(saved_dict_spec, dict_name, open_flags, dict_flags);
     myfree(saved_dict_spec);

diff --git a/postfix/src/util/sane_accept.c b/postfix/src/util/sane_accept.c
index d9ad683f2c7b3d13dd69d60353c9da13f130f574..c95c7434e4ca6ddf345c50610f75fee3a6e2a9c7 100644 (file)
--- a/postfix/src/util/sane_accept.c
+++ b/postfix/src/util/sane_accept.c
@@ -54,9 +54,7 @@ int     sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len)
        ENETUNREACH,
        ENOTCONN,
        EWOULDBLOCK,
-       0,
-    };
-    static int accept_warn_errors[] = {
+       ENOBUFS,                        /* HPUX11 */
        ECONNABORTED,
        0,
     };
@@ -80,6 +78,9 @@ int     sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len)
      * reported successful completion. This was fixed shortly before FreeBSD
      * 4.3. However, other systems may make that same mistake again, so we're
      * adding a special warning.
+     * 
+     * XXX HP-UX 11 returns ENOBUFS when the client has disconnected in the mean
+     * time.
      */
     if ((fd = accept(sock, sa, len)) < 0) {
        for (count = 0; (err = accept_ok_errors[count]) != 0; count++) {
@@ -88,15 +89,6 @@ int     sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len)
                break;
            }
        }
-       for (count = 0; (err = accept_warn_errors[count]) != 0; count++) {
-           if (errno == err) {
-#if 0
-               msg_warn("accept: %m");
-#endif
-               errno = EAGAIN;
-               break;
-           }
-       }
     }
     return (fd);
 }