diff --git a/postfix/HISTORY b/postfix/HISTORY
index 100cb1ec3..40cc32c29 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -12703,6 +12703,11 @@ Apologies for any names omitted.
implementation of the capture to file feature. File:
smtpstone/smtp-sink.c.
+20050824
+
+ Portability: inside functions, GCC 4 refuses forward
+ declarations of static functions. File: smtpstone/smtp-sink.c.
+
Wish list:
Make null local-part handling configurable: either expand
diff --git a/postfix/html/smtp-sink.1.html b/postfix/html/smtp-sink.1.html
index 1880535a9..04e44eac4 100644
--- a/postfix/html/smtp-sink.1.html
+++ b/postfix/html/smtp-sink.1.html
@@ -212,17 +212,15 @@ SMTP-SINK(1) SMTP-SINK(1)
HELO or EHLO command before the DATA command.
X-Mail-Args: text
- The arguments, if any, of the MAIL command that
- started this mail delivery transaction. This record
- is present only if the client sent a recognizable
- MAIL command.
+ The arguments of the MAIL command that started this
+ mail delivery transaction. This record is present
+ exactly once.
X-Rcpt-Args: text
- The arguments, if any, of each successive RCPT com-
- mand within this mail delivery transaction. There
- may be zero or more of these records. This record
- is present only if the client sent a recognizable
- RCPT command.
+ The arguments of an RCPT command within this mail
+ delivery transaction. There is one record for each
+ RCPT command, and they are in the order as sent by
+ the client.
Received: text
A message header for compatibility with mail pro-
diff --git a/postfix/man/man1/smtp-sink.1 b/postfix/man/man1/smtp-sink.1
index dff7310b2..a1fc05a2d 100644
--- a/postfix/man/man1/smtp-sink.1
+++ b/postfix/man/man1/smtp-sink.1
@@ -181,19 +181,16 @@ mail delivery transaction. This record is present only if
the client sent a recognizable HELO or EHLO command before
the DATA command.
.IP "\fBX-Mail-Args: \fItext\fR"
-The arguments, if any, of the MAIL command that started
-this mail delivery transaction. This record is present only
-if the client sent a recognizable MAIL command.
+The arguments of the MAIL command that started this mail
+delivery transaction. This record is present exactly once.
.IP "\fBX-Rcpt-Args: \fItext\fR"
-The arguments, if any, of each successive RCPT command
-within this mail delivery transaction. There may be zero
-or more of these records. This record is present only if
-the client sent a recognizable RCPT command.
+The arguments of an RCPT command within this mail delivery
+transaction. There is one record for each RCPT command, and
+they are in the order as sent by the client.
.IP "\fBReceived: \fItext\fR"
A message header for compatibility with mail processing
software. This three-line header marks the end of the headers
-provided by \fBsmtp-sink\fR, and is formatted
-as follows:
+provided by \fBsmtp-sink\fR, and is formatted as follows:
.RS
.IP "\fBfrom \fIhelo\fB ([\fIaddr\fB])\fR"
The HELO or EHLO command argument and client IP address.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 493917922..3c334f4f5 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20060823"
+#define MAIL_RELEASE_DATE "20060824"
#define MAIL_VERSION_NUMBER "2.4"
#ifdef SNAPSHOT
diff --git a/postfix/src/smtpstone/smtp-sink.c b/postfix/src/smtpstone/smtp-sink.c
index dc151c882..faa7861f8 100644
--- a/postfix/src/smtpstone/smtp-sink.c
+++ b/postfix/src/smtpstone/smtp-sink.c
@@ -173,19 +173,16 @@
/* the client sent a recognizable HELO or EHLO command before
/* the DATA command.
/* .IP "\fBX-Mail-Args: \fItext\fR"
-/* The arguments, if any, of the MAIL command that started
-/* this mail delivery transaction. This record is present only
-/* if the client sent a recognizable MAIL command.
+/* The arguments of the MAIL command that started this mail
+/* delivery transaction. This record is present exactly once.
/* .IP "\fBX-Rcpt-Args: \fItext\fR"
-/* The arguments, if any, of each successive RCPT command
-/* within this mail delivery transaction. There may be zero
-/* or more of these records. This record is present only if
-/* the client sent a recognizable RCPT command.
+/* The arguments of an RCPT command within this mail delivery
+/* transaction. There is one record for each RCPT command, and
+/* they are in the order as sent by the client.
/* .IP "\fBReceived: \fItext\fR"
/* A message header for compatibility with mail processing
/* software. This three-line header marks the end of the headers
-/* provided by \fBsmtp-sink\fR, and is formatted
-/* as follows:
+/* provided by \fBsmtp-sink\fR, and is formatted as follows:
/* .RS
/* .IP "\fBfrom \fIhelo\fB ([\fIaddr\fB])\fR"
/* The HELO or EHLO command argument and client IP address.
@@ -1087,12 +1084,12 @@ static void read_event(int unused_event, char *context)
event_request_timer(read_timeout, (char *) state, var_tmout);
}
+static void connect_event(int, char *);
+
/* disconnect - handle disconnection events */
static void disconnect(SINK_STATE *state)
{
- static void connect_event(int, char *);
-
event_disable_readwrite(vstream_fileno(state->stream));
event_cancel_timer(read_timeout, (char *) state);
if (count) {