From 53afb67537f6be9712f2cb23fb021d204b5182b0 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Fri, 23 May 2008 14:51:50 -0400
Subject: Fix the case where domain != lower(REALM) add the domain to the
 ipa.conf file for apps that need to know This should fix a bug in the replica
 setup

---
 ipa-server/ipa-install/ipa-replica-install |  9 +++++++++
 ipa-server/ipa-install/ipa-replica-prepare | 11 ++---------
 ipa-server/ipa-install/ipa-server-install  |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'ipa-server')

diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install
index a42c970ae..2b3751655 100644
--- a/ipa-server/ipa-install/ipa-replica-install
+++ b/ipa-server/ipa-install/ipa-replica-install
@@ -33,6 +33,7 @@ from ipaserver import version
 class ReplicaConfig:
     def __init__(self):
         self.realm_name = ""
+        self.domain_name = ""
         self.master_host_name = ""
         self.dirman_password = ""
         self.ds_user = ""
@@ -232,6 +233,14 @@ def main():
     install_krb(config)
     install_http(config)
 
+    # Create the config file
+    fd = open("/etc/ipa/ipa.conf", "w")
+    fd.write("[defaults]\n")
+    fd.write("server=" + config.host_name + "\n")
+    fd.write("realm=" + config.realm_name + "\n")
+    fd.write("domain=" + config.domain_name + "\n")
+    fd.close()
+
     # Create a Web Gui instance
     webgui = httpinstance.WebGuiInstance()
     webgui.create_instance()
diff --git a/ipa-server/ipa-install/ipa-replica-prepare b/ipa-server/ipa-install/ipa-replica-prepare
index 4090ad8a1..914557dc2 100644
--- a/ipa-server/ipa-install/ipa-replica-prepare
+++ b/ipa-server/ipa-install/ipa-replica-prepare
@@ -66,18 +66,11 @@ def get_realm_name():
 
 def get_domain_name():
     try:
-        conn = ipaldap.IPAdmin("127.0.0.1")
-        conn.simple_bind_s("", "")
-
-        context = conn.getEntry("", ldap.SCOPE_BASE, '(objectclass=*)', [ 'namingContexts' ])
-        conn.unbind()
+        ipa.config.init_config()
+        domain_name = ipa.config.config.get_domain()
     except Exception, e:
         return None
 
-    domain_name = context.getValue('namingContexts')
-    domain_name = domain_name.replace('dc=','')
-    domain_name = domain_name.replace(',','.')
-
     return domain_name
 
 def check_ipa_configuration(realm_name):
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index b979e9955..9b0baa24c 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -495,6 +495,7 @@ def main():
     fd.write("[defaults]\n")
     fd.write("server=" + host_name + "\n")
     fd.write("realm=" + realm_name + "\n")
+    fd.write("domain=" + domain_name + "\n")
     fd.close()
 
     # Create a Web Gui instance
-- 
cgit