Package: offlineimap
Version: 6.3.4-1
Severity: wishlist
Tags: patch

Dear Maintainer,

I need to connect to a badly configured server that advertises STARTTLS
but is not properly configured for it :(

So I created an option 'tls' which allows me to disable the use of
STARTTLS for this server.

A patch against the above version of offlineimap is enclosed. It may
also work with minor changes against the more recent version.

Regards,

Kapil.

*** End of the template - remove these lines ***


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages offlineimap depends on:
ii  python          2.7.3~rc2-1
ii  python-support  1.0.14

offlineimap recommends no packages.

Versions of packages offlineimap suggests:
ii  doc-base         0.10.4
pn  python-kerberos  <none>

-- no debconf information
diff -ur ./imapserver.py /usr/share/pyshared/offlineimap/./imapserver.py
--- ./imapserver.py	2012-07-13 20:22:52.568204625 +0530
+++ /usr/share/pyshared/offlineimap/./imapserver.py	2011-08-11 01:14:58.000000000 +0530
@@ -46,7 +46,7 @@
     GSS_STATE_WRAP = 1
     def __init__(self, config, reposname,
                  username = None, password = None, hostname = None,
-                 port = None, ssl = 1, tls = 1, maxconnections = 1, tunnel = None,
+                 port = None, ssl = 1, maxconnections = 1, tunnel = None,
                  reference = '""', sslclientcert = None, sslclientkey = None,
                  sslcacertfile = None, idlefolders = []):
         self.ui = getglobalui()
@@ -60,7 +60,6 @@
         self.tunnel = tunnel
         self.port = port
         self.usessl = ssl
-        self.usetls = tls
         self.sslclientcert = sslclientcert
         self.sslclientkey = sslclientkey
         self.sslcacertfile = sslcacertfile
@@ -240,7 +239,7 @@
 
                         if not self.gssapi:
                             if 'STARTTLS' in imapobj.capabilities and not\
-                                    self.usessl and self.usetls:
+                                    self.usessl:
                                 self.ui.debug('imap',
                                               'Using STARTTLS connection')
                                 imapobj.starttls()
@@ -502,7 +501,6 @@
             user = self.repos.getuser()
             port = self.repos.getport()
             ssl = self.repos.getssl()
-            tls = self.repos.gettls()
             sslclientcert = self.repos.getsslclientcert()
             sslclientkey = self.repos.getsslclientkey()
             sslcacertfile = self.repos.getsslcacertfile()
@@ -525,7 +523,7 @@
             if not password:
                 password = self.repos.getpassword()
             IMAPServer.__init__(self, self.config, self.repos.getname(),
-                                user, password, host, port, ssl, tls,
+                                user, password, host, port, ssl,
                                 self.repos.getmaxconnections(),
                                 reference = reference,
                                 idlefolders = idlefolders,
diff -ur ./repository/Gmail.py /usr/share/pyshared/offlineimap/./repository/Gmail.py
--- ./repository/Gmail.py	2012-07-13 20:24:24.516208876 +0530
+++ /usr/share/pyshared/offlineimap/./repository/Gmail.py	2011-08-11 01:14:58.000000000 +0530
@@ -54,9 +54,6 @@
     def getssl(self):
         return 1
 
-    def gettls(self):
-        return 1
-
     def getpreauthtunnel(self):
         return None
 
diff -ur ./repository/IMAP.py /usr/share/pyshared/offlineimap/./repository/IMAP.py
--- ./repository/IMAP.py	2012-07-13 20:09:32.384167653 +0530
+++ /usr/share/pyshared/offlineimap/./repository/IMAP.py	2011-08-11 01:14:58.000000000 +0530
@@ -162,9 +162,6 @@
     def getssl(self):
         return self.getconfboolean('ssl', 0)
 
-    def gettls(self):
-        return self.getconfboolean('tls', 0)
-
     def getsslclientcert(self):
         return self.getconf('sslclientcert', None)
 

Reply via email to