chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
condition: properly allow passing back errors from condition checks
[elogind.git]
/
src
/
update-done
/
update-done.c
diff --git
a/src/update-done/update-done.c
b/src/update-done/update-done.c
index db106b5ab411759bdd315fda0e669eef2563ccf9..1437c30d146cbd8b17078acd7f23155dac4ff9e1 100644
(file)
--- a/
src/update-done/update-done.c
+++ b/
src/update-done/update-done.c
@@
-61,7
+61,7
@@
static int apply_timestamp(const char *path, struct timespec *ts) {
/* The timestamp file doesn't exist yet? Then let's create it. */
/* The timestamp file doesn't exist yet? Then let's create it. */
- r =
label_context_set
(path, S_IFREG);
+ r =
mac_selinux_create_file_prepare
(path, S_IFREG);
if (r < 0) {
log_error("Failed to set SELinux context for %s: %s",
path, strerror(-r));
if (r < 0) {
log_error("Failed to set SELinux context for %s: %s",
path, strerror(-r));
@@
-69,7
+69,7
@@
static int apply_timestamp(const char *path, struct timespec *ts) {
}
fd = open(path, O_CREAT|O_EXCL|O_WRONLY|O_TRUNC|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0644);
}
fd = open(path, O_CREAT|O_EXCL|O_WRONLY|O_TRUNC|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0644);
-
label_context
_clear();
+
mac_selinux_create_file
_clear();
if (fd < 0) {
if (fd < 0) {
@@
-112,7
+112,7
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- r =
label
_init(NULL);
+ r =
mac_selinux
_init(NULL);
if (r < 0) {
log_error("SELinux setup failed: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("SELinux setup failed: %s", strerror(-r));
goto finish;