[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master] patches: really add fix-runuser-path.diff

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / dogtag-pki


Commits:
62e10fdb by Timo Aaltonen at 2020-12-10T17:36:48+02:00
patches: really add fix-runuser-path.diff

- - - - -


1 changed file:

- + debian/patches/fix-runuser-path.diff


Changes:

=====================================
debian/patches/fix-runuser-path.diff
=====================================
@@ -0,0 +1,39 @@
+diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py
+index 13550358e..cc4a2c6f2 100644
+--- a/base/server/python/pki/server/__init__.py
++++ b/base/server/python/pki/server/__init__.py
+@@ -317,7 +317,7 @@ class PKIServer(object):
+ 
+             # switch to systemd user if different from current user
+             if current_user != self.user:
+-                prefix.extend(['/usr/sbin/runuser', '-u', self.user, '--'])
++                prefix.extend(['/sbin/runuser', '-u', self.user, '--'])
+ 
+         java_path = os.getenv('PKI_JAVA_PATH')
+         java_home = self.config.get('JAVA_HOME')
+diff --git a/base/server/python/pki/server/instance.py b/base/server/python/pki/server/instance.py
+index 1cab39874..9be1aebfe 100644
+--- a/base/server/python/pki/server/instance.py
++++ b/base/server/python/pki/server/instance.py
+@@ -198,7 +198,7 @@ class PKIInstance(pki.server.PKIServer):
+ 
+                 # switch to systemd user if different from current user
+                 if current_user != self.user:
+-                    prefix.extend(['/usr/sbin/runuser', '-u', self.user, '--'])
++                    prefix.extend(['/sbin/runuser', '-u', self.user, '--'])
+ 
+             cmd = prefix + ['/usr/sbin/pki-server', 'upgrade']
+ 
+diff --git a/base/server/python/pki/server/subsystem.py b/base/server/python/pki/server/subsystem.py
+index 2e72b0b54..260106443 100644
+--- a/base/server/python/pki/server/subsystem.py
++++ b/base/server/python/pki/server/subsystem.py
+@@ -1432,7 +1432,7 @@ class PKISubsystem(object):
+             # switch to systemd user if different from current user
+             username = pwd.getpwuid(os.getuid()).pw_name
+             if username != self.instance.user:
+-                cmd.extend(['/usr/sbin/runuser', '-u', self.instance.user, '--'])
++                cmd.extend(['/sbin/runuser', '-u', self.instance.user, '--'])
+ 
+         if os.path.exists(java_path):
+             cmd.extend([java_path])



View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/62e10fdb4a904145b1b993eb3ea787cde0f680fe

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/62e10fdb4a904145b1b993eb3ea787cde0f680fe
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20201210/1ab91c0e/attachment-0001.html>