/*
- * etrn.c -- ETRN protocol methods
+ * etrn.c -- ETRN protocol methods (see RFC 1985)
*
* For license terms, see the file COPYING in this directory.
*/
#include <netdb.h>
#include <errno.h>
#include <unistd.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
return(ok);
}
-static int etrn_getrange(int sock, struct query *ctl, char *id, int *countp,
- int *newp)
+static int etrn_getrange(int sock, struct query *ctl, const char *id,
+ int *countp, int *newp, int *bytes)
/* send ETRN and interpret the response */
{
int ok, opts;
- char buf [POPBUFSIZE+1],
- hname[256];
+ char buf [MSGBUFSIZE+1];
struct idlist *qnp; /* pointer to Q names */
- struct hostent *hp;
- if ((ok = SMTP_ehlo(sock, ctl->server.truename, &opts)))
+ (void)id;
+ if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost,
+ ctl->server.esmtp_name, ctl->server.esmtp_password,
+ &opts)))
{
- error(0, 0, "%s's SMTP listener does not support ESMTP",
+ report(stderr, GT_("%s's SMTP listener does not support ESMTP\n"),
ctl->server.pollname);
return(ok);
}
else if (!(opts & ESMTP_ETRN))
{
- error(0, 0, "%s's SMTP listener does not support ETRN",
+ report(stderr, GT_("%s's SMTP listener does not support ETRN\n"),
ctl->server.pollname);
return(PS_PROTOCOL);
}
- *countp = *newp = -1; /* make sure we don't enter the fetch loop */
+ /* make sure we don't enter the fetch loop */
+ *bytes = *countp = *newp = -1;
/*
- * Do it for all nondefault queues in the smtphunt list.
- * We can tell the nondefault ones because they have a TRUE num field.
+ * By default, the hostlist has a single entry, the fetchmail host's
+ * canonical DNS name.
*/
- for (qnp = ctl->smtphunt; qnp; qnp = qnp->next)
- if (qnp->val.num)
+ for (qnp = ctl->domainlist; qnp; qnp = qnp->next)
+ {
+ /* ship the actual poll and get the response */
+ gen_send(sock, "ETRN %s", qnp->id);
+ if ((ok = gen_recv(sock, buf, sizeof(buf))))
+ return(ok);
+
+ /* this switch includes all response codes described in RFC1985 */
+ switch(atoi(buf))
{
- /* ship the actual poll and get the response */
- gen_send(sock, "ETRN %s", qnp->id);
- if ((ok = gen_recv(sock, buf, sizeof(buf))))
- return(ok);
-
- /* this switch includes all response codes described in RFC1985 */
- switch(atoi(buf))
- {
- case 250: /* OK, queuing for node <x> started */
- error(0, 0, "Queuing for %s started", qnp->id);
- break;
-
- case 251: /* OK, no messages waiting for node <x> */
- error(0, 0, "No messages waiting for %s", qnp->id);
- return(PS_NOMAIL);
-
- case 252: /* OK, pending messages for node <x> started */
- case 253: /* OK, <n> pending messages for node <x> started */
- error(0, 0, "Pending messages for %s started", qnp->id);
- break;
-
- case 458: /* Unable to queue messages for node <x> */
- error(0, -1, "Unable to queue messages for node %s",qnp->id);
- return(PS_PROTOCOL);
-
- case 459: /* Node <x> not allowed: <reason> */
- error(0, -1, "Node %s not allowed: %s", qnp->id, buf);
- return(PS_AUTHFAIL);
-
- case 500: /* Syntax Error */
- error(0, -1, "ETRN syntax error");
- return(PS_PROTOCOL);
-
- case 501: /* Syntax Error in Parameters */
- error(0, -1, "ETRN syntax error in parameters");
- return(PS_PROTOCOL);
-
- default:
- error(0, -1, "Unknown ETRN error %d", atoi(buf));
- return(PS_PROTOCOL);
- }
+ case 250: /* OK, queuing for node <x> started */
+ if (outlevel > O_SILENT)
+ report(stdout, GT_("Queuing for %s started\n"), qnp->id);
+ break;
+
+ case 251: /* OK, no messages waiting for node <x> */
+ if (outlevel > O_SILENT)
+ report(stdout, GT_("No messages waiting for %s\n"), qnp->id);
+ return(PS_NOMAIL);
+
+ case 252: /* OK, pending messages for node <x> started */
+ case 253: /* OK, <n> pending messages for node <x> started */
+ if (outlevel > O_SILENT)
+ report(stdout, GT_("Pending messages for %s started\n"), qnp->id);
+ break;
+
+ case 458: /* Unable to queue messages for node <x> */
+ report(stderr, GT_("Unable to queue messages for node %s\n"),qnp->id);
+ return(PS_PROTOCOL);
+
+ case 459: /* Node <x> not allowed: <reason> */
+ report(stderr, GT_("Node %s not allowed: %s\n"), qnp->id, buf);
+ return(PS_AUTHFAIL);
+
+ case 500: /* Syntax Error */
+ report(stderr, GT_("ETRN syntax error\n"));
+ return(PS_PROTOCOL);
+
+ case 501: /* Syntax Error in Parameters */
+ report(stderr, GT_("ETRN syntax error in parameters\n"));
+ return(PS_PROTOCOL);
+
+ default:
+ report(stderr, GT_("Unknown ETRN error %d\n"), atoi(buf));
+ return(PS_PROTOCOL);
}
+ }
return(0);
}
static int etrn_logout(int sock, struct query *ctl)
/* send logout command */
{
+ (void)ctl;
return(gen_transact(sock, "QUIT"));
}
-const static struct method etrn =
+static const struct method etrn =
{
"ETRN", /* ESMTP ETRN extension */
- 25, /* standard SMTP port */
+ "smtp", /* standard SMTP port */
+ "smtps", /* ssl SMTP port */
FALSE, /* this is not a tagged protocol */
FALSE, /* this does not use a message delimiter */
etrn_ok, /* parse command response */
NULL, /* no need to get authentication */
etrn_getrange, /* initialize message sending */
NULL, /* we cannot get a list of sizes */
+ NULL, /* we cannot get a list of sizes of subsets */
NULL, /* how do we tell a message is old? */
NULL, /* no way to fetch headers */
NULL, /* no way to fetch body */
NULL, /* no message trailer */
NULL, /* how to delete a message */
+ NULL, /* how to mark a message as seen */
+ NULL, /* no mailbox support */
etrn_logout, /* log out, we're done */
FALSE, /* no, we can't re-poll */
};
int status;
if (ctl->keep) {
- fprintf(stderr, "Option --keep is not supported with ETRN\n");
+ fprintf(stderr, GT_("Option --keep is not supported with ETRN\n"));
return(PS_SYNTAX);
}
if (ctl->flush) {
- fprintf(stderr, "Option --flush is not supported with ETRN\n");
+ fprintf(stderr, GT_("Option --flush is not supported with ETRN\n"));
return(PS_SYNTAX);
}
if (ctl->mailboxes->id) {
- fprintf(stderr, "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) {
- fprintf(stderr, "Option --check is not supported with ETRN\n");
+ fprintf(stderr, GT_("Option --check is not supported with ETRN\n"));
return(PS_SYNTAX);
}
peek_capable = FALSE;
projects / ~andy / fetchmail / blobdiff