Rediff patch.

[~andy/fetchmail] / smtp.c

diff --git a/smtp.c b/smtp.c
index 90c35173a13bcfc2802fb1291a0af41799126981..d831249243192b401831e4ce1ed7f93a0ce0f560 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -18,7 +18,7 @@
 #include <signal.h>
 #include "socket.h"
 #include "smtp.h"
-#include "i18n.h"
+#include "gettext.h"
 
 struct opt
 {
@@ -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';