From: WaLyong Cho <walyong.cho@samsung.com>
Date: Fri, 24 Oct 2014 04:51:09 +0000 (+0900)
Subject: udev: do NOT re-label smack
X-Git-Tag: v217~81
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2ec62d8e846a8d15f6e3002690da70500168ff46;ds=inline

udev: do NOT re-label smack

If selinux is disabled and smack is only enabled, smack label is
relable-ed by label_fix. To avoid, make only be labeled for selinux.
---

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 4ac6f7149..030e45919 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -323,7 +323,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
 
                 /* set the defaults */
                 if (!selinux)
-                        label_fix(devnode, true, false);
+                        mac_selinux_fix(devnode, true, false);
                 if (!smack)
                         mac_smack_apply(devnode, NULL);
         }