Attempt merging from 6.3.24.

[~andy/fetchmail] / etrn.c

diff --git a/etrn.c b/etrn.c
index 98f2f7b4bd008c72a4097d609af4bfcd2a2e491e..24c532d306607967af0c7dd47ea1128ac1b09988 100644 (file)
--- a/etrn.c
+++ b/etrn.c
@@ -9,13 +9,10 @@
 #include  <stdio.h>
 #include  <stdlib.h>
 #include  <assert.h>
-#ifdef HAVE_NET_SOCKET_H /* BeOS needs this */
-#include <net/socket.h>
-#endif
 #include  <netdb.h>
 #include  <errno.h>
 #include  <unistd.h>
-#include  "i18n.h"
+#include  "gettext.h"
 #include  "fetchmail.h"
 #include  "smtp.h"
 #include  "socket.h"
@@ -25,7 +22,8 @@ static int etrn_ok (int sock, char *argbuf)
 {
     int ok;
 
-    ok = SMTP_ok(sock, SMTP_MODE);
+    (void)argbuf;
+    ok = SMTP_ok(sock, SMTP_MODE, TIMEOUT_DEFAULT);
     if (ok == SM_UNRECOVERABLE)
        return(PS_PROTOCOL);
     else
@@ -40,6 +38,7 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
     char buf [MSGBUFSIZE+1];
     struct idlist *qnp;                /* pointer to Q names */
 
+    (void)id;
     if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost,
                        ctl->server.esmtp_name, ctl->server.esmtp_password,
                        &opts)))
@@ -65,7 +64,7 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
     for (qnp = ctl->domainlist; qnp; qnp = qnp->next)
     {
        /* ship the actual poll and get the response */
-       gen_send(sock, "ETRN %s", (char *)qnp->id);
+       gen_send(sock, "ETRN %s", qnp->id);
        if ((ok = gen_recv(sock, buf, sizeof(buf))))
            return(ok);
 
@@ -116,6 +115,7 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
 static int etrn_logout(int sock, struct query *ctl)
 /* send logout command */
 {
+    (void)ctl;
     return(gen_transact(sock, "QUIT"));
 }