External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 18:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix build with libselinux 2.3

Browse Source 
Several function signatures changed in libselinux 2.3, now taking
a 'const char *' instead of 'security_context_t'.  The latter is
defined in selinux/selinux.h as

  typedef char *security_context_t;

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 292d3f2d38e8faca075ababcb652f2e090b745b2)
This commit is contained in:
Cédric Bosdonnat 2014-05-28 14:44:08 +02:00 committed by Eric Blake
parent a5314b477b
commit 345b1893ae
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
m4/virt-selinux.m4
View File

@ -1,6 +1,6 @@
dnl The libselinux.so library dnl The libselinux.so library
dnl dnl
dnl Copyright (C) 2012-2013 Red Hat, Inc. dnl Copyright (C) 2012-2014 Red Hat, Inc.
dnl dnl
dnl This library is free software; you can redistribute it and/or dnl This library is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Lesser General Public dnl modify it under the terms of the GNU Lesser General Public
@ -28,6 +28,21 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
[with_selinux_mount=check]) [with_selinux_mount=check])
if test "$with_selinux" = "yes"; then if test "$with_selinux" = "yes"; then
# libselinux changed signatures between 2.2 and 2.3
AC_CACHE_CHECK([for selinux setcon parameter type], [gt_cv_setcon_param],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <selinux/selinux.h>
int setcon(const security_context_t context);
]])],
[gt_cv_setcon_param='security_context_t'],
[gt_cv_setcon_param='const char*'])])
if test "$gt_cv_setcon_param" = 'const char*'; then
AC_DEFINE_UNQUOTED([SELINUX_CTX_CHAR_PTR], 1,
[SELinux uses newer char * for security context])
fi
AC_MSG_CHECKING([SELinux mount point]) AC_MSG_CHECKING([SELinux mount point])
if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then if test "$with_selinux_mount" = "check" || test -z "$with_selinux_mount"; then
if test -d /sys/fs/selinux ; then if test -d /sys/fs/selinux ; then

16
tests/securityselinuxhelper.c
View File

@ -109,18 +109,30 @@ int getpidcon(pid_t pid, security_context_t *context)
return getpidcon_raw(pid, context); return getpidcon_raw(pid, context);
} }
#ifdef SELINUX_CTX_CHAR_PTR
int setcon_raw(const char *context)
#else
int setcon_raw(security_context_t context) int setcon_raw(security_context_t context)
#endif
{ {
return setenv("FAKE_CONTEXT", context, 1); return setenv("FAKE_CONTEXT", context, 1);
} }
#ifdef SELINUX_CTX_CHAR_PTR
int setcon(const char *context)
#else
int setcon(security_context_t context) int setcon(security_context_t context)
#endif
{ {
return setcon_raw(context); return setcon_raw(context);
} }
#ifdef SELINUX_CTX_CHAR_PTR
int setfilecon_raw(const char *path, const char *con)
#else
int setfilecon_raw(const char *path, security_context_t con) int setfilecon_raw(const char *path, security_context_t con)
#endif
{ {
const char *constr = con; const char *constr = con;
if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) { if (STRPREFIX(path, abs_builddir "/securityselinuxlabeldata/nfs/")) {
@ -131,7 +143,11 @@ int setfilecon_raw(const char *path, security_context_t con)
constr, strlen(constr), 0); constr, strlen(constr), 0);
} }
#ifdef SELINUX_CTX_CHAR_PTR
int setfilecon(const char *path, const char *con)
#else
int setfilecon(const char *path, security_context_t con) int setfilecon(const char *path, security_context_t con)
#endif
{ {
return setfilecon_raw(path, con); return setfilecon_raw(path, con);
} }