From 5d7606bff387bcc4c3c1eed72c195692dd964335 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: May 12 2011 13:18:34 +0000
Subject: Properly handle --no-reverse being passed on the CLI in interactive mode


If installing in interactive mode and --no-reverse is passed then the
reverse zone was still being created.

ticket 1152

---

diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 64f1577..49df7fe 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -290,9 +290,13 @@ def install_bind(config, options):
     if options.unattended:
         # In unattended mode just use the cmdline flag
         create_reverse = not options.no_reverse
-    elif not options.no_reverse:
-        # In interactive mode, if the flag was not explicitly specified, ask the user
-        create_reverse = bindinstance.create_reverse()
+    else:
+        if options.no_reverse:
+            create_reverse = False
+        else:
+            # In interactive mode, if the flag was not explicitly 
+            # specified, ask the user
+            create_reverse = bindinstance.create_reverse()
 
     bind.setup(config.host_name, ip_address, config.realm_name,
                config.domain_name, forwarders, options.conf_ntp, create_reverse)
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index d50dc61..00b1334 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -908,9 +908,13 @@ def main():
         if options.unattended:
             # In unattended mode just use the cmdline flag
             create_reverse = not options.no_reverse
-        elif not options.no_reverse:
-            # In interactive mode, if the flag was not explicitly specified, ask the user
-            create_reverse = bindinstance.create_reverse()
+        else:
+            if options.no_reverse:
+                create_reverse = False
+            else:
+                # In interactive mode, if the flag was not explicitly
+                # specified, ask the user
+                create_reverse = bindinstance.create_reverse()
 
     bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, options.conf_ntp, create_reverse, zonemgr=options.zonemgr)
     if options.setup_dns: