diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-09-29 14:51:35 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-10-08 10:11:49 -0400 |
| commit | 71a032db19fcebfeb5f258f6855987749e3a4e21 (patch) | |
| tree | 0c8670afeda14e7cb0ba9f1cfcf9a9db4914274b /ipaserver | |
| parent | 90e716460e2e1acf95a74370d5e4dfd9f9138bcf (diff) | |
| download | freeipa-71a032db19fcebfeb5f258f6855987749e3a4e21.tar.gz freeipa-71a032db19fcebfeb5f258f6855987749e3a4e21.tar.xz freeipa-71a032db19fcebfeb5f258f6855987749e3a4e21.zip | |
Detect if DNS is already configured in IPA, or if IPA is not yet installed.
ipa-dns-manage could fail in very odd ways depending on the current
configuration of the server. Handle things a bit better.
ticket 210
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index a6b49003..4e63e7e3 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -74,8 +74,11 @@ def dns_container_exists(fqdn, realm): else: return True - server = ldap.initialize("ldap://" + fqdn) - server.simple_bind_s() + try: + server = ldap.initialize("ldap://" + fqdn) + server.simple_bind_s() + except ldap.SERVER_DOWN: + raise RuntimeError('LDAP server on %s is not responding. Is IPA installed?' % fqdn) suffix = util.realm_to_suffix(realm) ret = object_exists("cn=dns,%s" % suffix) |