summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-23 19:41:27 +0200
committerLennart Poettering <lennart@poettering.net>2014-10-23 21:36:56 +0200
commitecabcf8b6edcc856ec2fd5bd43fc675a8fe04731 (patch)
treea4c8b9165495bbec27bdec4bf8ad6c3976948f1a /src/core
parent66cedb3078ebe78174efd51673632eb3bfb9be61 (diff)
selinux: clean up selinux label function naming
Diffstat (limited to 'src/core')
-rw-r--r--src/core/namespace.c4
-rw-r--r--src/core/socket.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 6dd7a4f25e..4bc288de1d 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -225,9 +225,9 @@ static int mount_dev(BindMount *m) {
goto fail;
}
- mac_selinux_context_set(d, st.st_mode);
+ mac_selinux_create_file_prepare(d, st.st_mode);
r = mknod(dn, st.st_mode, st.st_rdev);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
if (r < 0) {
r = -errno;
diff --git a/src/core/socket.c b/src/core/socket.c
index e9cf7b3e93..dc16af5e39 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -967,7 +967,7 @@ static int fifo_address_create(
mkdir_parents_label(path, directory_mode);
- r = mac_selinux_context_set(path, S_IFIFO);
+ r = mac_selinux_create_file_prepare(path, S_IFIFO);
if (r < 0)
goto fail;
@@ -990,7 +990,7 @@ static int fifo_address_create(
goto fail;
}
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
if (fstat(fd, &st) < 0) {
r = -errno;
@@ -1010,7 +1010,7 @@ static int fifo_address_create(
return 0;
fail:
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
safe_close(fd);
return r;