From 2199d611d9f4d4770fdd97be942d2e83bedc0569 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Sun, 14 Oct 2012 00:10:11 +0200 Subject: [PATCH] Make Maillennium POP3 workarounds less specific, to encompass Maillennium POP3/UNIBOX (Maillennium V05.00c++). Reported by Eddie via fetchmail-users mailing list, 2012-10-13. --- NEWS | 5 +++++ pop3.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 2012440c..c0f24376 100644 --- a/NEWS +++ b/NEWS @@ -75,6 +75,11 @@ after 6.3.22 not available on their own in a newer 6.3.X release. * Clean up logfile vs. syslog handling, and in case logfile overrides syslog, send a message to the latter stating where logging goes. +# WORKAROUNDS +* Make Maillennium POP3 workarounds less specific, to encompass + Maillennium POP3/UNIBOX (Maillennium V05.00c++). Reported by Eddie + via fetchmail-users mailing list, 2012-10-13. + fetchmail-6.3.22 (released 2012-08-29, 26077 LoC): diff --git a/pop3.c b/pop3.c index 9cf84944..5549dc9a 100644 --- a/pop3.c +++ b/pop3.c @@ -322,9 +322,9 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) * * Matthias Andree */ - if (peek_capable && strstr(greeting, "Maillennium POP3/PROXY server")) { + if (peek_capable && strstr(greeting, "Maillennium POP3")) { if ((ctl->server.workarounds & WKA_TOP) == 0) { - report(stdout, GT_("Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n")); + report(stdout, GT_("Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n")); ctl->server.workarounds |= WKA_TOP; } peek_capable = 0; -- 2.43.2