Verify current domain with user during installation

Use that domain when creating replicas

Resolves 432066

4 files changed, 13 insertions, 17 deletions

diff --git a/ipa-server/ipaserver/bindinstance.py b/ipa-server/ipaserver/bindinstance.py
index 1970c1efd..c52703c07 100644
--- a/ipa-server/ipaserver/bindinstance.py
+++ b/ipa-server/ipaserver/bindinstance.py
@@ -37,12 +37,12 @@ class BindInstance(service.Service):
         self.realm = None
         self.sub_dict = None
 
-    def setup(self, fqdn, ip_address, realm_name):
+    def setup(self, fqdn, ip_address, realm_name, domain_name):
         self.fqdn = fqdn
         self.ip_address = ip_address
         self.realm = realm_name
-        self.domain = fqdn[fqdn.find(".")+1:]
-        self.host = fqdn[:fqdn.find(".")]
+        self.domain = domain_name
+        self.host = domain_name[:domain_name.find(".")]
 
         self.__setup_sub_dict()
 
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py
index 573c633d7..b9d6daf94 100644
--- a/ipa-server/ipaserver/dsinstance.py
+++ b/ipa-server/ipaserver/dsinstance.py
@@ -109,14 +109,14 @@ class DsInstance(service.Service):
         self.domain = None
         self.pkcs12_info = None
 
-    def create_instance(self, ds_user, realm_name, host_name, dm_password, pkcs12_info=None):
+    def create_instance(self, ds_user, realm_name, host_name, domain_name, dm_password, pkcs12_info=None):
         self.ds_user = ds_user
         self.realm_name = realm_name.upper()
         self.serverid = realm_to_serverid(self.realm_name)
         self.suffix = realm_to_suffix(self.realm_name)
         self.host_name = host_name
         self.dm_password = dm_password
-        self.domain = host_name[host_name.find(".")+1:]
+        self.domain = domain_name
         self.pkcs12_info = pkcs12_info
         self.__setup_sub_dict()
         
diff --git a/ipa-server/ipaserver/httpinstance.py b/ipa-server/ipaserver/httpinstance.py
index 1991da311..17532ddb0 100644
--- a/ipa-server/ipaserver/httpinstance.py
+++ b/ipa-server/ipaserver/httpinstance.py
@@ -55,10 +55,10 @@ class HTTPInstance(service.Service):
     def __init__(self):
         service.Service.__init__(self, "httpd")
 
-    def create_instance(self, realm, fqdn, autoconfig=True, pkcs12_info=None):
+    def create_instance(self, realm, fqdn, domain_name, autoconfig=True, pkcs12_info=None):
         self.fqdn = fqdn
         self.realm = realm
-        self.domain = fqdn[fqdn.find(".")+1:]
+        self.domain = domain_name
         self.pkcs12_info = pkcs12_info
         self.sub_dict = { "REALM" : realm, "FQDN": fqdn, "DOMAIN" : self.domain }
         
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index 638294dcf..9d0a25799 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -48,10 +48,6 @@ import pyasn1.codec.ber.decoder
 import struct
 import base64
 
-def host_to_domain(fqdn):
-    s = fqdn.split(".")
-    return ".".join(s[1:])
-
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
         pattern = "^[\s#]*%s\s*=\s*%s\s*" % (re.escape(key), re.escape(val))
@@ -92,13 +88,13 @@ class KrbInstance(service.Service):
 
         self.kpasswd = KpasswdInstance()
 
-    def __common_setup(self, ds_user, realm_name, host_name, admin_password):
+    def __common_setup(self, ds_user, realm_name, host_name, domain_name, admin_password):
         self.ds_user = ds_user
         self.fqdn = host_name        
         self.realm = realm_name.upper()
         self.host = host_name.split(".")[0]
         self.ip = socket.gethostbyname(host_name)
-        self.domain = host_to_domain(host_name)        
+        self.domain = domain_name
         self.suffix = ipautil.realm_to_suffix(self.realm)
         self.kdc_password = ipautil.ipa_generate_password()
         self.admin_password = admin_password
@@ -124,10 +120,10 @@ class KrbInstance(service.Service):
         self.step("starting the KDC", self.__start_instance)
         self.step("configuring KDC to start on boot", self.__enable)
 
-    def create_instance(self, ds_user, realm_name, host_name, admin_password, master_password):
+    def create_instance(self, ds_user, realm_name, host_name, domain_name, admin_password, master_password):
         self.master_password = master_password
 
-        self.__common_setup(ds_user, realm_name, host_name, admin_password)
+        self.__common_setup(ds_user, realm_name, host_name, domain_name, admin_password)
 
         self.step("setting KDC account password", self.__configure_kdc_account_password)
         self.step("adding sasl mappings to the directory", self.__configure_sasl_mappings)
@@ -146,10 +142,10 @@ class KrbInstance(service.Service):
 
         self.kpasswd.create_instance()
 
-    def create_replica(self, ds_user, realm_name, host_name, admin_password, ldap_passwd_filename):
+    def create_replica(self, ds_user, realm_name, host_name, domain_name, admin_password, ldap_passwd_filename):
         self.__copy_ldap_passwd(ldap_passwd_filename)
 
-        self.__common_setup(ds_user, realm_name, host_name, admin_password)
+        self.__common_setup(ds_user, realm_name, host_name, domain_name, admin_password)
 
         self.step("adding sasl mappings to the directory", self.__configure_sasl_mappings)
         self.step("writing stash file from DS", self.__write_stash_from_ds)