summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2014-07-23 14:40:39 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-07-28 17:42:38 +0200
commit42d035f64c4d41bbae5fe061805b2de6febe2c7e (patch)
treeed5bbc3aacd782010d8ff3e89bb2814b051487ec
parent00309f8e424dfe814f6b69dd69844001ccce7ec5 (diff)
downloadfreeipa-42d035f64c4d41bbae5fe061805b2de6febe2c7e.tar.gz
freeipa-42d035f64c4d41bbae5fe061805b2de6febe2c7e.tar.xz
freeipa-42d035f64c4d41bbae5fe061805b2de6febe2c7e.zip
FIX: named_enable_dnssec should verify if DNS is installed
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
-rw-r--r--install/tools/ipa-upgradeconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index 2fecc1404..54193e9e6 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -598,6 +598,11 @@ def named_enable_dnssec():
"""
Enable dnssec in named.conf
"""
+ if not bindinstance.named_conf_exists():
+ # DNS service may not be configured
+ root_logger.info('DNS is not configured')
+ return False
+
if not sysupgrade.get_upgrade_state('named.conf', 'dnssec_enabled'):
root_logger.info('[Enabling "dnssec-enable" configuration in DNS]')
try: