From f32166d8a91a2c82316a00a40ee4842e27ec245d Mon Sep 17 00:00:00 2001 From: heas Date: Sat, 27 Mar 2004 16:31:19 +0000 Subject: merge from 2.0.19 import --- gnu/dist/postfix/src/smtp/smtp_connect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/dist/postfix/src/smtp') diff --git a/gnu/dist/postfix/src/smtp/smtp_connect.c b/gnu/dist/postfix/src/smtp/smtp_connect.c index 173ec7461de..2fe78eec1a1 100644 --- a/gnu/dist/postfix/src/smtp/smtp_connect.c +++ b/gnu/dist/postfix/src/smtp/smtp_connect.c @@ -112,6 +112,7 @@ #include #include #include +#include /* Global library. */ @@ -208,7 +209,7 @@ static SMTP_SESSION *smtp_connect_addr(DNS_RR *addr, unsigned port, non_blocking(sock, BLOCKING); errno = saved_errno; } else { - conn_stat = connect(sock, (struct sockaddr *) & sin, sizeof(sin)); + conn_stat = sane_connect(sock, (struct sockaddr *) & sin, sizeof(sin)); } if (conn_stat < 0) { vstring_sprintf(why, "connect to %s[%s]: %m", @@ -345,7 +346,7 @@ static char *smtp_parse_destination(char *destination, char *def_service, /* * Convert service to port number, network byte order. */ - if ((port = atoi(service)) != 0) { + if (alldig(service) && (port = atoi(service)) != 0) { *portp = htons(port); } else { if ((sp = getservbyname(service, protocol)) == 0) -- cgit