URL: https://github.com/freeipa/freeipa/pull/2488 Author: tiran Title: #2488: [Backport][ipa-4-7] Replace hard-coded interpreter with sys.executable Action: opened
PR body: """ This PR was opened automatically because PR #2485 was pushed to master and backport to ipa-4-7 is required. """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2488/head:pr2488 git checkout pr2488
From 32e8d1484fb45f8c3f18a40f3d856248a7f139ab Mon Sep 17 00:00:00 2001 From: Christian Heimes <chei...@redhat.com> Date: Wed, 24 Oct 2018 16:08:16 +0200 Subject: [PATCH] Replace hard-coded interpreter with sys.executable Instead of hard-coding python3, the smart card advise script now uses the current executable path from sys.executable as interpreter. Fixes: https://pagure.io/freeipa/issue/7741 Signed-off-by: Christian Heimes <chei...@redhat.com> --- ipaserver/advise/plugins/smart_card_auth.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ipaserver/advise/plugins/smart_card_auth.py b/ipaserver/advise/plugins/smart_card_auth.py index 2f2e7aec92..97e23303b0 100644 --- a/ipaserver/advise/plugins/smart_card_auth.py +++ b/ipaserver/advise/plugins/smart_card_auth.py @@ -4,6 +4,8 @@ from __future__ import absolute_import +import sys + from ipalib.plugable import Registry from ipaplatform import services from ipaplatform.paths import paths @@ -186,9 +188,9 @@ def restart_httpd(self): def record_httpd_ocsp_status(self): self.log.comment('store the OCSP upgrade state') self.log.command( - "python3 -c 'from ipaserver.install import sysupgrade; " + "{} -c 'from ipaserver.install import sysupgrade; " "sysupgrade.set_upgrade_state(\"httpd\", " - "\"{}\", True)'".format(OCSP_ENABLED)) + "\"{}\", True)'".format(sys.executable, OCSP_ENABLED)) def check_and_enable_pkinit(self): self.log.comment('check whether PKINIT is configured on the master') @@ -310,10 +312,10 @@ def run_authselect_to_configure_smart_card_auth(self): def configure_pam_cert_auth(self): self.log.comment('Set pam_cert_auth=True in /etc/sssd/sssd.conf') self.log.command( - "python3 -c 'from SSSDConfig import SSSDConfig; " + "{} -c 'from SSSDConfig import SSSDConfig; " "c = SSSDConfig(); c.import_config(); " "c.set(\"pam\", \"pam_cert_auth\", \"True\"); " - "c.write()'") + "c.write()'".format(sys.executable)) def restart_sssd(self): self.log.command('systemctl restart sssd.service')
_______________________________________________ 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://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org
