chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
activate: port to use new getpeername_pretty()/getsockname_pretty() calls
[elogind.git]
/
src
/
core
/
smack-setup.c
diff --git
a/src/core/smack-setup.c
b/src/core/smack-setup.c
index 73eeb041908d99915453d3452d20e2f9ed513b17..611bfdb2df155b20e51bf84ff95a478246c50ec9 100644
(file)
--- a/
src/core/smack-setup.c
+++ b/
src/core/smack-setup.c
@@
-36,11
+36,14
@@
#include "macro.h"
#include "smack-setup.h"
#include "util.h"
#include "macro.h"
#include "smack-setup.h"
#include "util.h"
+#include "fileio.h"
#include "log.h"
#include "label.h"
#define SMACK_CONFIG "/etc/smack/accesses.d/"
#include "log.h"
#include "label.h"
#define SMACK_CONFIG "/etc/smack/accesses.d/"
-#define CIPSO_CONFIG "/etc/smack/cipso/"
+#define CIPSO_CONFIG "/etc/smack/cipso.d/"
+
+#ifdef HAVE_SMACK
static int write_rules(const char* dstpath, const char* srcdir) {
_cleanup_fclose_ FILE *dst = NULL;
static int write_rules(const char* dstpath, const char* srcdir) {
_cleanup_fclose_ FILE *dst = NULL;
@@
-111,8
+114,12
@@
static int write_rules(const char* dstpath, const char* srcdir) {
return r;
}
return r;
}
+#endif
int smack_setup(void) {
int smack_setup(void) {
+
+#ifdef HAVE_SMACK
+
int r;
r = write_rules("/sys/fs/smackfs/load2", SMACK_CONFIG);
int r;
r = write_rules("/sys/fs/smackfs/load2", SMACK_CONFIG);
@@
-132,6
+139,13
@@
int smack_setup(void) {
return 0;
}
return 0;
}
+#ifdef SMACK_RUN_LABEL
+ r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL);
+ if (r)
+ log_warning("Failed to set SMACK label \"%s\" on self: %s",
+ SMACK_RUN_LABEL, strerror(-r));
+#endif
+
r = write_rules("/sys/fs/smackfs/cipso2", CIPSO_CONFIG);
switch(r) {
case -ENOENT:
r = write_rules("/sys/fs/smackfs/cipso2", CIPSO_CONFIG);
switch(r) {
case -ENOENT:
@@
-148,4
+162,8
@@
int smack_setup(void) {
strerror(abs(r)));
return 0;
}
strerror(abs(r)));
return 0;
}
+
+#endif
+
+ return 0;
}
}