summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-07-04 18:43:08 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-08-20 16:18:59 +0200
commit809123ab0224b14e360428188837d2555f954297 (patch)
tree83f08c8e3f175c87d7460e1f1860e56836cfab3b /ipaserver
parent59c4aba883edcc26d42a490ed7f34662067305e0 (diff)
downloadfreeipa-809123ab0224b14e360428188837d2555f954297.tar.gz
freeipa-809123ab0224b14e360428188837d2555f954297.tar.xz
freeipa-809123ab0224b14e360428188837d2555f954297.zip
Ignore empty mod error when updating DS SSL config in ipa-server-certinstall.
https://fedorahosted.org/freeipa/ticket/3641
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/ipa_server_certinstall.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py
index 8eff3ee16..b20701774 100644
--- a/ipaserver/install/ipa_server_certinstall.py
+++ b/ipaserver/install/ipa_server_certinstall.py
@@ -27,7 +27,7 @@ import pwd
from ipapython import admintool
from ipapython.dn import DN
from ipapython.ipautil import user_input, write_tmp_file
-from ipalib import api
+from ipalib import api, errors
from ipaserver.install import certs, dsinstance, httpinstance, installutils
from ipaserver.plugins.ldap2 import ldap2
@@ -115,7 +115,10 @@ class ServerCertInstall(admintool.AdminTool):
entry = conn.make_entry(DN(('cn', 'RSA'), ('cn', 'encryption'),
('cn', 'config')),
nssslpersonalityssl=[server_cert])
- conn.update_entry(entry)
+ try:
+ conn.update_entry(entry)
+ except errors.EmptyModlist:
+ pass
conn.disconnect()