selinux: unify systemd and udev code

2012-04-17 16:05:28 +02:00
parent 75e37ac5b1
commit e9a5ef7cdd
14 changed files with 57 additions and 171 deletions
@@ -762,7 +762,8 @@ static int fifo_address_create(

        mkdir_parents(path, directory_mode);

-        if ((r = label_fifofile_set(path)) < 0)
+        r = label_context_set(path, S_IFIFO);
+        if (r < 0)
                goto fail;

        /* Enforce the right access mode for the fifo */
@@ -784,7 +785,7 @@ static int fifo_address_create(
                goto fail;
        }

-        label_file_clear();
+        label_context_clear();

        if (fstat(fd, &st) < 0) {
                r = -errno;
@@ -804,7 +805,7 @@ static int fifo_address_create(
        return 0;

 fail:
-        label_file_clear();
+        label_context_clear();

        if (fd >= 0)
                close_nointr_nofail(fd);