chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nss-myhostname: copy first result to preallocated buffer
[elogind.git]
/
src
/
core
/
selinux-setup.c
diff --git
a/src/core/selinux-setup.c
b/src/core/selinux-setup.c
index 22ca820188b243dfa5db3b856bce7e7dcd781ee0..e9c0de92f1fb5157d665b97e238535d38104d2af 100644
(file)
--- a/
src/core/selinux-setup.c
+++ b/
src/core/selinux-setup.c
@@
-30,15
+30,18
@@
#endif
#include "selinux-setup.h"
#endif
#include "selinux-setup.h"
+#include "selinux-util.h"
+#include "label.h"
#include "mount-setup.h"
#include "macro.h"
#include "util.h"
#include "log.h"
#include "mount-setup.h"
#include "macro.h"
#include "util.h"
#include "log.h"
-#include "label.h"
+#ifdef HAVE_SELINUX
static int null_log(int type, const char *fmt, ...) {
return 0;
}
static int null_log(int type, const char *fmt, ...) {
return 0;
}
+#endif
int selinux_setup(bool *loaded_policy) {
int selinux_setup(bool *loaded_policy) {
@@
-77,12
+80,11
@@
int selinux_setup(bool *loaded_policy) {
/* Now load the policy */
before_load = now(CLOCK_MONOTONIC);
r = selinux_init_load_policy(&enforce);
/* Now load the policy */
before_load = now(CLOCK_MONOTONIC);
r = selinux_init_load_policy(&enforce);
-
if (r == 0) {
char timespan[FORMAT_TIMESPAN_MAX];
char *label;
if (r == 0) {
char timespan[FORMAT_TIMESPAN_MAX];
char *label;
-
label_
retest_selinux();
+ retest_selinux();
/* Transition to the new context */
r = label_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);
/* Transition to the new context */
r = label_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);