postfix-2.0.16-20031026

diff --git a/postfix/HISTORY b/postfix/HISTORY
index ebca95e2d1360edd5636343086e94cba792cf83a..01b76454285a205d8f08888791c6cb18b85e8198 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -8692,6 +8692,20 @@ Apologies for any names omitted.
        with incorrectly implemented SQL or LDAP tables. File:
        global/maps_find.c.
 
+20031023
+
+       Bugfix: the MYSQL and PGSQL modules invoked dict_register().
+       This was fixed a while ago but never made it into the
+       distribution. Files: util/dict*sql.c.
+
+       Robustness: added three ISSPACE() calls in the smtpd proxy
+       parser. File: smtpd/smtpd_proxy.c.
+
+20031024
+
+       Portability: added localhost to mydestination for sites that
+       turn off append_dot_mydomain. File: global/mail_params.h.
+
 Open problems:
 
        High: when virtual aliasing is turned off after content

diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index af146e1c32ab161cd225852be64a70b573cf9aa2..81256e3363a335f37c66ef16ca5c58b31de95c31 100644 (file)
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -87,7 +87,7 @@ extern char *var_myorigin;
   * mail to other destinations.
   */
 #define VAR_MYDEST             "mydestination"
-#define DEF_MYDEST             "$myhostname, localhost.$mydomain"
+#define DEF_MYDEST             "$myhostname, localhost.$mydomain localhost"
 extern char *var_mydest;
 
  /*

diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index 368ee31a301d75ad58e6f3db5f72704f859c2eef..9b583e1297741e78945291ece5870b81c8442cfe 100644 (file)
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -3812,6 +3812,8 @@ char   *smtpd_check_size(SMTPD_STATE *state, off_t size)
        || BLOCKS(var_message_limit) >= fsbuf.block_free / 2) {
        (void) smtpd_check_reject(state, MAIL_ERROR_RESOURCE,
                                  "452 Insufficient system storage");
+       msg_warn("not enough free space in mail queue: %lu bytes",
+                (unsigned long) fsbuf.block_free * fsbuf.block_size);
        return (STR(error_text));
     }
     return (0);

diff --git a/postfix/src/smtpd/smtpd_proxy.c b/postfix/src/smtpd/smtpd_proxy.c
index f7d2ae1bd0adda4f749a7de26a7d2c1bcead6fd8..ec532dddda6086938a43ff88c0d745ebfbbeebbb 100644 (file)
--- a/postfix/src/smtpd/smtpd_proxy.c
+++ b/postfix/src/smtpd/smtpd_proxy.c
@@ -1,6 +1,6 @@
 /*++
 /* NAME
-/*     smtpd_proto 3
+/*     smtpd_proxy 3
 /* SUMMARY
 /*     SMTP server pass-through proxy client
 /* SYNOPSIS
@@ -234,7 +234,8 @@ int     smtpd_proxy_open(SMTPD_STATE *state, const char *service,
      */
     lines = STR(state->proxy_buffer);
     while ((line = mystrtok(&lines, "\n")) != 0)
-       if ((line[3] == ' ' || line[3] == '-')
+       if (ISDIGIT(line[0]) && ISDIGIT(line[1]) && ISDIGIT(line[2])
+           && (line[3] == ' ' || line[3] == '-')
            && strcmp(line + 4, XLOGINFO_CMD) == 0)
            (void) smtpd_proxy_cmd(state, SMTPD_PROX_WANT_ANY, "%s %s %s",
                                   XLOGINFO_CMD, state->addr, state->name);

diff --git a/postfix/src/util/dict_mysql.c b/postfix/src/util/dict_mysql.c
index 65eab343ead704d5c9cc827c864504da2d239f92..3c27b002364682abb4841e5a410a9539ed2dc0a5 100644 (file)
--- a/postfix/src/util/dict_mysql.c
+++ b/postfix/src/util/dict_mysql.c
@@ -382,7 +382,6 @@ DICT   *dict_mysql_open(const char *name, int open_flags, int dict_flags)
                                    dict_mysql->name->len_hosts);
     if (dict_mysql->pldb == NULL)
        msg_fatal("couldn't intialize pldb!\n");
-    dict_register(name, (DICT *) dict_mysql);
     return (DICT_DEBUG (&dict_mysql->dict));
 }
 

diff --git a/postfix/src/util/dict_pgsql.c b/postfix/src/util/dict_pgsql.c
index 35117b6908fe17afec94f848fcab30940d4cd80f..4e1dc3a97a0c52b5699b20bac1b2c415f75da01d 100644 (file)
--- a/postfix/src/util/dict_pgsql.c
+++ b/postfix/src/util/dict_pgsql.c
@@ -512,7 +512,6 @@ DICT   *dict_pgsql_open(const char *name, int open_flags, int dict_flags)
     dict_pgsql->dict.flags = dict_flags | DICT_FLAG_FIXED;
     if (dict_pgsql->pldb == NULL)
        msg_fatal("couldn't intialize pldb!\n");
-    dict_register(name, (DICT *) dict_pgsql);
     return &dict_pgsql->dict;
 }