topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2025-03-07 10:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix redefinition of XATTR_NAME_SELINUX

Browse Source 
When the Kernel UAPI header is present, this error occurs:

external/selinux/libselinux/src/policy.h:7:9: warning: 'XATTR_NAME_SELINUX' macro redefined [-Wmacro-redefined]
\#define XATTR_NAME_SELINUX "security.selinux"
        ^
bionic/libc/kernel/uapi/linux/xattr.h:52:9: note: previous definition is here
\#define XATTR_NAME_SELINUX XATTR_SECURITY_PREFIX XATTR_SELINUX_SUFFIX

Just use the kernel UAPI version on that case.

Change-Id: I1b2d34e463477adaec227ac8c3364f1b9d49e997
Signed-off-by: William Roberts <william.c.roberts@intel.com>
This commit is contained in:
William Roberts 2016-09-21 16:59:27 -07:00 committed by Stephen Smalley
parent 7a72a88019
commit d5947256fa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libselinux/src/policy.h
View File

@ -3,8 +3,13 @@
/* Private definitions used internally by libselinux. */
/* xattr name for SELinux attributes. */
/*
* xattr name for SELinux attributes.
* This may have been exported via Kernel uapi header.
*/
#ifndef XATTR_NAME_SELINUX
#define XATTR_NAME_SELINUX "security.selinux"
#endif
/* Initial length guess for getting contexts. */
#define INITCONTEXTLEN 255