postfix-2.0.19-20040312

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 5bd89779c926211758f1eeb0b7001dc1ae52f91f..4aad6f247bfc58dd56b1fec0b3095185884394f7 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -9124,6 +9124,18 @@ Apologies for any names omitted.
        previous "354 End data with <CR><LF>.<CR><LF>" response.
        File:  smtpd/smtpd.c.
 
+20040302
+
+       Bugfix: SMTPD proxy didn't send QUIT as the result of code
+       duplication. Evidence reported by Mark Martinec. File:
+       smtpd/smtpd.c.
+
+20040311
+
+       Bugfix: bad address syntax caused map lookup with zero-length
+       keys.  Problem reported by Andrei Koulik. Files:
+       util/match_ops.c, src/trivial-rewrite/transport.c.
+
 Open problems:
 
        Low: log xdelay (esp. for SMTP and delivery to command).

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 9ec15a8b1d9013c9bcdbd9ba648bcc5c9850baed..8346fe34cabe375655f47a76849e80391bbf4e82 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * 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      "20040209"
-#define MAIL_VERSION_NUMBER    "2.0.18"
+#define MAIL_RELEASE_DATE      "20040312"
+#define MAIL_VERSION_NUMBER    "2.0.19"
 
 #define VAR_MAIL_VERSION       "mail_version"
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index cb090a196701502da49cb888a85efbe9df7d63ae..72b783d2da5fbb8e636f6b74af645627532ec23a 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -1487,7 +1487,6 @@ static int data_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *unused_argv)
            vstring_sprintf(state->proxy_buffer,
                            "451 Error: queue file write error");
        }
-       smtpd_proxy_close(state);
     }
 
     /*

diff --git a/postfix/src/trivial-rewrite/transport.c b/postfix/src/trivial-rewrite/transport.c
index 3452fb84e488b569c8fcbb5d432c54b22a3e4d6e..006e2419c464b613ca0cdccb837a2504cfa65573 100644 (file)
--- a/postfix/src/trivial-rewrite/transport.c
+++ b/postfix/src/trivial-rewrite/transport.c
@@ -319,7 +319,7 @@ int     transport_lookup(TRANSPORT_INFO *tp, const char *addr,
      * Specify that the lookup key is partial, to avoid matching partial keys
      * with regular expressions.
      */
-    for (name = ratsign + 1; /* void */ ; name = next) {
+    for (name = ratsign + 1; *name != 0; name = next) {
        if (find_transport_entry(tp, name, rcpt_domain, PARTIAL, channel, nexthop))
            RETURN_FREE(FOUND);
        if (dict_errno != 0)

diff --git a/postfix/src/util/match_ops.c b/postfix/src/util/match_ops.c
index fd77937a3d2e7a809e7077cf0d6bbe4b0bccd139..6334737b4a5f5d247a91188ca225fdb685130dff 100644 (file)
--- a/postfix/src/util/match_ops.c
+++ b/postfix/src/util/match_ops.c
@@ -139,7 +139,7 @@ int     match_hostname(int flags, const char *name, const char *pattern)
     if (strchr(pattern, ':') != 0) {
        temp = lowercase(mystrdup(name));
        match = 0;
-       for (entry = temp; /* void */ ; entry = next) {
+       for (entry = temp; *entry != 0; entry = next) {
            if ((match = (dict_lookup(pattern, entry) != 0)) != 0)
                break;
            if (dict_errno != 0)