mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/selinux-relabel: generalize setfiles_has_m_option()

Browse Source 
Allow the caller to pass in the option to check for, and to store the
result in a (usually static) variable of their choice.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1794518
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20220511122345.14208-2-lersek@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
(cherry picked from commit 5345d42635)
This commit is contained in:
Laszlo Ersek
2022-05-11 14:23:44 +02:00
committed by Richard W.M. Jones
parent e30ac34f0b
commit bba14f9cfb
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
daemon/selinux-relabel.c
View File

@@ -38,17 +38,19 @@ optgroup_selinuxrelabel_available (void)
}
static int
setfiles_has_m_option (void)
setfiles_has_option (int *flag, char opt_char)
{
static int flag = -1;
CLEANUP_FREE char *err = NULL;
if (flag == -1) {
ignore_value (command (NULL, &err, "setfiles", "-m", NULL));
flag = err && strstr (err, /* "invalid option -- " */ "'m'") == NULL;
if (*flag == -1) {
char option[] = { '-', opt_char, '\0' }; /* "-X" */
char err_opt[] = { '\'', opt_char, '\'', '\0'}; /* "'X'" */
ignore_value (command (NULL, &err, "setfiles", option, NULL));
*flag = err && strstr (err, /* "invalid option -- " */ err_opt) == NULL;
}
return flag;
return *flag;
}
/* Takes optional arguments, consult optargs_bitmask. */
@@ -56,6 +58,7 @@ int
do_selinux_relabel (const char *specfile, const char *path,
int force)
{
static int flag_m = -1;
const char *argv[MAX_ARGS];
CLEANUP_FREE char *s_dev = NULL, *s_proc = NULL, *s_selinux = NULL,
*s_sys = NULL, *s_specfile = NULL, *s_path = NULL;
@@ -101,7 +104,7 @@ do_selinux_relabel (const char *specfile, const char *path,
* setfiles puts all the mountpoints on the excludes list for no
* useful reason (RHBZ#1433577).
*/
if (setfiles_has_m_option ())
if (setfiles_has_option (&flag_m, 'm'))
ADD_ARG (argv, i, "-m");
/* Relabelling in a chroot. */