From 905760acda2533560f4a779d1ef0a4b46ea97534 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Dec 18 2020 16:35:43 +0000 Subject: Drop "genhomedircon: check usepasswd" patch It tried to fix the correct behavior and broke usage of homedir_template --- diff --git a/0005-libsemanage-genhomedircon-check-usepasswd.patch b/0005-libsemanage-genhomedircon-check-usepasswd.patch deleted file mode 100644 index 30ce4ef..0000000 --- a/0005-libsemanage-genhomedircon-check-usepasswd.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 511f8bbf779e10152d5af491e8b6a408b8ad666c Mon Sep 17 00:00:00 2001 -From: Vit Mojzis -Date: Fri, 30 Oct 2020 17:42:17 +0100 -Subject: [PATCH] libsemanage/genhomedircon: check usepasswd - -Only add user homedir contexts when usepasswd = True - -Resolves: - # grep usepasswd /etc/selinux/semanage.conf - usepasswd=False - # useradd -Z unconfined_u -d /tmp test - # matchpathcon /tmp - /tmp unconfined_u:object_r:user_home_dir_t:s0 - -Signed-off-by: Vit Mojzis ---- - libsemanage/src/genhomedircon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsemanage/src/genhomedircon.c b/libsemanage/src/genhomedircon.c -index d08c88de99a7..18d3d99a1254 100644 ---- a/libsemanage/src/genhomedircon.c -+++ b/libsemanage/src/genhomedircon.c -@@ -1332,7 +1332,7 @@ static int write_context_file(genhomedircon_settings_t * s, FILE * out) - s->fallback->home = NULL; - } - } -- if (user_context_tpl || username_context_tpl) { -+ if ((s->usepasswd) && (user_context_tpl || username_context_tpl)) { - if (write_username_context(s, out, username_context_tpl, - s->fallback) != STATUS_SUCCESS) { - retval = STATUS_ERR; --- -2.29.2 - diff --git a/libsemanage.spec b/libsemanage.spec index 0e2c27f..8b9a8ff 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -14,7 +14,6 @@ Patch0001: 0001-libsemanage-Remove-legacy-and-duplicate-symbols.patch Patch0002: 0002-libsemanage-Drop-deprecated-functions.patch Patch0003: 0003-libsemanage-Bump-libsemanage.so-version.patch Patch0004: 0004-libsemanage-Fix-RESOURCE_LEAK-and-USE_AFTER_FREE-cov.patch -Patch0005: 0005-libsemanage-genhomedircon-check-usepasswd.patch # Patch list end URL: https://github.com/SELinuxProject/selinux/wiki Source1: semanage.conf