From: Kay Sievers <kay@vrfy.org>
Date: Tue, 5 Jun 2012 15:31:32 +0000 (+0200)
Subject: udev: remove remaining selinux labeling for file in /run
X-Git-Tag: v186~181
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3cbd5f6be191a4e71fc85d8b893e96d6d65bf792;ds=sidebyside

udev: remove remaining selinux labeling for file in /run
---

diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index bdb0e70c1..234773662 100644
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -35,7 +35,7 @@ static void udev_device_tag(struct udev_device *dev, const char *tag, bool add)
         if (add) {
                 int fd;
 
-                mkdir_parents_label(filename, 0755);
+                mkdir_parents(filename, 0755);
                 fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
                 if (fd >= 0)
                         close(fd);
@@ -119,7 +119,7 @@ int udev_device_update_db(struct udev_device *udev_device)
 
         /* write a database file */
         util_strscpyl(filename_tmp, sizeof(filename_tmp), filename, ".tmp", NULL);
-        mkdir_parents_label(filename_tmp, 0755);
+        mkdir_parents(filename_tmp, 0755);
         f = fopen(filename_tmp, "we");
         if (f == NULL) {
                 udev_err(udev, "unable to create temporary db file '%s': %m\n", filename_tmp);
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 2ef6341a2..aee84a92f 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -226,7 +226,7 @@ static void link_update(struct udev_device *dev, const char *slink, bool add)
                 do {
                         int fd;
 
-                        err = mkdir_parents_label(filename, 0755);
+                        err = mkdir_parents(filename, 0755);
                         if (err != 0 && err != -ENOENT)
                                 break;
                         fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);