X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fetchmailconf.py;h=b4b0a1ae7facd4431a39b776e39cefb071b9ab5e;hb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;hp=9088def44881799508ed6981867ad3b38dcf2688;hpb=603a1467db5a94b2c80678919fbf1b7c19714983;p=~andy%2Ffetchmail

diff --git a/fetchmailconf.py b/fetchmailconf.py
index 9088def4..b4b0a1ae 100755
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -157,9 +157,8 @@ class Server:
 	    res = res + (" qvirtual " + str(self.qvirtual) + "\n");
 	if self.auth != ServerDefaults.auth:
 	    res = res + " auth " + self.auth
-	if self.dns != ServerDefaults.dns
-	    res = res + " and options"
 	if self.dns != ServerDefaults.dns:
+	    res = res + " and options"
 	    res = res + flag2str(self.dns, 'dns')
 	if folded:	res = res + "\n    "
 	else:	     res = res + " "
@@ -447,14 +446,13 @@ ianaservices = {"pop3":110,
 # fetchmail protocol to IANA service name
 defaultports = {"auto":None,
 		"POP3":"pop3",
-		"APOP":"pop3",
 		"KPOP":"1109",
 		"IMAP":"imap",
 		"ETRN":"smtp",
 		"ODMR":"odmr"}
 
 authlist = ("any", "password", "gssapi", "kerberos", "ssh", "otp",
-	    "msn", "ntlm")
+	    "msn", "ntlm", "apop", "cram-md5")
 
 listboxhelp = {
     'title' : 'List Selection Help',
@@ -1163,7 +1161,7 @@ class ServerEdit(Frame, MyWidget):
 	# Compute the available protocols from the compile-time options
 	protolist = ['auto']
 	if 'pop3' in feature_options:
-	    protolist = protolist + ["POP3", "APOP", "KPOP"]
+	    protolist = protolist + ["POP3", "KPOP"]
 	if 'sdps' in feature_options:
 	    protolist.append("SDPS")
 	if 'imap' in feature_options:
@@ -1494,7 +1492,7 @@ recommend you upgrade to a non-broken IMAP server.
 	    if string.find(greetline, "Domino IMAP4") > 0:
 		warnings = warnings + """
 Your IMAP server appears to be Lotus Domino.  This server, at least up
-to version 4.6.2a, has a bug in its generation of MIME boundaries (see
+to version 5.0.2, has a bug in its generation of MIME boundaries (see
 the details in the fetchmail FAQ).  As a result, even MIME aware MUAs
 will see attachments as part of the message text.  If your Domino server's
 POP3 facility is enabled, we recommend you fall back on it.
@@ -1510,20 +1508,6 @@ It looks like you could use APOP on this server and avoid sending it your
 password in clear.  You should talk to the mailserver administrator about
 this.
 
-"""
-	    if string.find(greetline, "IMAP2bis") > 0:
-		warnings = warnings + """
-IMAP2bis servers have a minor problem; they can't peek at messages without
-marking them seen.  If you take a line hit during the retrieval, the
-interrupted message may get left on the server, marked seen.
-
-To work around this, it is recommended that you set the `fetchall'
-option on all user entries associated with this server, so any stuck
-mail will be retrieved next time around.
-
-To fix this bug, upgrade to an IMAP4 server.  The fetchmail FAQ includes
-a pointer to an open-source implementation.
-
 """
 	    if string.find(greetline, "IMAP4rev1") > 0:
 		warnings = warnings + """