From ea881946f461286a4b2bc83409cb959a52dd89ad Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 23 Jan 2009 09:24:17 +0000
Subject: [PATCH] don't fail when we fail to open a certificate file. Fixes
#4722
---
src/common/xmpp/tls_nb.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py
index 9e5a75ccf3..cebd7d47db 100644
--- a/src/common/xmpp/tls_nb.py
+++ b/src/common/xmpp/tls_nb.py
@@ -302,7 +302,11 @@ class NonBlockingTLS(PlugIn):
def _load_cert_file(self, cert_path, cert_store, logg=True):
if not os.path.isfile(cert_path):
return
- f = open(cert_path)
+ try:
+ f = open(cert_path)
+ except IOError, e:
+ log.warning('Unable to open certificate file %s: %s' % \
+ (cert_path, str(e)))
lines = f.readlines()
i = 0
begin = -1
--
GitLab