chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v234: Apply missing upstream fixes in src/basic (1/6)
[elogind.git]
/
src
/
basic
/
selinux-util.c
diff --git
a/src/basic/selinux-util.c
b/src/basic/selinux-util.c
index 2a9dd7c8c47bb943974ebc003f6f99e2333391aa..c7a04ad7644402f23f10a52f8097f7df2f383d65 100644
(file)
--- a/
src/basic/selinux-util.c
+++ b/
src/basic/selinux-util.c
@@
-50,10
+50,10
@@
DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
static int cached_use = -1;
static struct selabel_handle *label_hnd = NULL;
static int cached_use = -1;
static struct selabel_handle *label_hnd = NULL;
-#define log_enforcing(...) log_full
(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG
, __VA_ARGS__)
+#define log_enforcing(...) log_full
_errno(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG, errno
, __VA_ARGS__)
#endif
#endif
-bool mac_selinux_
hav
e(void) {
+bool mac_selinux_
us
e(void) {
#ifdef HAVE_SELINUX
if (cached_use < 0)
cached_use = is_selinux_enabled() > 0;
#ifdef HAVE_SELINUX
if (cached_use < 0)
cached_use = is_selinux_enabled() > 0;
@@
-64,16
+64,6
@@
bool mac_selinux_have(void) {
#endif
}
#endif
}
-bool mac_selinux_use(void) {
- if (!mac_selinux_have())
- return false;
-
- /* Never try to configure SELinux features if we aren't
- * root */
-
- return getuid() == 0;
-}
-
void mac_selinux_retest(void) {
#ifdef HAVE_SELINUX
cached_use = -1;
void mac_selinux_retest(void) {
#ifdef HAVE_SELINUX
cached_use = -1;
@@
-206,7
+196,7
@@
int mac_selinux_get_create_label_from_exe(const char *exe, char **label) {
assert(exe);
assert(label);
assert(exe);
assert(label);
- if (!mac_selinux_
hav
e())
+ if (!mac_selinux_
us
e())
return -EOPNOTSUPP;
r = getcon_raw(&mycon);
return -EOPNOTSUPP;
r = getcon_raw(&mycon);
@@
-232,7
+222,7
@@
int mac_selinux_get_our_label(char **label) {
assert(label);
#ifdef HAVE_SELINUX
assert(label);
#ifdef HAVE_SELINUX
- if (!mac_selinux_
hav
e())
+ if (!mac_selinux_
us
e())
return -EOPNOTSUPP;
r = getcon_raw(label);
return -EOPNOTSUPP;
r = getcon_raw(label);
@@
-256,7
+246,7
@@
int mac_selinux_get_child_mls_label(int socket_fd, const char *exe, const char *
assert(exe);
assert(label);
assert(exe);
assert(label);
- if (!mac_selinux_
hav
e())
+ if (!mac_selinux_
us
e())
return -EOPNOTSUPP;
r = getcon_raw(&mycon);
return -EOPNOTSUPP;
r = getcon_raw(&mycon);
@@
-311,7
+301,7
@@
char* mac_selinux_free(char *label) {
if (!label)
return NULL;
if (!label)
return NULL;
- if (!mac_selinux_
hav
e())
+ if (!mac_selinux_
us
e())
return NULL;
return NULL;