X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=etrn.c;h=ac416c86c3bed7eeb7246c268f7f259c12d04f67;hb=2629c4511c68729d98acfd08637c1f00d3807f49;hp=c0f6fea1d56d86bc449d4d33d9083f9c8798246c;hpb=768378869dfbe86f5bd0084db3187c67347f0537;p=~andy%2Ffetchmail diff --git a/etrn.c b/etrn.c index c0f6fea1..ac416c86 100644 --- a/etrn.c +++ b/etrn.c @@ -1,15 +1,21 @@ /* - * etrn.c -- ETRN protocol methods + * etrn.c -- ETRN protocol methods (see RFC 1985) * * For license terms, see the file COPYING in this directory. */ #include "config.h" +#ifdef ETRN_ENABLE #include #include #include +#ifdef HAVE_NET_SOCKET_H /* BeOS needs this */ +#include +#endif #include #include +#include +#include "i18n.h" #include "fetchmail.h" #include "smtp.h" #include "socket.h" @@ -19,174 +25,154 @@ 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 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, qdone = 0; - char buf [POPBUFSIZE+1], - hname[256]; - const char *qname; + int ok, opts; + 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 */ - - /*** This is a sort of horrible HACK because the ETRN protocol - *** does not fit very well into the mailbox concept used in - *** this program (IMHO). The last element of ctl->smtphunt - *** turned out to be the host being queried (i.e., the smtp server). - *** for that reason the rather "funny" condition in the for loop. - *** Isn't it sort of unreasonable to add the server to the ETRN - *** hunt list? (Concerning ETRN I'm sure! In case I want a Q-run of - *** my SMTP-server I can always specify -Smyserver, and this is only - *** resonable if I start sendmail without -qtime and in Q-only mode.) - *** - *** -- 1997-06-22 Guenther Leber - ***/ - /* do it for all queues in the smtphunt list except the last one - which is the SMTP-server itself */ - for (qnp = ctl->smtphunt; ( (qnp != (struct idlist *) NULL) && - (qnp->next != (struct idlist *) NULL) ) || (qdone == 0); - qnp = qnp->next, qdone++) - { - - /* extract name of Q */ - if ( (qnp != (struct idlist *) NULL) && - (qnp->next != (struct idlist *) NULL) ) - { - /* take Q-name given in smtp hunt list */ - qname = qnp->id; - } else { - assert(qdone == 0); - /*** use fully qualified host name as Q name ***/ - /* get hostname */ - if (gethostname(hname, sizeof hname) != 0) - { - /* exit with error message */ - error(0, errno, "gethostname failed: "); - return PS_UNDEFINED; - } - /* in case we got a host basename (as we do in Linux), - make a FQDN of it */ - hp = gethostbyname(hname); - if (hp == (struct hostent *) NULL) - { - /* exit with error message */ - error(0, 0, "gethostbyname failed for %s", hname); - return PS_TRANSIENT; - } - /* here it is */ - qname = hp->h_name; - } + /* make sure we don't enter the fetch loop */ + *bytes = *countp = *newp = -1; - - /* ship the actual poll and get the response */ - gen_send(sock, "ETRN %s", qname); - if ((ok = gen_recv(sock, buf, sizeof(buf)))) + /* + * By default, the hostlist has a single entry, the fetchmail host's + * canonical DNS name. + */ + 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 the response codes described in RFC1985 */ - switch(atoi(buf)) - { - case 250: /* OK, queuing for node started */ - error(0, 0, "Queuing for %s started", qname); + /* this switch includes all response codes described in RFC1985 */ + switch(atoi(buf)) + { + case 250: /* OK, queuing for node started */ + if (outlevel > O_SILENT) + report(stdout, GT_("Queuing for %s started\n"), qnp->id); break; - case 251: /* OK, no messages waiting for node */ - error(0, 0, "No messages waiting for %s", qname); + case 251: /* OK, no messages waiting for node */ + 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 */ - error(0, 0, "Pending messages for %s started", qname); + case 252: /* OK, pending messages for node started */ + case 253: /* OK, pending messages for node 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 */ - error(0, -1, "Unable to queue messages for node %s", qname); + case 458: /* Unable to queue messages for node */ + report(stderr, GT_("Unable to queue messages for node %s\n"),qnp->id); return(PS_PROTOCOL); - case 459: /* Node not allowed: */ - error(0, -1, "Node %s not allowed: %s", qname, buf); + case 459: /* Node not allowed: */ + report(stderr, GT_("Node %s not allowed: %s\n"), qnp->id, buf); return(PS_AUTHFAIL); - case 500: /* Syntax Error */ - error(0, -1, "ETRN syntax error"); + case 500: /* Syntax Error */ + report(stderr, GT_("ETRN syntax error\n")); return(PS_PROTOCOL); - case 501: /* Syntax Error in Parameters */ - error(0, -1, "ETRN syntax error in parameters"); + case 501: /* Syntax Error in Parameters */ + report(stderr, GT_("ETRN syntax error in parameters\n")); return(PS_PROTOCOL); - default: - error(0, -1, "Unknown ETRN error %d", atoi(buf)); + default: + report(stderr, GT_("Unknown ETRN error %d\n"), atoi(buf)); return(PS_PROTOCOL); - } + } } return(0); } -const static struct method etrn = +static int etrn_logout(int sock, struct query *ctl) +/* send logout command */ +{ + (void)ctl; + return(gen_transact(sock, "QUIT")); +} + +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 */ - FALSE, /* no getsizes method */ 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 */ - "QUIT", /* the ETRN exit command */ + 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 doETRN (struct query *ctl) /* retrieve messages using ETRN */ { + 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; - return(do_protocol(ctl, &etrn)); + + status = do_protocol(ctl, &etrn); + if (status == PS_NOMAIL) + status = PS_SUCCESS; + return(status); } +#endif /* ETRN_ENABLE */ /* etrn.c ends here */