SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac: rename apis with mac_{selinux/smack}_ prefix

Browse Source
This commit is contained in:
WaLyong Cho
2014-10-23 17:13:15 +02:00
committed by Lennart Poettering
parent 66b6d9d5b5
commit cc56fafeeb
26 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-node.c
+7 -7
View File
@@ -88,11 +88,11 @@ static int node_symlink(struct udev_device *dev, const char *node, const char *s
err = mkdir_parents_label(slink, 0755);
if (err != 0 && err != -ENOENT)
break;
label_context_set(slink, S_IFLNK);
mac_selinux_context_set(slink, S_IFLNK);
err = symlink(target, slink);
if (err != 0)
err = -errno;
label_context_clear();
mac_selinux_context_clear();
} while (err == -ENOENT);
if (err == 0)
goto exit;
@@ -105,11 +105,11 @@ static int node_symlink(struct udev_device *dev, const char *node, const char *s
err = mkdir_parents_label(slink_tmp, 0755);
if (err != 0 && err != -ENOENT)
break;
label_context_set(slink_tmp, S_IFLNK);
mac_selinux_context_set(slink_tmp, S_IFLNK);
err = symlink(target, slink_tmp);
if (err != 0)
err = -errno;
label_context_clear();
mac_selinux_context_clear();
} while (err == -ENOENT);
if (err != 0) {
log_error("symlink '%s' '%s' failed: %m", target, slink_tmp);
@@ -300,14 +300,14 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
if (streq(name, "selinux")) {
selinux = true;
if (label_apply(devnode, label) < 0)
if (mac_selinux_apply(devnode, label) < 0)
log_error("SECLABEL: failed to set SELinux label '%s'", label);
else
log_debug("SECLABEL: set SELinux label '%s'", label);
} else if (streq(name, "smack")) {
smack = true;
if (smack_label_path(devnode, label) < 0)
if (mac_smack_set_path(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)
smack_label_path(devnode, NULL);
mac_smack_set_path(devnode, NULL);
}
/* always update timestamp when we re-use the node, like on media change events */
src/udev/udevadm.c
+2 -2
View File
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
udev_set_log_fn(udev, udev_main_log);
label_init("/dev");
mac_selinux_init("/dev");
while ((c = getopt_long(argc, argv, "+dhV", options, NULL)) >= 0)
switch (c) {
@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "%s: missing or unknown command\n", program_invocation_short_name);
rc = 2;
out:
label_finish();
mac_selinux_finish();
udev_unref(udev);
log_close();
return rc;
src/udev/udevd.c
+2 -2
View File
@@ -1139,7 +1139,7 @@ int main(int argc, char *argv[]) {
goto exit;
}
r = label_init("/dev");
r = mac_selinux_init("/dev");
if (r < 0) {
log_error("could not initialize labelling: %s", strerror(-r));
goto exit;
@@ -1542,7 +1542,7 @@ exit_daemonize:
udev_monitor_unref(monitor);
udev_ctrl_connection_unref(ctrl_conn);
udev_ctrl_unref(udev_ctrl);
label_finish();
mac_selinux_finish();
udev_unref(udev);
log_close();
return rc;