7056e92461
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/freeipa.git#41b946dfeb35544f4011cf5777ba33fd98d11f72
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 8b2002cc7e2e0400e1afa3a21963a22947c7a908 Mon Sep 17 00:00:00 2001
|
|
From: Christian Heimes <cheimes@redhat.com>
|
|
Date: Tue, 29 Sep 2020 10:39:01 +0200
|
|
Subject: [PATCH] configure_dns_resolver: call self.restore_context
|
|
|
|
Use the platform implementation of restore_context() instead of the base
|
|
implementation.
|
|
|
|
Fixes: https://pagure.io/freeipa/issue/8518
|
|
Signed-off-by: Christian Heimes <cheimes@redhat.com>
|
|
---
|
|
ipaplatform/base/tasks.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ipaplatform/base/tasks.py b/ipaplatform/base/tasks.py
|
|
index adf320b700..4387e0e12f 100644
|
|
--- a/ipaplatform/base/tasks.py
|
|
+++ b/ipaplatform/base/tasks.py
|
|
@@ -340,7 +340,7 @@ def configure_dns_resolver(self, nameservers, searchdomains, *,
|
|
os.mkdir(confd)
|
|
# owned by root, readable by systemd-resolve user
|
|
os.chmod(confd, 0o755)
|
|
- tasks.restore_context(confd, force=True)
|
|
+ self.restore_context(confd, force=True)
|
|
|
|
cfg = RESOLVE1_IPA_CONF.format(
|
|
searchdomains=" ".join(searchdomains)
|
|
@@ -349,7 +349,7 @@ def configure_dns_resolver(self, nameservers, searchdomains, *,
|
|
os.fchmod(f.fileno(), 0o644)
|
|
f.write(cfg)
|
|
|
|
- tasks.restore_context(
|
|
+ self.restore_context(
|
|
paths.SYSTEMD_RESOLVED_IPA_CONF, force=True
|
|
)
|
|
|