X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=pop3.c;h=f8796731286fa36daa3d476f8a2752fed17c77ec;hb=910d5a2f852edb8c4e54c0e875da6a90385ab790;hp=a84bbcc3aadb8740af1754eea454ea14abd6a394;hpb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;p=~andy%2Ffetchmail

diff --git a/pop3.c b/pop3.c
index a84bbcc3..f8796731 100644
--- a/pop3.c
+++ b/pop3.c
@@ -270,8 +270,10 @@ static int do_apop(int sock, struct query *ctl, char *greeting)
     /* find start of timestamp */
     start = strchr(greeting, '<');
     if (!start) {
-	report(stderr,
-		GT_("Required APOP timestamp not found in greeting\n"));
+	if (ctl->server.authenticate == A_APOP || outlevel >= O_DEBUG) {
+	    report(ctl->server.authenticate == A_APOP ? stderr : stdout,
+		    GT_("Required APOP timestamp not found in greeting\n"));
+	}
 	return PS_AUTHFAIL;
     }
 
@@ -360,9 +362,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;