chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac: rename all calls that apply a label mac_{selinux|smack}_apply_xyz(), and all...
[elogind.git]
/
src
/
udev
/
udev-node.c
diff --git
a/src/udev/udev-node.c
b/src/udev/udev-node.c
index 3982ef9215c2becf26cc8c7d56469b5b15a0bda5..803d803279f256ad706c463051f90345386392e2 100644
(file)
--- 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;
} 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);
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)
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 */
}
/* always update timestamp when we re-use the node, like on media change events */