postfix-2.2-20041013

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 749e21a13e414f726845b6d3ec4346dc454bbfea..de4fe1935ab4867b7b20460e11b97da23fb6e081 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -9760,7 +9760,7 @@ Apologies for any names omitted.
        Santi. Files:  deliver_pass.c, deliver_request.c,
        qmgr_deliver.c, qmgr_message.c, pipe.c, smtpd.c.
 
-20041010
+20041009
 
        Feature: per SMTP client message rate limit and recipient
        rate limit, by Ragnar Lonn, GHN network technologies.
@@ -9770,6 +9770,10 @@ Apologies for any names omitted.
        renamed to smtpd_client_event_limit_exceptions, because it
        now also controls message and recipient rate limit control.
 
+20041013
+
+       Portability: AIX 5.1/GCC.
+
 Open problems:
 
        Low: should the Delivered-To: test in local(8) be configurable?

diff --git a/postfix/html/anvil.8.html b/postfix/html/anvil.8.html
index ade52c523108778a9d4c69d35b07bd2a5e217d61..b214680ae2ce285ba430cfb698b3490250967173 100644 (file)
--- a/postfix/html/anvil.8.html
+++ b/postfix/html/anvil.8.html
@@ -7,7 +7,7 @@
 ANVIL(8)                                                 ANVIL(8)
 
 <b>NAME</b>
-       anvil - Postfix client count and request rate management
+       anvil - Postfix per-client count and rate control
 
 <b>SYNOPSIS</b>
        <b>anvil</b> [generic Postfix daemon options]

diff --git a/postfix/makedefs b/postfix/makedefs
index 2ef53d797641c3a204ba8e2446ec6ba7391bdf65..7fb2a0a9f616eef393ea71c921bae60aefdae0f0 100644 (file)
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -171,7 +171,7 @@ case "$SYSTEM.$RELEASE" in
                done
                ;;
        AIX.*)  case "`uname -v`" in
-               5)      SYSTYPE=AIX4
+               5)      SYSTYPE=AIX5
                        case "$CC" in
                        cc|*/cc|xlc|*/xlc) CCARGS="$CCARGS -w -blibpath:/usr/lib:/lib:/usr/local/lib";;
                        esac

diff --git a/postfix/man/man8/anvil.8 b/postfix/man/man8/anvil.8
index 235f262ccac9019762545b7f09b99998a48cf89c..7bcaa9c4b763af3fd171342556a01a4d35c59e04 100644 (file)
--- a/postfix/man/man8/anvil.8
+++ b/postfix/man/man8/anvil.8
@@ -4,7 +4,7 @@
 .SH NAME
 anvil
 \-
-Postfix client count and request rate management
+Postfix per-client count and rate control
 .SH "SYNOPSIS"
 .na
 .nf

diff --git a/postfix/src/anvil/anvil.c b/postfix/src/anvil/anvil.c
index cd541253e8b8913f6e4e38763f0928ea241ad241..3894dadb692f18f1d38ab8c28c384cae06f29df6 100644 (file)
--- a/postfix/src/anvil/anvil.c
+++ b/postfix/src/anvil/anvil.c
@@ -2,7 +2,7 @@
 /* NAME
 /*     anvil 8
 /* SUMMARY
-/*     Postfix client count and request rate management
+/*     Postfix per-client count and rate control
 /* SYNOPSIS
 /*     \fBanvil\fR [generic Postfix daemon options]
 /* DESCRIPTION

diff --git a/postfix/src/dns/dns_lookup.c b/postfix/src/dns/dns_lookup.c
index 0161cef1c3bdf85781eeae2aab79527c72992188..7fd1528f5b9307b2a1396a2bc98b83f8028c6e68 100644 (file)
--- a/postfix/src/dns/dns_lookup.c
+++ b/postfix/src/dns/dns_lookup.c
@@ -195,7 +195,7 @@ static int dns_query(const char *name, int type, int flags,
      */
     if (len > sizeof(reply->buf)) {
        msg_warn("reply length %d > buffer length %d for name=%s type=%s",
-                len, sizeof(reply->buf), name, dns_strtype(type));
+                len, (int) sizeof(reply->buf), name, dns_strtype(type));
        len = sizeof(reply->buf);
     }
 

diff --git a/postfix/src/global/anvil_clnt.c b/postfix/src/global/anvil_clnt.c
index cfa84550d61a7904ca5e3366da4e9a76d791593b..5ff7538de41e92714e2880ff79ded7c98174b40e 100644 (file)
--- a/postfix/src/global/anvil_clnt.c
+++ b/postfix/src/global/anvil_clnt.c
@@ -357,7 +357,7 @@ int     main(int unused_argc, char **argv)
                                  &msgs, &rcpts) != ANVIL_STAT_OK)
                msg_warn("error!");
            else
-               vstream_printf("count=%d, rate=%d msgs=%d rcpt=%d\n",
+               vstream_printf("count=%d, rate=%d msgs=%d rcpts=%d\n",
                               count, rate, msgs, rcpts);
        } else {
            vstream_printf("bad command: \"%s\"\n", cmd);

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 43efd222fe0ac7b61b8c8855ded6cf4f340ed9f6..f5946af921653165698a389fc65a6e6990c64cdb 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.
   */
-#define MAIL_RELEASE_DATE      "20041009"
+#define MAIL_RELEASE_DATE      "20041013"
 #define MAIL_VERSION_NUMBER    "2.2"
 
 #define VAR_MAIL_VERSION       "mail_version"

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index c34aebdd232dfd8534ad57a5b824cf77ec73468a..8ade47c83f662c85c51d91850ea4508c3ca54530 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -1048,7 +1048,7 @@ static void mail_open_stream(SMTPD_STATE *state)
      * attributes.
      */
     if (SMTPD_STAND_ALONE(state) == 0) {
-       rec_fprintf(state->cleanup, REC_TYPE_TIME, "%ld", state->time);
+       rec_fprintf(state->cleanup, REC_TYPE_TIME, "%ld", (long) state->time);
        if (*var_filter_xport)
            rec_fprintf(state->cleanup, REC_TYPE_FILT, "%s", var_filter_xport);
     }

diff --git a/postfix/src/smtpstone/qmqp-source.c b/postfix/src/smtpstone/qmqp-source.c
index d8e37316af537880a0b96639e50d2e01b81ec9ca..dc0556a19c690d79cb19f460e60690da07db4f14 100644 (file)
--- a/postfix/src/smtpstone/qmqp-source.c
+++ b/postfix/src/smtpstone/qmqp-source.c
@@ -391,12 +391,12 @@ static void receive_reply(int unused_event, char *context)
      */
     netstring_get(session->stream, buffer, var_line_limit);
     if (msg_verbose)
-       vstream_printf("<< %.*s\n", LEN(buffer), STR(buffer));
+       vstream_printf("<< %.*s\n", (int) LEN(buffer), STR(buffer));
     if (STR(buffer)[0] != QMQP_STAT_OK)
        msg_fatal("%s error: %.*s",
                  STR(buffer)[0] == QMQP_STAT_RETRY ? "recoverable" :
                  STR(buffer)[0] == QMQP_STAT_HARD ? "unrecoverable" :
-                 "unknown", LEN(buffer) - 1, STR(buffer) + 1);
+                 "unknown", (int) LEN(buffer) - 1, STR(buffer) + 1);
 
     /*
      * Update the optional running counter.

diff --git a/postfix/src/util/dict_regexp.c b/postfix/src/util/dict_regexp.c
index 73ea34f28e3ca7b23d9464e30d93783541ad0998..8bb73bc7420983b09694b4d6164ef73282ee565a 100644 (file)
--- a/postfix/src/util/dict_regexp.c
+++ b/postfix/src/util/dict_regexp.c
@@ -599,7 +599,7 @@ static DICT_REGEXP_RULE *dict_regexp_parseline(const char *mapname, int lineno,
        if (prescan_context.max_sub > first_exp->re_nsub) {
            msg_warn("regexp map %s, line %d: out of range replacement index \"%d\": "
                     "skipping this rule", mapname, lineno,
-                    prescan_context.max_sub);
+                    (int) prescan_context.max_sub);
            FREE_EXPR_AND_RETURN(first_exp, 0);
        }
        if (second_pat.regexp != 0) {

diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 26272666d194aad08e12d4d6e94f688071076b9a..59b8875f9d56325aa8a0560ed3382540794bbced 100644 (file)
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -422,6 +422,19 @@ extern int opterr;
 #define NATIVE_NEWALIAS_PATH "/usr/sbin/newaliases"
 #define NATIVE_COMMAND_DIR "/usr/sbin"
 #define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
+
+ /*
+  * XXX Need CMSG_SPACE() and CMSG_LEN() but don't want to drag in everything
+  * that comes with _LINUX_SOURCE_COMPAT.
+  */
+#include <sys/socket.h>
+#ifndef CMSG_SPACE
+#define CMSG_SPACE(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+#endif
+#ifndef CMSG_LEN
+#define CMSG_LEN(len) (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+#endif
+
 #endif
 
 #ifdef AIX4