From 3ef991c83ea07ec368038789282acf9ef5b77c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Tue, 12 Oct 2021 01:27:44 +0200 Subject: [PATCH] Revert "Use system sslcacertfile by default" This reverts commit a4863b2f04adf25b9989bafbb9df21ea8b98a674. --- offlineimap/repository/IMAP.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/offlineimap/repository/IMAP.py b/offlineimap/repository/IMAP.py index ff0a3e2..5b29b21 100644 --- a/offlineimap/repository/IMAP.py +++ b/offlineimap/repository/IMAP.py @@ -321,15 +321,13 @@ class IMAPRepository(BaseRepository): def getsslcacertfile(self): """Determines CA bundle. - Returns path to the CA bundle. It is explicitely specified or - requested via "OS-DEFAULT" value (and we will search known - locations for the current OS and distribution). If it is not - specified, we will search it in the known locations. + Returns path to the CA bundle. It is either explicitely specified + or requested via "OS-DEFAULT" value (and we will search known + locations for the current OS and distribution). - If search route, via "OS-DEFAULT" or because is not specified, - yields nothing, we will throw an exception to make our callers - distinguish between not specified value and non-existent - default CA bundle. + If search via "OS-DEFAULT" route yields nothing, we will throw an + exception to make our callers distinguish between not specified + value and non-existent default CA bundle. It is also an error to specify non-existent file via configuration: it will error out later, but, perhaps, with less verbose explanation, @@ -340,10 +338,7 @@ class IMAPRepository(BaseRepository): xforms = [os.path.expanduser, os.path.expandvars, os.path.abspath] cacertfile = self.getconf_xform('sslcacertfile', xforms, None) # Can't use above cacertfile because of abspath. - conf_sslacertfile = self.getconf('sslcacertfile', None) - if conf_sslacertfile == "OS-DEFAULT" or \ - conf_sslacertfile is None or \ - conf_sslacertfile == '': + if self.getconf('sslcacertfile', None) == "OS-DEFAULT": cacertfile = get_os_sslcertfile() if cacertfile is None: searchpath = get_os_sslcertfile_searchpath()