#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"
{
int ok;
- ok = SMTP_ok(sock);
+ (void)argbuf;
+ ok = SMTP_ok(sock, SMTP_MODE, TIMEOUT_DEFAULT);
if (ok == SM_UNRECOVERABLE)
return(PS_PROTOCOL);
else
char buf [MSGBUFSIZE+1];
struct idlist *qnp; /* pointer to Q names */
- if ((ok = SMTP_ehlo(sock, fetchmailhost,
+ (void)id;
+ if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost,
ctl->server.esmtp_name, ctl->server.esmtp_password,
&opts)))
{
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);
static int etrn_logout(int sock, struct query *ctl)
/* send logout command */
{
+ (void)ctl;
return(gen_transact(sock, "QUIT"));
}
return(PS_SYNTAX);
}
if (ctl->mailboxes->id) {
- fprintf(stderr, GT_("Option --remote is not supported with ETRN\n"));
+ fprintf(stderr, GT_("Option --folder is not supported with ETRN\n"));
return(PS_SYNTAX);
}
if (check_only) {