X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=etrn.c;h=ac416c86c3bed7eeb7246c268f7f259c12d04f67;hb=e4dd196b137223195739b9e0f50ec2a8a02b3534;hp=1d540c2b662473e642318c49eb89a7383e4f069a;hpb=d0c2c187633fa906eee672c21f46a2ac68148d15;p=~andy%2Ffetchmail diff --git a/etrn.c b/etrn.c index 1d540c2b..ac416c86 100644 --- a/etrn.c +++ b/etrn.c @@ -1,5 +1,5 @@ /* - * etrn.c -- ETRN protocol methods + * etrn.c -- ETRN protocol methods (see RFC 1985) * * For license terms, see the file COPYING in this directory. */ @@ -9,6 +9,9 @@ #include #include #include +#ifdef HAVE_NET_SOCKET_H /* BeOS needs this */ +#include +#endif #include #include #include @@ -22,7 +25,8 @@ static int etrn_ok (int sock, char *argbuf) { int ok; - ok = SMTP_ok(sock); + (void)argbuf; + ok = SMTP_ok(sock, SMTP_MODE, TIMEOUT_DEFAULT); if (ok == SM_UNRECOVERABLE) return(PS_PROTOCOL); else @@ -37,15 +41,18 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id, char buf [MSGBUFSIZE+1]; struct idlist *qnp; /* pointer to Q names */ - if ((ok = SMTP_ehlo(sock, fetchmailhost, &opts))) + (void)id; + if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost, + ctl->server.esmtp_name, ctl->server.esmtp_password, + &opts))) { - report(stderr, _("%s's SMTP listener does not support ESMTP\n"), + report(stderr, GT_("%s's SMTP listener does not support ESMTP\n"), ctl->server.pollname); return(ok); } else if (!(opts & ESMTP_ETRN)) { - report(stderr, _("%s's SMTP listener does not support ETRN\n"), + report(stderr, GT_("%s's SMTP listener does not support ETRN\n"), ctl->server.pollname); return(PS_PROTOCOL); } @@ -57,7 +64,7 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id, * By default, the hostlist has a single entry, the fetchmail host's * canonical DNS name. */ - for (qnp = ctl->smtphunt; qnp; qnp = qnp->next) + for (qnp = ctl->domainlist; qnp; qnp = qnp->next) { /* ship the actual poll and get the response */ gen_send(sock, "ETRN %s", qnp->id); @@ -68,39 +75,39 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id, switch(atoi(buf)) { case 250: /* OK, queuing for node started */ - if (outlevel >= O_SILENT) - report(stdout, _("Queuing for %s started\n"), qnp->id); + if (outlevel > O_SILENT) + report(stdout, GT_("Queuing for %s started\n"), qnp->id); break; case 251: /* OK, no messages waiting for node */ - if (outlevel >= O_SILENT) - report(stdout, _("No messages waiting for %s\n"), qnp->id); + 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 started */ case 253: /* OK, pending messages for node started */ - if (outlevel >= O_SILENT) - report(stdout, _("Pending messages for %s started\n"), qnp->id); + if (outlevel > O_SILENT) + report(stdout, GT_("Pending messages for %s started\n"), qnp->id); break; case 458: /* Unable to queue messages for node */ - report(stderr, _("Unable to queue messages for node %s\n"),qnp->id); + report(stderr, GT_("Unable to queue messages for node %s\n"),qnp->id); return(PS_PROTOCOL); case 459: /* Node not allowed: */ - report(stderr, _("Node %s not allowed: %s\n"), qnp->id, buf); + report(stderr, GT_("Node %s not allowed: %s\n"), qnp->id, buf); return(PS_AUTHFAIL); case 500: /* Syntax Error */ - report(stderr, _("ETRN syntax error\n")); + report(stderr, GT_("ETRN syntax error\n")); return(PS_PROTOCOL); case 501: /* Syntax Error in Parameters */ - report(stderr, _("ETRN syntax error in parameters\n")); + report(stderr, GT_("ETRN syntax error in parameters\n")); return(PS_PROTOCOL); default: - report(stderr, _("Unknown ETRN error %d\n"), atoi(buf)); + report(stderr, GT_("Unknown ETRN error %d\n"), atoi(buf)); return(PS_PROTOCOL); } } @@ -111,29 +118,29 @@ 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")); } -const static struct method etrn = +static const struct method etrn = { "ETRN", /* ESMTP ETRN extension */ -#if INET6 "smtp", /* standard SMTP port */ -#else /* INET6 */ - 25, /* standard SMTP port */ -#endif /* INET6 */ + "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 password canonicalization */ 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 */ }; @@ -144,19 +151,19 @@ int doETRN (struct query *ctl) 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;