aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS4
-rw-r--r--imap.c128
-rw-r--r--pop3.c18
3 files changed, 82 insertions, 68 deletions
diff --git a/NEWS b/NEWS
index ab6a035d..44275b28 100644
--- a/NEWS
+++ b/NEWS
@@ -84,6 +84,10 @@ removed from a 6.5.0 or newer release.)
* Kerberos 5 may be broken, particularly on Heimdal, and provide bogus error
messages. This will not be fixed, because the maintainer has no Kerberos 5
server to test against. Use GSSAPI.
+* For IMAP connections, fetchmail will print "will idle after poll" in
+ verbose mode even though --idle is not given, as an artifact of the 6.4.22
+ security fixes. Fetchmail means "could idle after poll", but this would
+ have required another loop through the translators.
--------------------------------------------------------------------------------
fetchmail-6.4.22 (not yet released):
diff --git a/imap.c b/imap.c
index 882d4050..a14139b6 100644
--- a/imap.c
+++ b/imap.c
@@ -35,7 +35,7 @@ static int preauth = FALSE;
/* session variables initialized in capa_probe() or imap_getauth() */
static char capabilities[MSGBUFSIZE+1];
static int imap_version = IMAP4;
-static flag do_idle = FALSE, has_idle = FALSE;
+static flag has_idle = FALSE;
static int expunge_period = 1;
static void clear_sessiondata(void) {
@@ -43,7 +43,6 @@ static void clear_sessiondata(void) {
preauth = FALSE;
memset(capabilities, 0, sizeof(capabilities));
imap_version = IMAP4;
- do_idle = FALSE;
has_idle = FALSE;
expunge_period = 1;
}
@@ -65,14 +64,53 @@ static int actual_deletions = 0;
static int saved_timeout = 0, idle_timeout = 0;
static time_t idle_start_time = 0;
+static int imap_setup(struct query *ctl)
+{
+ (void)ctl;
+ clear_sessiondata();
+ return PS_SUCCESS;
+}
+
+static int imap_cleanup(struct query *ctl)
+{
+ (void)ctl;
+ clear_sessiondata();
+ return PS_SUCCESS;
+}
+
static void copy_capabilities(const char *buf)
{
- char *cp;
strlcpy(capabilities, buf, sizeof(capabilities));
capabilities[strcspn(capabilities, "]")] = '\0'; /* truncate at ] */
- for (cp = capabilities; *cp; cp++) {
- *cp = toupper((unsigned char)*cp);
+
+ /* UW-IMAP server 10.173 notifies in all caps, but RFC2060 says we
+ should expect a response in mixed-case */
+ if (strstr(capabilities, "IMAP4REV1")) {
+ imap_version = IMAP4rev1; /* RFC-3501 (2060) */
+ if (outlevel >= O_DEBUG)
+ report(stdout, GT_("Protocol identified as IMAP4 rev 1\n"));
+ } else if (strstr(capabilities, "IMAP4")) {
+ imap_version = IMAP4; /* RFC-1730 */
+ if (outlevel >= O_DEBUG)
+ report(stdout, GT_("Protocol identified as IMAP4 rev 0\n"));
+ } else {
+ imap_version = IMAP2;
+ if (outlevel >= O_DEBUG)
+ report(stdout, GT_("Protocol identified as IMAP2 or IMAP2BIS\n"));
}
+
+ /*
+ * Handle idling. We depend on coming through here on startup
+ * and after each timeout (including timeouts during idles).
+ */
+ if (strstr(capabilities, "IDLE"))
+ has_idle = TRUE;
+ else
+ has_idle = FALSE;
+ if (outlevel >= O_VERBOSE)
+ report(stdout, GT_("will idle after poll\n")); /* FIXME: rename this to can... idle for next release */
+
+ peek_capable = (imap_version >= IMAP4);
}
@@ -376,60 +414,20 @@ static void imap_canonicalize(char *result, char *raw, size_t maxlen)
static int capa_probe(int sock, struct query *ctl)
/* set capability variables from a CAPA probe */
{
- int ok;
-
- /* probe to see if we're running IMAP4 and can use RFC822.PEEK */
- capabilities[0] = '\0';
- if ((ok = gen_transact(sock, "CAPABILITY")) == PS_SUCCESS)
- {
- char *cp;
-
- /* capability checks are supposed to be caseblind */
- for (cp = capabilities; *cp; cp++)
- *cp = toupper((unsigned char)*cp);
+ int err;
- /* UW-IMAP server 10.173 notifies in all caps, but RFC2060 says we
- should expect a response in mixed-case */
- if (strstr(capabilities, "IMAP4REV1"))
- {
- imap_version = IMAP4rev1;
- if (outlevel >= O_DEBUG)
- report(stdout, GT_("Protocol identified as IMAP4 rev 1\n"));
- }
- else
- {
- imap_version = IMAP4;
- if (outlevel >= O_DEBUG)
- report(stdout, GT_("Protocol identified as IMAP4 rev 0\n"));
- }
- }
- else if (ok == PS_ERROR)
- {
- imap_version = IMAP2;
- if (outlevel >= O_DEBUG)
- report(stdout, GT_("Protocol identified as IMAP2 or IMAP2BIS\n"));
- }
- else
- return ok;
+ (void)ctl;
- /*
- * Handle idling. We depend on coming through here on startup
- * and after each timeout (including timeouts during idles).
- */
- do_idle = ctl->idle;
- if (ctl->idle)
- {
- if (strstr(capabilities, "IDLE"))
- has_idle = TRUE;
- else
- has_idle = FALSE;
- if (outlevel >= O_VERBOSE)
- report(stdout, GT_("will idle after poll\n"));
+ /* probe to see if we're running IMAP4 and can use RFC822.PEEK */
+ memset(capabilities, 0, sizeof capabilities);
+ err = gen_transact(sock, "CAPABILITY");
+ /* if successful, copy_capabilities() will have handled it */
+ if (err == PS_ERROR) {
+ /* this is OK for IMAP2 which did not support a CAPABILITY command */
+ err = PS_SUCCESS;
}
- peek_capable = (imap_version >= IMAP4);
-
- return PS_SUCCESS;
+ return err;
}
static int do_auth_external (int sock, const char *command, const char *name)
@@ -446,7 +444,7 @@ static int do_auth_external (int sock, const char *command, const char *name)
}
if (name && name[0])
{
- size_t len = strlen(name);
+ size_t len = strlen(name);
if (len64frombits(len) + 1 <= sizeof(buf)) /* +1: need to fit \0 byte */
to64frombits (buf, name, strlen(name), sizeof buf);
else
@@ -463,9 +461,7 @@ static int do_auth_external (int sock, const char *command, const char *name)
static int imap_getauth(int sock, struct query *ctl, char *greeting)
{
int ok = 0;
- char *commonname, *cp;
-
- clear_sessiondata();
+ char *commonname;
/*
* Assumption: expunges are cheap, so we want to do them
@@ -479,11 +475,9 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
/* check if imap_ok() has already parsed CAPABILITY from the greeting when
* driver.c ran it on the server's greeting message - note this must match
* with what's in imap_response()! */
- if ((cp = strstr(greeting, capa_begin))) {
- copy_capabilities(cp + capa_len);
- } else {
- if ((ok = capa_probe(sock, ctl)))
- return ok;
+ if (!strstr(greeting, capa_begin)) {
+ int err = capa_probe(sock, ctl);
+ if (err) return err;
}
commonname = ctl->server.pollname;
@@ -980,7 +974,7 @@ static int imap_getrange(int sock,
*
* this is a while loop because imap_idle() might return on other
* mailbox changes also */
- while (recentcount == 0 && do_idle) {
+ while (recentcount == 0 && ctl->idle && has_idle) {
smtp_close(ctl, 1);
ok = imap_idle(sock);
if (ok)
@@ -1037,7 +1031,7 @@ static int imap_getrange(int sock,
count), count);
}
- if (count == 0 && do_idle)
+ if (count == 0 && ctl->idle && has_idle)
{
/* no messages? then we may need to idle until we get some */
while (count == 0) {
@@ -1487,6 +1481,8 @@ static const struct method imap =
imap_end_mailbox_poll, /* end-of-mailbox processing */
imap_logout, /* expunge and exit */
TRUE, /* yes, we can re-poll */
+ imap_setup, /* setup method */
+ imap_cleanup /* cleanup method */
};
int doIMAP(struct query *ctl)
diff --git a/pop3.c b/pop3.c
index 7718e201..50ca697b 100644
--- a/pop3.c
+++ b/pop3.c
@@ -114,6 +114,20 @@ static int do_pop3_ntlm(int sock, struct query *ctl,
#define DOTLINE(s) (s[0] == '.' && (s[1]=='\r'||s[1]=='\n'||s[1]=='\0'))
+static int pop3_setup(struct query *ctl)
+{
+ (void)ctl;
+ clear_sessiondata();
+ return PS_SUCCESS;
+}
+
+static int pop3_cleanup(struct query *ctl)
+{
+ (void)ctl;
+ clear_sessiondata();
+ return PS_SUCCESS;
+}
+
static int pop3_ok (int sock, char *argbuf)
/* parse command response */
{
@@ -295,8 +309,6 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
char *commonname;
#endif /* SSL_ENABLE */
- clear_sessiondata();
-
/* Set this up before authentication quits early. */
set_peek_capable(ctl);
@@ -1388,6 +1400,8 @@ static const struct method pop3 =
NULL, /* no action at end of mailbox */
pop3_logout, /* log out, we're done */
FALSE, /* no, we can't re-poll */
+ pop3_setup, /* setup method */
+ pop3_cleanup /* cleanup method */
};
int doPOP3 (struct query *ctl)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 21:04:58 +0000