Fix socket timeout handling.

Fixes STARTTLS hangs reported by Thomas Jarosch.

1 files changed, 2 insertions, 1 deletions

diff --git a/socket.c b/socket.c
index 33b7c40c..d3025b7b 100644
--- a/socket.c
+++ b/socket.c
@@ -251,6 +251,7 @@ int UnixOpen(const char *path)
      */
     mailserver_socket_temp = sock;
 
+    SockTimeout(sock, mytimeout);
     if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0)
     {
 	int olderr = errno;
@@ -390,8 +391,8 @@ va_dcl {
 #endif
     vsnprintf(buf, sizeof(buf), format, ap);
     va_end(ap);
+    SockTimeout(sock, mytimeout);
     return SockWrite(sock, buf, strlen(buf));
-
 }
 
 #ifdef SSL_ENABLE