mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-23 15:40:01 -06:00
Fix two problems with ipa-replica-prepare
1. Fix a unicode() problem creating the DNS entries 2. Fix a strange NSS error when generating the certificates against a dogtag server. The NSS errors are quite strange. When generating the first certificate nss_shutdown() fails because the database isn't initialized yet but nss_is_initialized() returned True. The second pass fails because something is in use.
This commit is contained in:
parent
dab452442d
commit
16b8d62968
@ -267,7 +267,7 @@ def main():
|
||||
|
||||
if not options.ip_address:
|
||||
try:
|
||||
api.Command['dns_resolve'](replica_fqdn)
|
||||
api.Command['dns_resolve'](replica_fqdn.decode('utf-8'))
|
||||
except errors.NotFound:
|
||||
sys.exit("Neither an A nor AAAA record for host '%s' does not exist in DNS.\nUse the --ip-address option to add DNS entries for the replica." % replica_fqdn)
|
||||
|
||||
|
@ -126,7 +126,11 @@ class NSSConnection(httplib.HTTPConnection):
|
||||
if nss.nss_is_initialized():
|
||||
# close any open NSS database and use the new one
|
||||
ssl.clear_session_cache()
|
||||
try:
|
||||
nss.nss_shutdown()
|
||||
except NSPRError, e:
|
||||
# FIXME: errors shouldn't be raised here
|
||||
logging.debug('nss_shutdown: %s', str(e))
|
||||
nss.nss_init(dbdir)
|
||||
ssl.set_domestic_policy()
|
||||
nss.set_password_callback(self.password_callback)
|
||||
|
Loading…
Reference in New Issue
Block a user