Merge branch 'legacy_63'

[~andy/fetchmail] / fetchmailconf.py

diff --git a/fetchmailconf.py b/fetchmailconf.py
index aa224226257e18090438186c6dd79c0b848dd828..b4b0a1ae7facd4431a39b776e39cefb071b9ab5e 100755 (executable)
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -88,7 +88,6 @@ class Server:
        self.interval = 0               # Skip interval
        self.protocol = 'auto'          # Default to auto protocol
        self.service = None             # Service name to use
        self.interval = 0               # Skip interval
        self.protocol = 'auto'          # Default to auto protocol
        self.service = None             # Service name to use

-       self.uidl = FALSE               # Don't use RFC1725 UIDLs by default

        self.auth = 'any'               # Default to password authentication
        self.timeout = 300              # 5-minute timeout
        self.envelope = 'Received'      # Envelope-address header
        self.auth = 'any'               # Default to password authentication
        self.timeout = 300              # 5-minute timeout
        self.envelope = 'Received'      # Envelope-address header


@@ -115,7 +114,6 @@ class Server:
            ('interval',  'Int'),
            ('protocol',  'String'),
            ('service',   'String'),
            ('interval',  'Int'),
            ('protocol',  'String'),
            ('service',   'String'),

-           ('uidl',      'Boolean'),

            ('auth',      'String'),
            ('timeout',   'Int'),
            ('envelope',  'String'),
            ('auth',      'String'),
            ('timeout',   'Int'),
            ('envelope',  'String'),


@@ -159,12 +157,9 @@ class Server:
            res = res + (" qvirtual " + str(self.qvirtual) + "\n");
        if self.auth != ServerDefaults.auth:
            res = res + " auth " + self.auth
            res = res + (" qvirtual " + str(self.qvirtual) + "\n");
        if self.auth != ServerDefaults.auth:
            res = res + " auth " + self.auth

-       if self.dns != ServerDefaults.dns or self.uidl != ServerDefaults.uidl:
-           res = res + " and options"

        if self.dns != ServerDefaults.dns:
        if self.dns != ServerDefaults.dns:

+           res = res + " and options"

            res = res + flag2str(self.dns, 'dns')
            res = res + flag2str(self.dns, 'dns')

-       if self.uidl != ServerDefaults.uidl:
-           res = res + flag2str(self.uidl, 'uidl')

        if folded:      res = res + "\n    "
        else:        res = res + " "
 
        if folded:      res = res + "\n    "
        else:        res = res + " "
 


@@ -202,13 +197,17 @@ class Server:
            res = res + " esmtppassword " + `self.esmtppassword`
        if self.interface or self.monitor or self.principal or self.plugin or self.plugout:
            if folded:
            res = res + " esmtppassword " + `self.esmtppassword`
        if self.interface or self.monitor or self.principal or self.plugin or self.plugout:
            if folded:

-               res = res + "\n"
+               res = res + "\n    "
+

        if self.badheader:
                res = res + "bad-header accept "
        if self.retrieveerror == 'continue':
                res = res + "retrieve-error continue "
        if self.retrieveerror == 'markseen':
                res = res + "retrieve-error markseen "
        if self.badheader:
                res = res + "bad-header accept "
        if self.retrieveerror == 'continue':
                res = res + "retrieve-error continue "
        if self.retrieveerror == 'markseen':
                res = res + "retrieve-error markseen "

+       if self.badheader or self.retrieveerror != ServerDefaults.retrieveerror:
+           if folded:
+               res = res + "\n"

 
        if res[-1] == " ": res = res[0:-1]
 
 
        if res[-1] == " ": res = res[0:-1]
 


@@ -438,8 +437,7 @@ class User:
 #
 
 # IANA port assignments and bogus 1109 entry
 #
 
 # IANA port assignments and bogus 1109 entry

-ianaservices = {"pop2":109,
-               "pop3":110,
+ianaservices = {"pop3":110,

                "1109":1109,
                "imap":143,
                "smtp":25,
                "1109":1109,
                "imap":143,
                "smtp":25,


@@ -447,16 +445,14 @@ ianaservices = {"pop2":109,
 
 # fetchmail protocol to IANA service name
 defaultports = {"auto":None,
 
 # fetchmail protocol to IANA service name
 defaultports = {"auto":None,

-               "POP2":"pop2",

                "POP3":"pop3",
                "POP3":"pop3",

-               "APOP":"pop3",

                "KPOP":"1109",
                "IMAP":"imap",
                "ETRN":"smtp",
                "ODMR":"odmr"}
 
 authlist = ("any", "password", "gssapi", "kerberos", "ssh", "otp",
                "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',
 
 listboxhelp = {
     'title' : 'List Selection Help',


@@ -1128,7 +1124,6 @@ class ServerEdit(Frame, MyWidget):
        # a custom port number you should be in expert mode and playing
        # close enough attention to notice this...
        self.service.set(defaultports[proto])
        # a custom port number you should be in expert mode and playing
        # close enough attention to notice this...
        self.service.set(defaultports[proto])

-       if not proto in ("POP3", "APOP", "KPOP"): self.uidl.state = DISABLED

 
     def user_edit(self, username, mode):
        self.subwidgets[username] = UserEdit(username, self).edit(mode, Toplevel())
 
     def user_edit(self, username, mode):
        self.subwidgets[username] = UserEdit(username, self).edit(mode, Toplevel())


@@ -1165,10 +1160,8 @@ class ServerEdit(Frame, MyWidget):
 
        # Compute the available protocols from the compile-time options
        protolist = ['auto']
 
        # Compute the available protocols from the compile-time options
        protolist = ['auto']

-       if 'pop2' in feature_options:
-           protolist.append("POP2")

        if 'pop3' in feature_options:
        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:
        if 'sdps' in feature_options:
            protolist.append("SDPS")
        if 'imap' in feature_options:


@@ -1187,9 +1180,6 @@ class ServerEdit(Frame, MyWidget):
            LabeledEntry(protwin, 'On server TCP/IP service:',
                      self.service, leftwidth).pack(side=TOP, fill=X)
            self.defaultPort()
            LabeledEntry(protwin, 'On server TCP/IP service:',
                      self.service, leftwidth).pack(side=TOP, fill=X)
            self.defaultPort()

-           Checkbutton(protwin,
-               text="POP3: track `seen' with client-side UIDLs?",
-               variable=self.uidl).pack(side=TOP)

        Button(protwin, text='Probe for supported protocols', fg='blue',
               command=self.autoprobe).pack(side=LEFT)
        Button(protwin, text='Help', fg='blue',
        Button(protwin, text='Probe for supported protocols', fg='blue',
               command=self.autoprobe).pack(side=LEFT)
        Button(protwin, text='Help', fg='blue',


@@ -1263,7 +1253,7 @@ class ServerEdit(Frame, MyWidget):
        else:
            realhost = self.server.pollname
        greetline = None
        else:
            realhost = self.server.pollname
        greetline = None

-       for protocol in ("IMAP","POP3","POP2"):
+       for protocol in ("IMAP","POP3"):

            service = defaultports[protocol]
            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
            try:
            service = defaultports[protocol]
            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
            try:


@@ -1288,18 +1278,6 @@ out before getting a response.
            warnings = ''
            # OK, now try to recognize potential problems
 
            warnings = ''
            # OK, now try to recognize potential problems
 

-           if protocol == "POP2":
-               warnings = warnings + """
-It appears you have somehow found a mailserver running only POP2.
-Congratulations.  Have you considered a career in archaeology?
-
-Unfortunately, stock fetchmail binaries don't include POP2 support anymore.
-Unless the first line of your fetchmail -V output includes the string "POP2",
-you'll have to build it from sources yourself with the configure
-switch --enable-POP2.
-
-"""
-

 ### POP3 servers start here
 
            if string.find(greetline, "1.003") > 0 or string.find(greetline, "1.004") > 0:
 ### POP3 servers start here
 
            if string.find(greetline, "1.003") > 0 or string.find(greetline, "1.004") > 0:


@@ -1514,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
            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.
 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.


@@ -1530,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.
 
 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 + """
 """
            if string.find(greetline, "IMAP4rev1") > 0:
                warnings = warnings + """