diff --git a/postfix/HISTORY b/postfix/HISTORY
index 749e21a13..de4fe1935 100644
--- 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 ade52c523..b214680ae 100644
--- a/postfix/html/anvil.8.html
+++ b/postfix/html/anvil.8.html
@@ -7,7 +7,7 @@
ANVIL(8) ANVIL(8)
NAME
- anvil - Postfix client count and request rate management
+ anvil - Postfix per-client count and rate control
SYNOPSIS
anvil [generic Postfix daemon options]
diff --git a/postfix/makedefs b/postfix/makedefs
index 2ef53d797..7fb2a0a9f 100644
--- 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 235f262cc..7bcaa9c4b 100644
--- 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 cd541253e..3894dadb6 100644
--- 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 0161cef1c..7fd1528f5 100644
--- 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 cfa84550d..5ff7538de 100644
--- 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 43efd222f..f5946af92 100644
--- 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 c34aebdd2..8ade47c83 100644
--- 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 d8e37316a..dc0556a19 100644
--- 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 73ea34f28..8bb73bc74 100644
--- 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 26272666d..59b8875f9 100644
--- 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
+#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