Fixed rhbz#1696963

This commit is contained in:
Alexander Bokovoy 2019-04-06 23:00:21 +03:00
parent 7987809d8d
commit 21ff3cd3b5
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From 4df3d5642d911ccf47c456ab40cb44831cad043d Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy@redhat.com>
Date: Sat, 6 Apr 2019 22:54:42 +0300
Subject: [PATCH] Remove DsInstance.request_service_keytab as it is not needed
anymore
DsInstance.request_service_keytab() used to configure
/etc/sysconfig/dirsrv which is not needed anymore with 389-ds-base
1.4.1.2. Thus, the method became indistinguishable from the parent and
can be removed completely.
---
ipaserver/install/dsinstance.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 5eebdb09b..8240e3043 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -1352,14 +1352,6 @@ class DsInstance(service.Service):
if self.domainlevel is not None:
self._ldap_mod("domainlevel.ldif", self.sub_dict)
- def request_service_keytab(self):
- super(DsInstance, self).request_service_keytab()
-
- # Configure DS to use the keytab
- vardict = {"KRB5_KTNAME": self.keytab}
- ipautil.config_replace_variables(paths.SYSCONFIG_DIRSRV,
- replacevars=vardict)
-
def write_certmap_conf(realm, ca_subject):
"""(Re)write certmap.conf with given CA subject DN."""
--
2.21.0

View File

@ -130,7 +130,7 @@
Name: %{package_name}
Version: %{IPA_VERSION}
Release: 7%{?dist}
Release: 8%{?dist}
Summary: The Identity, Policy and Audit system
License: GPLv3+
@ -143,6 +143,7 @@ Patch0003: fedora-30-samba4-remove-dep-on-talloc_strackframe-memory.patch
Patch0004: fedora-30-nfs-utils-fixes.patch
Patch0005: fedora-30-support-samba-4-10.patch
Patch0006: fedora-30-move-ds-systemd-snippet.patch
Patch0007: fedora-30-remove_dsinstance.request_service_keytab.patch
# For the timestamp trick in patch application
BuildRequires: diffstat
@ -1351,6 +1352,9 @@ fi
%changelog
* Sat Apr 06 2019 Alexander Bokovoy <abokovoy@redhat.com> - 4.7.2-8
- Fixed: rhbz#1696963 (Failed to install replica)
* Sat Apr 06 2019 Alexander Bokovoy <abokovoy@redhat.com> - 4.7.2-7
- Support Samba 4.10
- Support 389-ds 1.4.1.2-2.fc30 or later