dcavalca / rpms / systemd

Forked from rpms/systemd 3 months ago
Clone
Kay Sievers 6979d2
From 3cbd5f6be191a4e71fc85d8b893e96d6d65bf792 Mon Sep 17 00:00:00 2001
Kay Sievers 6979d2
From: Kay Sievers <kay@vrfy.org>
Kay Sievers 6979d2
Date: Tue, 5 Jun 2012 17:31:32 +0200
Kay Sievers 6979d2
Subject: [PATCH] udev: remove remaining selinux labeling for file in /run
Kay Sievers 6979d2
Kay Sievers 6979d2
---
Kay Sievers 6979d2
 src/libudev/libudev-device-private.c |    4 ++--
Kay Sievers 6979d2
 src/udev/udev-node.c                 |    2 +-
Kay Sievers 6979d2
 2 files changed, 3 insertions(+), 3 deletions(-)
Kay Sievers 6979d2
Kay Sievers 6979d2
diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
Kay Sievers 6979d2
index bdb0e70..2347736 100644
Kay Sievers 6979d2
--- a/src/libudev/libudev-device-private.c
Kay Sievers 6979d2
+++ b/src/libudev/libudev-device-private.c
Kay Sievers 6979d2
@@ -35,7 +35,7 @@ static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
Kay Sievers 6979d2
         if (add) {
Kay Sievers 6979d2
                 int fd;
Kay Sievers 6979d2
 
Kay Sievers 6979d2
-                mkdir_parents_label(filename, 0755);
Kay Sievers 6979d2
+                mkdir_parents(filename, 0755);
Kay Sievers 6979d2
                 fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
Kay Sievers 6979d2
                 if (fd >= 0)
Kay Sievers 6979d2
                         close(fd);
Kay Sievers 6979d2
@@ -119,7 +119,7 @@ int udev_device_update_db(struct udev_device *udev_device)
Kay Sievers 6979d2
 
Kay Sievers 6979d2
         /* write a database file */
Kay Sievers 6979d2
         util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
Kay Sievers 6979d2
-        mkdir_parents_label(filename_tmp, 0755);
Kay Sievers 6979d2
+        mkdir_parents(filename_tmp, 0755);
Kay Sievers 6979d2
         f = fopen(filename_tmp, "we");
Kay Sievers 6979d2
         if (f == NULL) {
Kay Sievers 6979d2
                 udev_err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
Kay Sievers 6979d2
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
Kay Sievers 6979d2
index 2ef6341..aee84a9 100644
Kay Sievers 6979d2
--- a/src/udev/udev-node.c
Kay Sievers 6979d2
+++ b/src/udev/udev-node.c
Kay Sievers 6979d2
@@ -226,7 +226,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
Kay Sievers 6979d2
                 do {
Kay Sievers 6979d2
                         int fd;
Kay Sievers 6979d2
 
Kay Sievers 6979d2
-                        err = mkdir_parents_label(filename, 0755);
Kay Sievers 6979d2
+                        err = mkdir_parents(filename, 0755);
Kay Sievers 6979d2
                         if (err != 0 && err != -ENOENT)
Kay Sievers 6979d2
                                 break;
Kay Sievers 6979d2
                         fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
Kay Sievers 6979d2
-- 
Kay Sievers 6979d2
1.7.10.2
Kay Sievers 6979d2