policycoreutils/backport-restorecond-compatible-with-the-use-of-EUID.patch
yixiangzhike 29607618d1 backport patches from upstream
(cherry picked from commit 9139570c68657015f0e23d3d2a8bdbf9f3f8bc1f)
2023-12-15 08:29:39 +08:00

35 lines
1.1 KiB
Diff

From ca76a8813e9ac9536f09b5611b09b2b21064f984 Mon Sep 17 00:00:00 2001
From: Huizhao Wang <wanghuizhao1@huawei.com>
Date: Sat, 5 Aug 2023 15:06:50 +0800
Subject: [PATCH] restorecond: compatible with the use of EUID
The `EUID` does not exist in some shell environments. To ensure compatibility,
use `id -u` instead of `EUID` when `EUID` does not exist.
Signed-off-by: Huizhao Wang <wanghuizhao1@huawei.com>
Acked-by: Petr Lautrbach <lautrbach@redhat.com>
---
restorecond/restorecond.init | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/restorecond/restorecond.init b/restorecond/restorecond.init
index c1cbb247..4e71a2c6 100644
--- a/restorecond/restorecond.init
+++ b/restorecond/restorecond.init
@@ -29,7 +29,11 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin
[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 7
# Check that we are root ... so non-root users stop here
-test $EUID = 0 || exit 4
+if [ $EUID ]; then
+ test $EUID = 0 || exit 4
+else
+ test `id -u` = 0 || exit 4
+fi
test -x /usr/sbin/restorecond || exit 5
test -f /etc/selinux/restorecond.conf || exit 6
--
2.27.0