diff options
| author | WaLyong Cho <walyong.cho@samsung.com> | 2014-10-23 17:23:46 +0900 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-23 17:13:15 +0200 |
| commit | cc56fafeebf814ef035e549115cf1850e6473fa5 (patch) | |
| tree | 7bc8ec26fb250eb21180cdcd30bdc9072a0ac132 /src/udev | |
| parent | 66b6d9d5b5b13a97c9f275aed0d9fe5608495be9 (diff) | |
mac: rename apis with mac_{selinux/smack}_ prefix
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-node.c | 14 | ||||
| -rw-r--r-- | src/udev/udevadm.c | 4 | ||||
| -rw-r--r-- | src/udev/udevd.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 8ef788954d..3982ef9215 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -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 */ diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index df546dd823..7026c50d2b 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -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; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 29ccb518e6..2e6c71352f 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -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; |