diff options
author | Sumit Bose <sbose@redhat.com> | 2012-10-04 12:40:33 +0200 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-10-04 22:15:36 -0400 |
commit | 2eee4ce83d351b88fa1d0342d814e34f7edeaea0 (patch) | |
tree | 948d9f94d75ddccdb583109819fdd975c1c861a5 /ipaserver | |
parent | 0d82862066c674da8927c41e33ce17d2eae713e0 (diff) | |
download | freeipa-2eee4ce83d351b88fa1d0342d814e34f7edeaea0.tar.gz freeipa-2eee4ce83d351b88fa1d0342d814e34f7edeaea0.tar.xz freeipa-2eee4ce83d351b88fa1d0342d814e34f7edeaea0.zip |
ipa-adtrust-install: print list of needed SRV records
If --no-msdcs is given on the command line all needed SRV records will
be printed.
Fixes https://fedorahosted.org/freeipa/ticket/3019
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/install/adtrustinstance.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 85be341b8..3f3924eb3 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -467,13 +467,18 @@ class ADTRUSTInstance(service.Service): ".dc._msdcs") err_msg = None - ret = api.Command['dns_is_enabled']() - if not ret['result']: - err_msg = "DNS management was not enabled at install time." + + if self.no_msdcs: + err_msg = '--no-msdcs was given, special DNS service records ' \ + 'are not added to local DNS server' else: - if not dns_zone_exists(zone): - err_msg = "DNS zone %s cannot be managed " \ - "as it is not defined in IPA" % zone + ret = api.Command['dns_is_enabled']() + if not ret['result']: + err_msg = "DNS management was not enabled at install time." + else: + if not dns_zone_exists(zone): + err_msg = "DNS zone %s cannot be managed " \ + "as it is not defined in IPA" % zone if err_msg: self.print_msg(err_msg) @@ -724,9 +729,8 @@ class ADTRUSTInstance(service.Service): self.step("activating sidgen plugin and task", self.__add_sidgen_module) self.step("activating extdom plugin", self.__add_extdom_module) self.step("configuring smbd to start on boot", self.__enable) - if not self.no_msdcs: - self.step("adding special DNS service records", \ - self.__add_dns_service_records) + self.step("adding special DNS service records", \ + self.__add_dns_service_records) self.step("restarting Directory Server to take MS PAC and LDAP plugins changes into account", \ self.__restart_dirsrv) self.step("adding fallback group", self.__add_fallback_group) |