From 29f0936a9df0ce7e0a1939dc062d299bbad06770 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Tue, 27 Dec 2005 00:00:00 -0500 Subject: [PATCH] postfix-2.3-20051227 --- postfix/HISTORY | 13 +++++++++++++ postfix/README_FILES/INSTALL | 2 +- postfix/html/INSTALL.html | 4 ++-- postfix/html/postconf.5.html | 20 +++++++++++--------- postfix/man/man5/postconf.5 | 19 +++++++++++-------- postfix/proto/INSTALL.html | 2 +- postfix/proto/postconf.proto | 20 +++++++++++--------- postfix/src/global/mail_version.h | 2 +- postfix/src/util/myaddrinfo.c | 1 - postfix/src/util/strcasecmp.c | 8 ++++---- postfix/src/util/sys_defs.h | 3 +++ 11 files changed, 58 insertions(+), 36 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index b17574f33..2d7c3564d 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -11677,6 +11677,19 @@ Apologies for any names omitted. the obsolete "/pattern1/!/pattern2/ action" syntax, for backwards compatibility with Postfix 2.0 and earlier. +20051227 + + Bugfix: the 20051222 ISASCII paranoia broke the strcasecmp() + workaround for Solaris. File: util/strcasecmp.c. + + Bitrot: SunOS4 pre-dates size_t, ssize_t, getsid(). File: + src/util/sys_defs.h. The SunOS4 tests had been suspended + due to what turned out to be a broken AUI-to-UTP transceiver. + + Bugfix: the 20061226 cosmetic change broke non-IPV6 support + (example: sockaddr_to_hostaddr: Unknown error: success). + File: util/myaddrinfo.c. + Open problems: "postsuper -r" no longer resets the message arrival time, diff --git a/postfix/README_FILES/INSTALL b/postfix/README_FILES/INSTALL index ae994309b..cbb05de87 100644 --- a/postfix/README_FILES/INSTALL +++ b/postfix/README_FILES/INSTALL @@ -95,7 +95,7 @@ At some point in time, a version of Postfix was supported on: OSF1.V3 - OSF1.V5 (Digital UNIX) Reliant UNIX 5.x Rhapsody 5.x - SunOS 4.1.4 (February 2005) + SunOS 4.1.4 (December 2005) SunOS 5.4 - 5.9 (Solaris 2.4..9) Ultrix 4.x (well, that was long ago) diff --git a/postfix/html/INSTALL.html b/postfix/html/INSTALL.html index c27703e51..267d0dd6f 100644 --- a/postfix/html/INSTALL.html +++ b/postfix/html/INSTALL.html @@ -156,7 +156,7 @@ OPENSTEP 4.x
OSF1.V3 - OSF1.V5 (Digital UNIX)
Reliant UNIX 5.x
Rhapsody 5.x
-SunOS 4.1.4 (February 2005)
+SunOS 4.1.4 (December 2005)
SunOS 5.4 - 5.9 (Solaris 2.4..9)
Ultrix 4.x (well, that was long ago)

@@ -877,7 +877,7 @@ a hard-coded hostname.

The form enclosed with [] eliminates DNS MX lookups.

By default, the SMTP client will do DNS lookups even when you -specify a relay host. If your machine has no access to a DNS server, +specify a relay host. If your machine has no access to a DNS server, turn off SMTP client DNS lookups like this:

diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index eb78fb295..a0d06322e 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -3223,7 +3223,8 @@ concurrency per recipient.

case insensitive lists of LHLO keywords (pipelining, starttls, auth, etc.) that the LMTP client will ignore in the LHLO response from a remote LMTP server. See lmtp_discard_lhlo_keywords for -details.

+details. The table is not indexed by hostname for consistency with +smtpd_discard_ehlo_keyword_address_map

This feature is available in Postfix 2.3 and later.

@@ -6635,10 +6636,11 @@ into concurrency per recipient.

(default: empty)

Lookup tables, indexed by the remote SMTP server address, with -case insensitive lists of EHLO keywords (pipelining, starttls, -auth, etc.) that the SMTP client will ignore in the EHLO response -from a remote SMTP server. See smtp_discard_ehlo_keywords for -details.

+case insensitive lists of EHLO keywords (pipelining, starttls, auth, +etc.) that the SMTP client will ignore in the EHLO response from a +remote SMTP server. See smtp_discard_ehlo_keywords for details. The +table is not indexed by hostname for consistency with +smtpd_discard_ehlo_keyword_address_maps.

This feature is available in Postfix 2.2 and later.

@@ -8249,10 +8251,10 @@ is being rejected. (default: empty)

Lookup tables, indexed by the remote SMTP client address, with -case insensitive lists of EHLO keywords (pipelining, starttls, -auth, etc.) that the SMTP server will not send in the EHLO response -to a remote SMTP client. See smtpd_discard_ehlo_keywords for details. -

+case insensitive lists of EHLO keywords (pipelining, starttls, auth, +etc.) that the SMTP server will not send in the EHLO response to a +remote SMTP client. See smtpd_discard_ehlo_keywords for details. +The table is not searched by hostname for robustness reasons.

This feature is available in Postfix 2.2 and later.

diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index 192116ec4..a8f8f4f9e 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -1728,7 +1728,8 @@ Lookup tables, indexed by the remote LMTP server address, with case insensitive lists of LHLO keywords (pipelining, starttls, auth, etc.) that the LMTP client will ignore in the LHLO response from a remote LMTP server. See lmtp_discard_lhlo_keywords for -details. +details. The table is not indexed by hostname for consistency with +smtpd_discard_ehlo_keyword_address_map .PP This feature is available in Postfix 2.3 and later. .SH lmtp_discard_lhlo_keywords (default: $myhostname) @@ -3698,10 +3699,11 @@ smtp_destination_concurrency_limit from concurrency per domain into concurrency per recipient. .SH smtp_discard_ehlo_keyword_address_maps (default: empty) Lookup tables, indexed by the remote SMTP server address, with -case insensitive lists of EHLO keywords (pipelining, starttls, -auth, etc.) that the SMTP client will ignore in the EHLO response -from a remote SMTP server. See smtp_discard_ehlo_keywords for -details. +case insensitive lists of EHLO keywords (pipelining, starttls, auth, +etc.) that the SMTP client will ignore in the EHLO response from a +remote SMTP server. See smtp_discard_ehlo_keywords for details. The +table is not indexed by hostname for consistency with +smtpd_discard_ehlo_keyword_address_maps. .PP This feature is available in Postfix 2.2 and later. .SH smtp_discard_ehlo_keywords (default: empty) @@ -4726,9 +4728,10 @@ or sender address, so that it is possible to find out whose mail is being rejected. .SH smtpd_discard_ehlo_keyword_address_maps (default: empty) Lookup tables, indexed by the remote SMTP client address, with -case insensitive lists of EHLO keywords (pipelining, starttls, -auth, etc.) that the SMTP server will not send in the EHLO response -to a remote SMTP client. See smtpd_discard_ehlo_keywords for details. +case insensitive lists of EHLO keywords (pipelining, starttls, auth, +etc.) that the SMTP server will not send in the EHLO response to a +remote SMTP client. See smtpd_discard_ehlo_keywords for details. +The table is not searched by hostname for robustness reasons. .PP This feature is available in Postfix 2.2 and later. .SH smtpd_discard_ehlo_keywords (default: empty) diff --git a/postfix/proto/INSTALL.html b/postfix/proto/INSTALL.html index 62bbc6661..22a5e1446 100644 --- a/postfix/proto/INSTALL.html +++ b/postfix/proto/INSTALL.html @@ -156,7 +156,7 @@ OPENSTEP 4.x
OSF1.V3 - OSF1.V5 (Digital UNIX)
Reliant UNIX 5.x
Rhapsody 5.x
-SunOS 4.1.4 (February 2005)
+SunOS 4.1.4 (December 2005)
SunOS 5.4 - 5.9 (Solaris 2.4..9)
Ultrix 4.x (well, that was long ago)

diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index 3bcaa68b2..c8c51be02 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -7888,20 +7888,21 @@ to discard EHLO keywords selectively.

%PARAM smtp_discard_ehlo_keyword_address_maps

Lookup tables, indexed by the remote SMTP server address, with -case insensitive lists of EHLO keywords (pipelining, starttls, -auth, etc.) that the SMTP client will ignore in the EHLO response -from a remote SMTP server. See smtp_discard_ehlo_keywords for -details.

+case insensitive lists of EHLO keywords (pipelining, starttls, auth, +etc.) that the SMTP client will ignore in the EHLO response from a +remote SMTP server. See smtp_discard_ehlo_keywords for details. The +table is not indexed by hostname for consistency with +smtpd_discard_ehlo_keyword_address_maps.

This feature is available in Postfix 2.2 and later.

%PARAM smtpd_discard_ehlo_keyword_address_maps

Lookup tables, indexed by the remote SMTP client address, with -case insensitive lists of EHLO keywords (pipelining, starttls, -auth, etc.) that the SMTP server will not send in the EHLO response -to a remote SMTP client. See smtpd_discard_ehlo_keywords for details. -

+case insensitive lists of EHLO keywords (pipelining, starttls, auth, +etc.) that the SMTP server will not send in the EHLO response to a +remote SMTP client. See smtpd_discard_ehlo_keywords for details. +The table is not searched by hostname for robustness reasons.

This feature is available in Postfix 2.2 and later.

@@ -8835,7 +8836,8 @@ This feature is available in Postfix 2.3 and later. case insensitive lists of LHLO keywords (pipelining, starttls, auth, etc.) that the LMTP client will ignore in the LHLO response from a remote LMTP server. See lmtp_discard_lhlo_keywords for -details.

+details. The table is not indexed by hostname for consistency with +smtpd_discard_ehlo_keyword_address_map

This feature is available in Postfix 2.3 and later.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 4572e1b3b..f0381afbe 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 "20051226" +#define MAIL_RELEASE_DATE "20051227" #define MAIL_VERSION_NUMBER "2.3" #ifdef SNAPSHOT diff --git a/postfix/src/util/myaddrinfo.c b/postfix/src/util/myaddrinfo.c index 0cf8ab2b2..941d58b94 100644 --- a/postfix/src/util/myaddrinfo.c +++ b/postfix/src/util/myaddrinfo.c @@ -550,7 +550,6 @@ int sockaddr_to_hostaddr(const struct sockaddr * sa, SOCKADDR_SIZE salen, if (hostaddr != 0) { if (inet_ntop(AF_INET, (void *) &(SOCK_ADDR_IN_ADDR(sa)), hostaddr->buf, sizeof(hostaddr->buf)) == 0) - errno = ENOSPC; return (EAI_SYSTEM); } if (portnum != 0) { diff --git a/postfix/src/util/strcasecmp.c b/postfix/src/util/strcasecmp.c index 6ed467134..07e938191 100644 --- a/postfix/src/util/strcasecmp.c +++ b/postfix/src/util/strcasecmp.c @@ -43,10 +43,10 @@ int strcasecmp(const char *s1, const char *s2) const unsigned char *us1 = (const unsigned char *) s1; const unsigned char *us2 = (const unsigned char *) s2; - while (TOLOWER(*us1) == TOLOWER(*us2++)) + while (tolower(*us1) == tolower(*us2++)) if (*us1++ == '\0') return (0); - return (TOLOWER(*us1) - TOLOWER(*--us2)); + return (tolower(*us1) - tolower(*--us2)); } int strncasecmp(const char *s1, const char *s2, size_t n) @@ -56,8 +56,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n) const unsigned char *us2 = (const unsigned char *) s2; do { - if (TOLOWER(*us1) != TOLOWER(*us2++)) - return (TOLOWER(*us1) - TOLOWER(*--us2)); + if (tolower(*us1) != tolower(*us2++)) + return (tolower(*us1) - tolower(*--us2)); if (*us1++ == '\0') break; } while (--n != 0); diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h index 366521091..a66c803e8 100644 --- a/postfix/src/util/sys_defs.h +++ b/postfix/src/util/sys_defs.h @@ -307,6 +307,9 @@ extern int opterr; #define NATIVE_DAEMON_DIR "/usr/libexec/postfix" #define STRCASECMP_IN_STRINGS_H #define OCTAL_TO_UNSIGNED(res, str) sscanf((str), "%o", &(res)) +#define size_t unsigned +#define ssize_t int +#define getsid getpgrp #endif /*