External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: cleanup detection of const'ness of selinux ctx

Browse Source 
Commit 292d3f2d fixed the build with libselinux 2.3, but missed
some suggestions by eblake

https://www.redhat.com/archives/libvir-list/2014-May/msg00977.html

This patch changes the macro introduced in 292d3f2d to either be
empty in the case of newer libselinux, or contain 'const' in the
case of older libselinux.  The macro is then used directly in
tests/securityselinuxhelper.c.

(cherry picked from commit b109c09765)
This commit is contained in:
Jim Fehlig 2014-05-28 13:48:21 -06:00 committed by Eric Blake
parent 029bb09ca6
commit 091ab98aab
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
m4/virt-selinux.m4
View File

@ -29,19 +29,18 @@ AC_DEFUN([LIBVIRT_CHECK_SELINUX],[
if test "$with_selinux" = "yes"; then if test "$with_selinux" = "yes"; then
# libselinux changed signatures between 2.2 and 2.3 # libselinux changed signatures between 2.2 and 2.3
AC_CACHE_CHECK([for selinux setcon parameter type], [gt_cv_setcon_param], AC_CACHE_CHECK([for selinux setcon parameter type], [lv_cv_setcon_param],
[AC_COMPILE_IFELSE( [AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[[ [[
#include <selinux/selinux.h> #include <selinux/selinux.h>
int setcon(const security_context_t context); int setcon(char *context);
]])], ]])],
[gt_cv_setcon_param='security_context_t'], [lv_cv_setcon_const=''],
[gt_cv_setcon_param='const char*'])]) [lv_cv_setcon_const='const'])])
if test "$gt_cv_setcon_param" = 'const char*'; then AC_DEFINE_UNQUOTED([VIR_SELINUX_CTX_CONST], [$lv_cv_setcon_const],
AC_DEFINE_UNQUOTED([SELINUX_CTX_CHAR_PTR], 1, [Define to empty or 'const' depending on how SELinux qualifies its
[SELinux uses newer char * for security context]) security context parameters])
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

24
tests/securityselinuxhelper.c
View File

@ -109,30 +109,18 @@ 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(VIR_SELINUX_CTX_CONST char *context)
int setcon_raw(const char *context)
#else
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(VIR_SELINUX_CTX_CONST char *context)
int setcon(const char *context)
#else
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, VIR_SELINUX_CTX_CONST char *con)
int setfilecon_raw(const char *path, const char *con)
#else
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/")) {
@ -143,11 +131,7 @@ 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, VIR_SELINUX_CTX_CONST char *con)
int setfilecon(const char *path, const char *con)
#else
int setfilecon(const char *path, security_context_t con)
#endif
{ {
return setfilecon_raw(path, con); return setfilecon_raw(path, con);
} }