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.

diff --git a/NEWS b/NEWS
index 2012440c75fdc988a54bd9e1c0c3a5ee115616cc..c0f24376b9524ad217e92c471e41b9c2a07d3e53 100644 (file)
--- 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 9cf8494416073967342ae4a5ad0cd1181d0f51b0..5549dc9ac5a56ff41e3efbbb7bbb6a61e581cd99 100644 (file)
--- 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;