IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-13 09:41:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix dns_is_enabled() API command to throw exceptions as appropriate

Browse Source 
Previously the command returned False whenever an exception occured
which caused installed to continue even when there was a problem with
LDAP connection.

https://fedorahosted.org/freeipa/ticket/5564

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Petr Spacek 2016-01-07 16:17:24 +01:00 committed by Martin Basti
parent aab190cc5d
commit 17a4a29c25
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipalib/plugins/dns.py
View File

@ -4266,16 +4266,14 @@ class dns_is_enabled(Command):
dns_enabled = False dns_enabled = False
try: try:
ent = ldap.find_entries(filter=self.filter, base_dn=self.base_dn) ldap.find_entries(filter=self.filter, base_dn=self.base_dn)
if len(ent): dns_enabled = True
dns_enabled = True except errors.EmptyResult:
except Exception as e: dns_enabled = False
pass
return dict(result=dns_enabled, value=pkey_to_value(None, options)) return dict(result=dns_enabled, value=pkey_to_value(None, options))
@register() @register()
class dnsconfig(LDAPObject): class dnsconfig(LDAPObject):
""" """