selinux: clean up selinux label function naming
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 28c395b..1e4675f 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -509,9 +509,9 @@
i->type == TRUNCATE_FILE ? O_CREAT|O_TRUNC|O_NOFOLLOW : 0;
RUN_WITH_UMASK(0000) {
- mac_selinux_context_set(path, S_IFREG);
+ mac_selinux_create_file_prepare(path, S_IFREG);
fd = open(path, flags|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
}
if (fd < 0) {
@@ -743,9 +743,9 @@
case CREATE_FIFO:
RUN_WITH_UMASK(0000) {
- mac_selinux_context_set(i->path, S_IFIFO);
+ mac_selinux_create_file_prepare(i->path, S_IFIFO);
r = mkfifo(i->path, i->mode);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
}
if (r < 0) {
@@ -764,9 +764,9 @@
if (i->force) {
RUN_WITH_UMASK(0000) {
- mac_selinux_context_set(i->path, S_IFIFO);
+ mac_selinux_create_file_prepare(i->path, S_IFIFO);
r = mkfifo_atomic(i->path, i->mode);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
}
if (r < 0) {
@@ -788,9 +788,9 @@
case CREATE_SYMLINK:
- mac_selinux_context_set(i->path, S_IFLNK);
+ mac_selinux_create_file_prepare(i->path, S_IFLNK);
r = symlink(i->argument, i->path);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
if (r < 0) {
_cleanup_free_ char *x = NULL;
@@ -804,9 +804,9 @@
if (r < 0 || !streq(i->argument, x)) {
if (i->force) {
- mac_selinux_context_set(i->path, S_IFLNK);
+ mac_selinux_create_file_prepare(i->path, S_IFLNK);
r = symlink_atomic(i->argument, i->path);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
if (r < 0) {
log_error("symlink(%s, %s) failed: %s", i->argument, i->path, strerror(-r));
@@ -838,9 +838,9 @@
file_type = i->type == CREATE_BLOCK_DEVICE ? S_IFBLK : S_IFCHR;
RUN_WITH_UMASK(0000) {
- mac_selinux_context_set(i->path, file_type);
+ mac_selinux_create_file_prepare(i->path, file_type);
r = mknod(i->path, i->mode | file_type, i->major_minor);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
}
if (r < 0) {
@@ -865,9 +865,9 @@
if (i->force) {
RUN_WITH_UMASK(0000) {
- mac_selinux_context_set(i->path, file_type);
+ mac_selinux_create_file_prepare(i->path, file_type);
r = mknod_atomic(i->path, i->mode | file_type, i->major_minor);
- mac_selinux_context_clear();
+ mac_selinux_create_file_clear();
}
if (r < 0) {