From cc9397414a655cab4c47de6559e69ecda06530cc Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Thu, 26 May 2011 01:29:34 +0200 Subject: Revert SO_???TIMEO-based STARTTLS timeout handling. This reverts commits 47c05b10018f5ec7493e4bd9f521aaa18d96f1e2 and 72ce8bce8dd655b6aefa33d0a74e883dad5202b5, the code isn't portable, for instance, Solaris does not support SO_RCVTIMEO/SO_SNDTIMEO. These socket-level options are known, but Solaris returns EAFNOSUPPORT. Reported by Jonathan Buschmann. --- smtp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'smtp.c') diff --git a/smtp.c b/smtp.c index 90c35173..1c99c696 100644 --- a/smtp.c +++ b/smtp.c @@ -313,12 +313,10 @@ int SMTP_ok(int sock, char smtp_mode, int mintimeout) { SIGHANDLERTYPE alrmsave; char reply[MSGBUFSIZE], *i; - int tmo = (mytimeout >= mintimeout) ? mytimeout : mintimeout; /* set an alarm for smtp ok */ alrmsave = set_signal_handler(SIGALRM, null_signal_handler); - set_timeout(tmo); - SockTimeout(sock, tmo); + set_timeout(mytimeout >= mintimeout ? mytimeout : mintimeout); smtp_response[0] = '\0'; -- cgit v1.2.3