Attachment 1471131 Details for Bug 1609323 – Patch

[patch] Patch

0001-Check-for-existence-before-sourcing-config-file.patch (text/plain), 2.78 KB, created by Lon Hohberger on 2018-07-27 14:55:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2018-07-27 14:55:14 UTC

Size: 2.78 KB

patch

obsolete

>From c1928312ccdfe5731d8903c8598963ff5c2ebdc7 Mon Sep 17 00:00:00 2001
>From: Lon Hohberger <lhh@redhat.com>
>Date: Fri, 27 Jul 2018 10:38:48 -0400
>Subject: [PATCH] Check for existence before sourcing config file
>
>The "selinuxenabled" utility does this, but is called later
>in the script.
>
>Rather than rely on the behavior of the "selinuxenabled"
>utility never changing, it's cleaner to check for the existence
>of /etc/selinux/config prior to sourcing it.
>
>-e vs -f : the config file could (conceivably) be a symlink instead
>of a regular file; -e keeps it concise. Other file types (directory,
>socket, etc.) should produce an error.
>
>Another solution would be something like:
>
>  . /etc/selinux/config 2>/dev/null ||:
>
>(i.e. ignore errors if the file could not be sourced), but if the
>file was a directory (for some reason), I'd think we'd want to
>throw an error.
>
>Signed-off-by: Lon Hohberger <lhh@redhat.com>
>---
> rpm.macros | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/rpm.macros b/rpm.macros
>index 3aa1b3d9c..b2a7fb553 100644
>--- a/rpm.macros
>+++ b/rpm.macros
>@@ -28,7 +28,7 @@
> 
> # %selinux_modules_install [-s <policytype>] [-p <modulepriority>] module [module]...
> %selinux_modules_install("s:p:") \
>-. /etc/selinux/config \
>+[ -e /etc/selinux/config ] && . /etc/selinux/config \
> _policytype=%{-s*} \
> if [ -z "${_policytype}" ]; then \
>   _policytype="targeted" \
>@@ -41,7 +41,7 @@ fi \
> 
> # %selinux_modules_uninstall [-s <policytype>] [-p <modulepriority>] module [module]...
> %selinux_modules_uninstall("s:p:") \
>-. /etc/selinux/config \
>+[ -e /etc/selinux/config ] && . /etc/selinux/config \
> _policytype=%{-s*} \
> if [ -z "${_policytype}" ]; then \
>   _policytype="targeted" \
>@@ -56,7 +56,7 @@ fi \
> 
> # %selinux_relabel_pre [-s <policytype>]
> %selinux_relabel_pre("s:") \
>-. /etc/selinux/config \
>+[ -e /etc/selinux/config ] && . /etc/selinux/config \
> _policytype=%{-s*} \
> if [ -z "${_policytype}" ]; then \
>   _policytype="targeted" \
>@@ -69,7 +69,7 @@ fi \
> 
> # %selinux_relabel_post [-s <policytype>]
> %selinux_relabel_post("s:") \
>-. /etc/selinux/config \
>+[ -e /etc/selinux/config ] && . /etc/selinux/config \
> _policytype=%{-s*} \
> if [ -z "${_policytype}" ]; then \
>   _policytype="targeted" \
>@@ -84,7 +84,7 @@ fi \
> 
> # %selinux_set_booleans [-s <policytype>] boolean [boolean]...
> %selinux_set_booleans("s:") \
>-. /etc/selinux/config \
>+[ -e /etc/selinux/config ] && . /etc/selinux/config \
> _policytype=%{-s*} \
> if [ -z "${_policytype}" ]; then \
>   _policytype="targeted" \
>@@ -121,7 +121,7 @@ fi \
> 
> # %selinux_unset_booleans [-s <policytype>] boolean [boolean]...
> %selinux_unset_booleans("s:") \
>-. /etc/selinux/config \
>+[ -e /etc/selinux/config ] && . /etc/selinux/config \
> _policytype=%{-s*} \
> if [ -z "${_policytype}" ]; then \
>   _policytype="targeted" \
>-- 
>2.14.3
>

Actions: View | Diff

Attachments on bug 1609323: 1471131