diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-10-16 11:11:26 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-10-17 08:59:13 +0200 |
| commit | 8222799b9137d8ec1cd6d7e6a7a036b77d4a59c8 (patch) | |
| tree | 6e73dee04848d43eed0fd287d54c27b031f39345 | |
| parent | 92331c0074465b5c105973086467fa17a3d6d957 (diff) | |
| download | freeipa-8222799b9137d8ec1cd6d7e6a7a036b77d4a59c8.tar.gz freeipa-8222799b9137d8ec1cd6d7e6a7a036b77d4a59c8.tar.xz freeipa-8222799b9137d8ec1cd6d7e6a7a036b77d4a59c8.zip | |
Don't configure a reverse zone if not desired in interactive installer.
A reverse zone was always configured in the interactive installer
even if you answered "no" to the reverse zone question. The only way
to not confiugre it was the --no-reverse option.
https://fedorahosted.org/freeipa/ticket/3161
| -rwxr-xr-x | install/tools/ipa-dns-install | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 84d1bdc2e..b0c20c533 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -213,8 +213,8 @@ def main(): else: reverse_zone = bindinstance.find_reverse_zone(ip) if reverse_zone is None and not options.no_reverse: - reverse_zone = util.get_reverse_zone_default(ip) if not options.unattended and bindinstance.create_reverse(): + reverse_zone = util.get_reverse_zone_default(ip) reverse_zone = bindinstance.read_reverse_zone(reverse_zone, ip) if reverse_zone is not None: diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 33e1c257f..cc25fb855 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -816,8 +816,8 @@ def main(): if options.reverse_zone: reverse_zone = bindinstance.normalize_zone(options.reverse_zone) elif not options.no_reverse: - reverse_zone = util.get_reverse_zone_default(ip) if not options.unattended and bindinstance.create_reverse(): + reverse_zone = util.get_reverse_zone_default(ip) reverse_zone = bindinstance.read_reverse_zone(reverse_zone, ip) if reverse_zone is not None: @@ -839,7 +839,7 @@ def main(): print "Forwarders: %s" % ("No forwarders" if not dns_forwarders \ else ", ".join([str(ip) for ip in dns_forwarders])) print "Reverse zone: %s" % ("No reverse zone" if options.no_reverse \ - else reverse_zone) + or reverse_zone is None else reverse_zone) print if not options.unattended and not user_input("Continue to configure the system with these values?", False): |