shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-11 20:58:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3196 from cgwalters/fix-sepolicy-public

Browse Source 
sepolicy: Fix publicity mismatch for ostree_sepolicy_host_enabled
This commit is contained in:
Colin Walters 2024-02-25 10:45:12 -05:00 committed by GitHub
commit 1b3ffe54e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-repo-checkout.c
View File

@ -195,7 +195,7 @@ create_file_copy_from_input_at (OstreeRepo *repo, OstreeRepoCheckoutAtOptions *o
g_autoptr (GVariant) modified_xattrs = NULL;
/* If we're doing SELinux labeling, prepare it */
if (sepolicy_enabled && ostree_sepolicy_host_enabled (options->sepolicy))
if (sepolicy_enabled && _ostree_sepolicy_host_enabled (options->sepolicy))
{
/* If doing sepolicy path-based labeling, we don't want to set the
* security.selinux attr via the generic xattr paths in either the symlink
@ -1045,7 +1045,7 @@ checkout_tree_at_recurse (OstreeRepo *self, OstreeRepoCheckoutAtOptions *options
};
/* If we're doing SELinux labeling, prepare it */
if (sepolicy_enabled && ostree_sepolicy_host_enabled (options->sepolicy))
if (sepolicy_enabled && _ostree_sepolicy_host_enabled (options->sepolicy))
{
/* We'll set the xattr via setfscreatecon(), so don't do it via generic xattrs below. */
modified_xattrs = _ostree_filter_selinux_xattr (xattrs);

2
src/libostree/ostree-sepolicy-private.h
View File

@ -36,4 +36,6 @@ gboolean _ostree_sepolicy_preparefscreatecon (OstreeSepolicyFsCreatecon *con, Os
GVariant *_ostree_filter_selinux_xattr (GVariant *xattrs);
gboolean _ostree_sepolicy_host_enabled (OstreeSePolicy *self);
G_END_DECLS

4
src/libostree/ostree-sepolicy.c
View File

@ -755,13 +755,13 @@ _ostree_filter_selinux_xattr (GVariant *xattrs)
}
/**
* ostree_sepolicy_host_enabled:
* _ostree_sepolicy_host_enabled:
* @self: Policy
*
* Return if the host has selinux enabled
*/
gboolean
ostree_sepolicy_host_enabled (OstreeSePolicy *self)
_ostree_sepolicy_host_enabled (OstreeSePolicy *self)
{
#ifdef HAVE_SELINUX
return cached_is_selinux_enabled ();

3
src/libostree/ostree-sepolicy.h
View File

@ -77,7 +77,4 @@ void ostree_sepolicy_fscreatecon_cleanup (void **unused);
#define ostree_cleanup_sepolicy_fscreatecon \
__attribute__ ((cleanup (ostree_sepolicy_fscreatecon_cleanup)))
_OSTREE_PUBLIC
gboolean ostree_sepolicy_host_enabled (OstreeSePolicy *self);
G_END_DECLS