chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
terminal/screen: add color converter
[elogind.git]
/
src
/
core
/
smack-setup.c
diff --git
a/src/core/smack-setup.c
b/src/core/smack-setup.c
index 611bfdb2df155b20e51bf84ff95a478246c50ec9..5d8a26c61d910cd932cd1709bceac996ed4e26b1 100644
(file)
--- a/
src/core/smack-setup.c
+++ b/
src/core/smack-setup.c
@@
-87,7
+87,7
@@
static int write_rules(const char* dstpath, const char* srcdir) {
if (!policy) {
if (r == 0)
r = -errno;
if (!policy) {
if (r == 0)
r = -errno;
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
log_error("Failed to open %s: %m", entry->d_name);
continue;
}
log_error("Failed to open %s: %m", entry->d_name);
continue;
}
@@
-116,12
+116,14
@@
static int write_rules(const char* dstpath, const char* srcdir) {
#endif
#endif
-int smack_setup(
void
) {
+int smack_setup(
bool *loaded_policy
) {
#ifdef HAVE_SMACK
int r;
#ifdef HAVE_SMACK
int r;
+ assert(loaded_policy);
+
r = write_rules("/sys/fs/smackfs/load2", SMACK_CONFIG);
switch(r) {
case -ENOENT:
r = write_rules("/sys/fs/smackfs/load2", SMACK_CONFIG);
switch(r) {
case -ENOENT:
@@
-156,13
+158,15
@@
int smack_setup(void) {
return 0;
case 0:
log_info("Successfully loaded Smack/CIPSO policies.");
return 0;
case 0:
log_info("Successfully loaded Smack/CIPSO policies.");
-
return 0
;
+
break
;
default:
log_warning("Failed to load Smack/CIPSO access rules: %s, ignoring.",
strerror(abs(r)));
return 0;
}
default:
log_warning("Failed to load Smack/CIPSO access rules: %s, ignoring.",
strerror(abs(r)));
return 0;
}
+ *loaded_policy = true;
+
#endif
return 0;
#endif
return 0;