summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-23 17:49:29 +0200
committerAnthony G. Basile <blueness@gentoo.org>2014-10-25 18:31:53 -0400
commit00772eaeba4662181fc86fa842ff8521ccade88a (patch)
tree43de1accc33d656e0542ae56c1f1fd66d3e991b4 /src/udev
parent575644587b1c0bd56301552955122d4d6adacaf7 (diff)
mac: rename all calls that apply a label mac_{selinux|smack}_apply_xyz(), and all that reset it to defaults mac_{selinux|smack}_fix()
Let's clean up the naming schemes a bit and use the same one for SMACK and for SELINUX. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-node.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 3982ef9215..803d803279 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -307,7 +307,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
} else if (streq(name, "smack")) {
smack = true;
- if (mac_smack_set_path(devnode, label) < 0)
+ if (mac_smack_apply(devnode, label) < 0)
log_error("SECLABEL: failed to set SMACK label '%s'", label);
else
log_debug("SECLABEL: set SMACK label '%s'", label);
@@ -320,7 +320,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
if (!selinux)
label_fix(devnode, true, false);
if (!smack)
- mac_smack_set_path(devnode, NULL);
+ mac_smack_apply(devnode, NULL);
}
/* always update timestamp when we re-use the node, like on media change events */