summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-09-12 14:10:20 +0200
committerMartin Kosek <mkosek@redhat.com>2013-10-30 11:50:05 +0100
commit15618beab6b22558933e650a416dcd038c7ffc8a (patch)
treea4a6c18ce1c5fc58984d49e978ed7e43a17add4f /ipalib
parent62890ca69b242ac63dc40f5c007a08b92ed6f583 (diff)
downloadfreeipa.git-15618beab6b22558933e650a416dcd038c7ffc8a.tar.gz
freeipa.git-15618beab6b22558933e650a416dcd038c7ffc8a.tar.xz
freeipa.git-15618beab6b22558933e650a416dcd038c7ffc8a.zip
Fix invalid assumption NSS initialization check in SSLTransport
There code assumes that the `conn` in any Connection in the context is a ServerProxy. This might not always be the case: ldap2 uses a python-ldap connection here.
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/rpc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 81e7aa35..6d86f224 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -303,7 +303,9 @@ class SSLTransport(LanguageAwareTransport):
for value in context.__dict__.values():
if not isinstance(value, Connection):
continue
- if not isinstance(value.conn._ServerProxy__transport, SSLTransport):
+ if not isinstance(
+ getattr(value.conn, '_ServerProxy__transport', None),
+ SSLTransport):
continue
if hasattr(value.conn._ServerProxy__transport, 'dbdir') and \
value.conn._ServerProxy__transport.dbdir == dbdir: