summaryrefslogtreecommitdiff
path: root/lib/se-selinux.in.h
diff options
context:
space:
mode:
authorBernhard Voelker <mail@bernhard-voelker.de>2020-10-19 16:37:09 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2020-10-19 16:37:58 -0700
commita5578a71ef65a9aed1ccc254b9d9a07b0b46c1b0 (patch)
tree09850efe665811ee1bd9eb3f140cd998aa474c0e /lib/se-selinux.in.h
parent52ab50a7ebc469b542bca0063430db71aefb67af (diff)
downloadgnulib-a5578a71ef65a9aed1ccc254b9d9a07b0b46c1b0.tar.gz
selinux-at, selinux-h: port to SELinux 3.1
The new release finally deprecated the typedef 'security_context_t', see <https://github.com/SELinuxProject/selinux/commit/7a124ca275>. Use the simpler 'char *' instead. * lib/getfilecon.c (getfilecon): Adjust type of context parameter. (lgetfilecon): Likewise. (fgetfilecon): Likewise. (map_to_failure): Likewise. (rpl_getfilecon): Likewise. (rpl_lgetfilecon): Likewise. (rpl_fgetfilecon): Likewise. * lib/se-selinux.in.h (security_context_t): Remove typedef. (getcon): Adjust type of context parameter. (freecon): Likewise. (getfscreatecon): Likewise. (setfscreatecon): Likewise. (matchpathcon): Likewise. (getfilecon): Likewise. (lgetfilecon): Likewise. (fgetfilecon): Likewise. (setfilecon): Likewise. (lsetfilecon): Likewise. (fsetfilecon): Likewise. (security_check_context): Likewise. (security_check_context_raw): Likewise. (setexeccon): Likewise. (security_compute_create): Likewise. * lib/selinux-at.c (getfileconat): Likewise. (lgetfileconat): Likewise. (setfileconat): Likewise. (lsetfileconat): Likewise. * lib/selinux-at.h: Likewise.
Diffstat (limited to 'lib/se-selinux.in.h')
-rw-r--r--lib/se-selinux.in.h35
1 files changed, 17 insertions, 18 deletions
diff --git a/lib/se-selinux.in.h b/lib/se-selinux.in.h
index 05a766c10e..022596bb85 100644
--- a/lib/se-selinux.in.h
+++ b/lib/se-selinux.in.h
@@ -43,64 +43,63 @@ _GL_INLINE_HEADER_BEGIN
# if !GNULIB_defined_security_types
typedef unsigned short security_class_t;
-typedef char *security_context_t;
# define is_selinux_enabled() 0
SE_SELINUX_INLINE int
-getcon (security_context_t *con _GL_UNUSED_PARAMETER)
+getcon (char **con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE void
-freecon (security_context_t con _GL_UNUSED_PARAMETER) {}
+freecon (char *con _GL_UNUSED_PARAMETER) {}
SE_SELINUX_INLINE int
-getfscreatecon (security_context_t *con _GL_UNUSED_PARAMETER)
+getfscreatecon (char **con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
-setfscreatecon (security_context_t con _GL_UNUSED_PARAMETER)
+setfscreatecon (char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
matchpathcon (char const *file _GL_UNUSED_PARAMETER,
mode_t m _GL_UNUSED_PARAMETER,
- security_context_t *con _GL_UNUSED_PARAMETER)
+ char **con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
getfilecon (char const *file _GL_UNUSED_PARAMETER,
- security_context_t *con _GL_UNUSED_PARAMETER)
+ char **con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
lgetfilecon (char const *file _GL_UNUSED_PARAMETER,
- security_context_t *con _GL_UNUSED_PARAMETER)
+ char **con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
-fgetfilecon (int fd, security_context_t *con _GL_UNUSED_PARAMETER)
+fgetfilecon (int fd, char **con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
setfilecon (char const *file _GL_UNUSED_PARAMETER,
- security_context_t con _GL_UNUSED_PARAMETER)
+ char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
lsetfilecon (char const *file _GL_UNUSED_PARAMETER,
- security_context_t con _GL_UNUSED_PARAMETER)
+ char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
fsetfilecon (int fd _GL_UNUSED_PARAMETER,
- security_context_t con _GL_UNUSED_PARAMETER)
+ char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
-security_check_context (security_context_t con _GL_UNUSED_PARAMETER)
+security_check_context (char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
-security_check_context_raw (security_context_t con _GL_UNUSED_PARAMETER)
+security_check_context_raw (char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
-setexeccon (security_context_t con _GL_UNUSED_PARAMETER)
+setexeccon (char *con _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE int
-security_compute_create (security_context_t scon _GL_UNUSED_PARAMETER,
- security_context_t tcon _GL_UNUSED_PARAMETER,
+security_compute_create (char *scon _GL_UNUSED_PARAMETER,
+ char *tcon _GL_UNUSED_PARAMETER,
security_class_t tclass _GL_UNUSED_PARAMETER,
- security_context_t *newcon _GL_UNUSED_PARAMETER)
+ char **newcon _GL_UNUSED_PARAMETER)
{ errno = ENOTSUP; return -1; }
SE_SELINUX_INLINE security_class_t
string_to_security_class (char const *name)