diff options
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 6 | ||||
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 6 | ||||
| -rw-r--r-- | ipaserver/install/httpinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/krbinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/replication.py | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index ce316612..fa3864a2 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -395,7 +395,7 @@ class BindInstance(service.Service): self.domain = domain_name self.forwarders = forwarders self.host = fqdn.split(".")[0] - self.suffix = util.realm_to_suffix(self.realm) + self.suffix = ipautil.realm_to_suffix(self.realm) self.ntp = ntp self.reverse_zone = reverse_zone self.zone_refresh = zone_refresh @@ -614,7 +614,7 @@ class BindInstance(service.Service): self.realm = realm_name self.domain = domain_name self.host = fqdn.split(".")[0] - self.suffix = util.realm_to_suffix(self.realm) + self.suffix = ipautil.realm_to_suffix(self.realm) self.ntp = ntp self.reverse_zone = reverse_zone @@ -622,7 +622,7 @@ class BindInstance(service.Service): def remove_master_dns_records(self, fqdn, realm_name, domain_name): host = fqdn.split(".")[0] - suffix = util.realm_to_suffix(realm_name) + suffix = ipautil.realm_to_suffix(realm_name) zone = domain_name resource_records = ( diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 56b84fcd..af8d39aa 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -240,7 +240,7 @@ class CADSInstance(service.Service): if host_name and realm_name: self.principal = "dogtagldap/%s@%s" % (self.fqdn, self.realm_name) if realm_name: - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.__setup_sub_dict() else: self.suffix = None @@ -250,7 +250,7 @@ class CADSInstance(service.Service): subject_base=None): self.ds_port = ds_port self.realm_name = realm_name.upper() - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.fqdn = host_name self.dm_password = dm_password self.domain = domain_name diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 827f6913..359d7666 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -167,7 +167,7 @@ class DsInstance(service.Service): self.open_ports = [] self.run_init_memberof = True if realm_name: - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.__setup_sub_dict() else: self.suffix = None @@ -218,7 +218,7 @@ class DsInstance(service.Service): hbac_allow=True): self.realm_name = realm_name.upper() self.serverid = realm_to_serverid(self.realm_name) - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.fqdn = fqdn self.dm_password = dm_password self.domain = domain_name @@ -251,7 +251,7 @@ class DsInstance(service.Service): domain_name, dm_password, pkcs12_info=None): self.realm_name = realm_name.upper() self.serverid = realm_to_serverid(self.realm_name) - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.master_fqdn = master_fqdn self.fqdn = fqdn self.dm_password = dm_password diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index e1bbc30a..a1411511 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -62,7 +62,7 @@ class HTTPInstance(service.Service): self.realm = realm self.domain = domain_name self.dm_password = dm_password - self.suffix = util.realm_to_suffix(self.realm) + self.suffix = ipautil.realm_to_suffix(self.realm) self.pkcs12_info = pkcs12_info self.self_signed_ca = self_signed_ca self.principal = "HTTP/%s@%s" % (self.fqdn, self.realm) diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index f38ae9b4..2faf8e19 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -132,7 +132,7 @@ class KrbInstance(service.Service): self.host = host_name.split(".")[0] self.ip = socket.getaddrinfo(host_name, None, socket.AF_UNSPEC, socket.SOCK_STREAM)[0][4][0] self.domain = domain_name - self.suffix = util.realm_to_suffix(self.realm) + self.suffix = ipautil.realm_to_suffix(self.realm) self.kdc_password = ipautil.ipa_generate_password() self.admin_password = admin_password self.dm_password = admin_password diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 90b3691a..e803df8a 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -79,7 +79,7 @@ class LDAPUpdate: krbctx = krbV.default_context() try: self.realm = krbctx.default_realm - suffix = util.realm_to_suffix(self.realm) + suffix = ipautil.realm_to_suffix(self.realm) except krbV.Krb5Error: self.realm = None suffix = None diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index c8c5bc13..ed4caeb7 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -105,7 +105,7 @@ class ReplicationManager(object): self.dirman_passwd = dirman_passwd self.realm = realm self.starttls = starttls - tmp = util.realm_to_suffix(realm) + tmp = ipautil.realm_to_suffix(realm) self.suffix = str(DN(tmp)).lower() self.need_memberof_fixup = False |