IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix NSS initialization errors during ipa-replica-prepare

Browse Source 
When enabling replication we make an SSL connection. I think the way
this goes is python-ldap -> openldap -> NSS. It may be a problem in
the openldap SSL client, maybe it isn't calling NSS_Shutdown(). In any
case if we use ldapi instead the problem goes away.

Back out the temporary code to ignore nss_shutdown errors.

ticket 965
This commit is contained in:
Rob Crittenden
2011-02-17 22:53:53 -05:00
parent b7700ea815
commit 7b71604521
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipapython/nsslib.py
View File

@@ -126,11 +126,7 @@ class NSSConnection(httplib.HTTPConnection):
if nss.nss_is_initialized(): if nss.nss_is_initialized():
# close any open NSS database and use the new one # close any open NSS database and use the new one
ssl.clear_session_cache() ssl.clear_session_cache()
try:
nss.nss_shutdown() nss.nss_shutdown()
except NSPRError, e:
# FIXME: errors shouldn't be raised here
logging.debug('nss_shutdown: %s', str(e))
nss.nss_init(dbdir) nss.nss_init(dbdir)
ssl.set_domestic_policy() ssl.set_domestic_policy()
nss.set_password_callback(self.password_callback) nss.set_password_callback(self.password_callback)

2
ipaserver/install/replication.py
View File

@@ -60,7 +60,7 @@ def enable_replication_version_checking(hostname, realm, dirman_passwd):
enabled then enable it and restart 389-ds. If it is enabled enabled then enable it and restart 389-ds. If it is enabled
the do nothing. the do nothing.
""" """
conn = ipaldap.IPAdmin(hostname, port=PORT, cacert=CACERT) conn = ipaldap.IPAdmin(hostname, realm=realm, ldapi=True)
if dirman_passwd: if dirman_passwd:
conn.do_simple_bind(bindpw=dirman_passwd) conn.do_simple_bind(bindpw=dirman_passwd)
else: else: