chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: either ignore or handle mount failures
[elogind.git]
/
src
/
core
/
smack-setup.c
diff --git
a/src/core/smack-setup.c
b/src/core/smack-setup.c
index d0fd1809f9a54aa879c3ccfb7c5ed9ae85b34e2e..ff2a02004d78307919a1cfc7092384cfd8e6b7f6 100644
(file)
--- a/
src/core/smack-setup.c
+++ b/
src/core/smack-setup.c
@@
-24,21
+24,15
@@
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <unistd.h>
#include <stdlib.h>
#include <stdlib.h>
-#include <sys/vfs.h>
#include <fcntl.h>
#include <fcntl.h>
-#include <sys/types.h>
#include <dirent.h>
#include <dirent.h>
-#include <sys/mount.h>
-#include <stdint.h>
#include "macro.h"
#include "smack-setup.h"
#include "util.h"
#include "fileio.h"
#include "log.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/"
#define CIPSO_CONFIG "/etc/smack/cipso.d/"
#define SMACK_CONFIG "/etc/smack/accesses.d/"
#define CIPSO_CONFIG "/etc/smack/cipso.d/"
@@
-56,7
+50,7
@@
static int write_rules(const char* dstpath, const char* srcdir) {
dst = fopen(dstpath, "we");
if (!dst) {
if (errno != ENOENT)
dst = fopen(dstpath, "we");
if (!dst) {
if (errno != ENOENT)
- log_warning
(
"Failed to open %s: %m", dstpath);
+ log_warning
_errno(errno,
"Failed to open %s: %m", dstpath);
return -errno; /* negative error */
}
return -errno; /* negative error */
}
@@
-64,7
+58,7
@@
static int write_rules(const char* dstpath, const char* srcdir) {
dir = opendir(srcdir);
if (!dir) {
if (errno != ENOENT)
dir = opendir(srcdir);
if (!dir) {
if (errno != ENOENT)
- log_warning
(
"Failed to opendir %s: %m", srcdir);
+ log_warning
_errno(errno,
"Failed to opendir %s: %m", srcdir);
return errno; /* positive on purpose */
}
return errno; /* positive on purpose */
}
@@
-79,7
+73,7
@@
static int write_rules(const char* dstpath, const char* srcdir) {
if (fd < 0) {
if (r == 0)
r = -errno;
if (fd < 0) {
if (r == 0)
r = -errno;
- log_warning
(
"Failed to open %s: %m", entry->d_name);
+ log_warning
_errno(errno,
"Failed to open %s: %m", entry->d_name);
continue;
}
continue;
}
@@
-88,13
+82,13
@@
static int write_rules(const char* dstpath, const char* srcdir) {
if (r == 0)
r = -errno;
safe_close(fd);
if (r == 0)
r = -errno;
safe_close(fd);
- log_error
(
"Failed to open %s: %m", entry->d_name);
+ log_error
_errno(errno,
"Failed to open %s: %m", entry->d_name);
continue;
}
/* load2 write rules in the kernel require a line buffered stream */
FOREACH_LINE(buf, policy,
continue;
}
/* load2 write rules in the kernel require a line buffered stream */
FOREACH_LINE(buf, policy,
- log_error
(
"Failed to read line from %s: %m",
+ log_error
_errno(errno,
"Failed to read line from %s: %m",
entry->d_name)) {
if (!fputs(buf, dst)) {
if (r == 0)
entry->d_name)) {
if (!fputs(buf, dst)) {
if (r == 0)
@@
-105,7
+99,7
@@
static int write_rules(const char* dstpath, const char* srcdir) {
if (fflush(dst)) {
if (r == 0)
r = -errno;
if (fflush(dst)) {
if (r == 0)
r = -errno;
- log_error
(
"Failed to flush writes to %s: %m", dstpath);
+ log_error
_errno(errno,
"Failed to flush writes to %s: %m", dstpath);
break;
}
}
break;
}
}