diff options
| -rwxr-xr-x | install/tools/ipa-replica-install | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-prepare | 1 | ||||
| -rw-r--r-- | ipaserver/install/krbinstance.py | 14 |
3 files changed, 0 insertions, 17 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index a7c28c1ad..0d6226280 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -129,7 +129,6 @@ def install_replica_ds(config): def install_krb(config, setup_pkinit=False): krb = krbinstance.KrbInstance() - kpasswd_filename = config.dir + "/kpasswd.keytab" #pkinit files pkcs12_info = None @@ -140,7 +139,6 @@ def install_krb(config, setup_pkinit=False): krb.create_replica(config.realm_name, config.master_host_name, config.host_name, config.domain_name, config.dirman_password, - kpasswd_filename, setup_pkinit, pkcs12_info) def install_ca_cert(config): diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index 647252e49..9f935262a 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -214,7 +214,6 @@ def copy_files(realm_name, dir): config_dir = dsinstance.config_dirname(dsinstance.realm_to_serverid(realm_name)) try: - shutil.copy("/var/kerberos/krb5kdc/kpasswd.keytab", dir + "/kpasswd.keytab") shutil.copy("/usr/share/ipa/html/ca.crt", dir + "/ca.crt") if ipautil.file_exists("/usr/share/ipa/html/preferences.html"): shutil.copy("/usr/share/ipa/html/preferences.html", dir + "/preferences.html") diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 1f499006e..8f2cf2c05 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -167,7 +167,6 @@ class KrbInstance(service.Service): self.step("adding default ACIs", self.__add_default_acis) self.step("creating a keytab for the directory", self.__create_ds_keytab) self.step("creating a keytab for the machine", self.__create_host_keytab) - self.step("exporting the kadmin keytab", self.__export_kadmin_changepw_keytab) self.step("adding the password extension to the directory", self.__add_pwd_extop_module) if setup_pkinit: self.step("creating X509 Certificate for PKINIT", self.__setup_pkinit) @@ -183,13 +182,11 @@ class KrbInstance(service.Service): def create_replica(self, realm_name, master_fqdn, host_name, domain_name, admin_password, - kpasswd_filename, setup_pkinit=False, pkcs12_info=None, self_signed_ca=False, subject_base=None): self.pkcs12_info = pkcs12_info self.self_signed_ca = self_signed_ca self.subject_base = subject_base - self.__copy_kpasswd_keytab(kpasswd_filename) self.master_fqdn = master_fqdn self.__common_setup(realm_name, host_name, domain_name, admin_password) @@ -211,11 +208,6 @@ class KrbInstance(service.Service): self.kpasswd = KpasswdInstance() self.kpasswd.create_instance('KPASSWD', self.fqdn, self.admin_password, self.suffix) - def __copy_kpasswd_keytab(self, filename): - self.fstore.backup_file("/var/kerberos/krb5kdc/kpasswd.keytab") - shutil.copy(filename, "/var/kerberos/krb5kdc/kpasswd.keytab") - os.chmod("/var/kerberos/krb5kdc/kpasswd.keytab", 0600) - def __enable(self): self.backup_state("enabled", self.is_enabled()) @@ -399,12 +391,6 @@ class KrbInstance(service.Service): self.move_service_to_host(host_principal) - def __export_kadmin_changepw_keytab(self): - installutils.kadmin_modprinc("kadmin/changepw", "+requires_preauth") - - self.fstore.backup_file("/var/kerberos/krb5kdc/kpasswd.keytab") - installutils.create_keytab("/var/kerberos/krb5kdc/kpasswd.keytab", "kadmin/changepw") - def __setup_pkinit(self): if self.self_signed_ca: ca_db = certs.CertDB(self.realm, |