mir/postfix
2
0
Fork 0
mirror of https://github.com/vdukhovni/postfix synced 2025-09-03 15:45:24 +00:00
Code Issues Releases Wiki Activity

postfix-1.1.11-20020826

Browse Source
This commit is contained in:
Wietse Venema
2002-08-26 00:00:00 -05:00
committed by Viktor Dukhovni
parent b464831bbc
commit 86bb3efb9e
5 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postfix/src/global/mail_version.h
View File

@@ -20,7 +20,7 @@
* Patches change the patchlevel and the release date. Snapshots change the * Patches change the patchlevel and the release date. Snapshots change the
* release date only, unless they include the same bugfix as a patch release. * release date only, unless they include the same bugfix as a patch release.
*/ */
#define MAIL_RELEASE_DATE "20020823" #define MAIL_RELEASE_DATE "20020826"
#define VAR_MAIL_VERSION "mail_version" #define VAR_MAIL_VERSION "mail_version"
#define DEF_MAIL_VERSION "1.1.11-" MAIL_RELEASE_DATE #define DEF_MAIL_VERSION "1.1.11-" MAIL_RELEASE_DATE

2
postfix/src/lmtp/lmtp_connect.c
View File

@@ -246,7 +246,7 @@ static LMTP_SESSION *lmtp_connect_sock(int sock, struct sockaddr * sa, int len,
*/ */
stream = vstream_fdopen(sock, O_RDWR); stream = vstream_fdopen(sock, O_RDWR);
if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) { if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) {
vstring_sprintf(why, "connect to %s[%s]: server dropped connection", vstring_sprintf(why, "connect to %s[%s]: server dropped connection without sending the initial greeting",
name, addr); name, addr);
lmtp_errno = LMTP_RETRY; lmtp_errno = LMTP_RETRY;
vstream_fclose(stream); vstream_fclose(stream);

2
postfix/src/smtp/smtp_connect.c
View File

@@ -233,7 +233,7 @@ static SMTP_SESSION *smtp_connect_addr(DNS_RR *addr, unsigned port,
*/ */
stream = vstream_fdopen(sock, O_RDWR); stream = vstream_fdopen(sock, O_RDWR);
if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) { if ((ch = VSTREAM_GETC(stream)) == VSTREAM_EOF) {
vstring_sprintf(why, "connect to %s[%s]: server dropped connection", vstring_sprintf(why, "connect to %s[%s]: server dropped connection without sending the initial greeting",
addr->name, inet_ntoa(sin.sin_addr)); addr->name, inet_ntoa(sin.sin_addr));
smtp_errno = SMTP_RETRY; smtp_errno = SMTP_RETRY;
vstream_fclose(stream); vstream_fclose(stream);

3
postfix/src/util/dict_open.c
View File

@@ -245,7 +245,8 @@ DICT *dict_open(const char *dict_spec, int open_flags, int dict_flags)
DICT *dict; DICT *dict;
if ((dict_name = split_at(saved_dict_spec, ':')) == 0) if ((dict_name = split_at(saved_dict_spec, ':')) == 0)
msg_fatal("open dictionary: need \"type:name\" form: %s", dict_spec); msg_fatal("open dictionary: need \"type:name\" form instead of: \"%s\"",
dict_spec);
dict = dict_open3(saved_dict_spec, dict_name, open_flags, dict_flags); dict = dict_open3(saved_dict_spec, dict_name, open_flags, dict_flags);
myfree(saved_dict_spec); myfree(saved_dict_spec);

16
postfix/src/util/sane_accept.c
View File

@@ -54,9 +54,7 @@ int sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len)
ENETUNREACH, ENETUNREACH,
ENOTCONN, ENOTCONN,
EWOULDBLOCK, EWOULDBLOCK,
0, ENOBUFS, /* HPUX11 */
};
static int accept_warn_errors[] = {
ECONNABORTED, ECONNABORTED,
0, 0,
}; };
@@ -80,6 +78,9 @@ int sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len)
* reported successful completion. This was fixed shortly before FreeBSD * reported successful completion. This was fixed shortly before FreeBSD
* 4.3. However, other systems may make that same mistake again, so we're * 4.3. However, other systems may make that same mistake again, so we're
* adding a special warning. * adding a special warning.
*
* XXX HP-UX 11 returns ENOBUFS when the client has disconnected in the mean
* time.
*/ */
if ((fd = accept(sock, sa, len)) < 0) { if ((fd = accept(sock, sa, len)) < 0) {
for (count = 0; (err = accept_ok_errors[count]) != 0; count++) { for (count = 0; (err = accept_ok_errors[count]) != 0; count++) {
@@ -88,15 +89,6 @@ int sane_accept(int sock, struct sockaddr * sa, SOCKADDR_SIZE *len)
break; break;
} }
} }
for (count = 0; (err = accept_warn_errors[count]) != 0; count++) {
if (errno == err) {
#if 0
msg_warn("accept: %m");
#endif
errno = EAGAIN;
break;
}
}
} }
return (fd); return (fd);
} }