URL: https://github.com/freeipa/freeipa/pull/5168 Author: tiran Title: #5168: [Backport][ipa-4-8] configure_dns_resolver: call self.restore_context Action: opened
PR body: """ This PR was opened automatically because PR #5162 was pushed to master and backport to ipa-4-8 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/5168/head:pr5168 git checkout pr5168
From 81580135c826968574f30cd03f49417941d311ae Mon Sep 17 00:00:00 2001 From: Christian Heimes <chei...@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 <chei...@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 )
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
