chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: turn of libselinux' internal logging
[elogind.git]
/
src
/
core
/
selinux-setup.c
diff --git
a/src/core/selinux-setup.c
b/src/core/selinux-setup.c
index d8643bc16242d8b893bb2cbad71e16bdbd820668..22ca820188b243dfa5db3b856bce7e7dcd781ee0 100644
(file)
--- a/
src/core/selinux-setup.c
+++ b/
src/core/selinux-setup.c
@@
-36,6
+36,10
@@
#include "log.h"
#include "label.h"
#include "log.h"
#include "label.h"
+static int null_log(int type, const char *fmt, ...) {
+ return 0;
+}
+
int selinux_setup(bool *loaded_policy) {
#ifdef HAVE_SELINUX
int selinux_setup(bool *loaded_policy) {
#ifdef HAVE_SELINUX
@@
-43,9
+47,14
@@
int selinux_setup(bool *loaded_policy) {
usec_t before_load, after_load;
security_context_t con;
int r;
usec_t before_load, after_load;
security_context_t con;
int r;
+ union selinux_callback cb;
assert(loaded_policy);
assert(loaded_policy);
+ /* Turn off all of SELinux' own logging, we want to do that */
+ cb.func_log = null_log;
+ selinux_set_callback(SELINUX_CB_LOG, cb);
+
/* Make sure getcon() works, which needs /proc and /sys */
mount_setup_early();
/* Make sure getcon() works, which needs /proc and /sys */
mount_setup_early();