diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/label.c | 2 | ||||
| -rw-r--r-- | src/shared/mkdir-label.c | 2 | ||||
| -rw-r--r-- | src/shared/smack-util.c | 10 | ||||
| -rw-r--r-- | src/shared/smack-util.h | 11 | ||||
| -rw-r--r-- | src/udev/udev-node.c | 4 |
5 files changed, 15 insertions, 14 deletions
diff --git a/src/shared/label.c b/src/shared/label.c index 5124d2c55f..32b155088c 100644 --- a/src/shared/label.c +++ b/src/shared/label.c @@ -30,7 +30,7 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { } if (mac_smack_use()) { - r = mac_smack_relabel_in_dev(path); + r = mac_smack_fix(path); if (r < 0) return r; } diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c index b754a1ed66..d9a481bd86 100644 --- a/src/shared/mkdir-label.c +++ b/src/shared/mkdir-label.c @@ -44,7 +44,7 @@ static int label_mkdir(const char *path, mode_t mode) { if (r < 0 && errno != EEXIST) return -errno; - r = mac_smack_relabel_in_dev(path); + r = mac_smack_fix(path); if (r < 0) return r; } diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c index 0fb2c9db94..e06feb42c3 100644 --- a/src/shared/smack-util.c +++ b/src/shared/smack-util.c @@ -41,7 +41,7 @@ bool mac_smack_use(void) { } -int mac_smack_set_path(const char *path, const char *label) { +int mac_smack_apply(const char *path, const char *label) { #ifdef HAVE_SMACK if (!mac_smack_use()) return 0; @@ -55,7 +55,7 @@ int mac_smack_set_path(const char *path, const char *label) { #endif } -int mac_smack_set_fd(int fd, const char *label) { +int mac_smack_apply_fd(int fd, const char *label) { #ifdef HAVE_SMACK if (!mac_smack_use()) return 0; @@ -66,7 +66,7 @@ int mac_smack_set_fd(int fd, const char *label) { #endif } -int mac_smack_set_ip_out_fd(int fd, const char *label) { +int mac_smack_apply_ip_out_fd(int fd, const char *label) { #ifdef HAVE_SMACK if (!mac_smack_use()) return 0; @@ -77,7 +77,7 @@ int mac_smack_set_ip_out_fd(int fd, const char *label) { #endif } -int mac_smack_set_ip_in_fd(int fd, const char *label) { +int mac_smack_apply_ip_in_fd(int fd, const char *label) { #ifdef HAVE_SMACK if (!mac_smack_use()) return 0; @@ -88,7 +88,7 @@ int mac_smack_set_ip_in_fd(int fd, const char *label) { #endif } -int mac_smack_relabel_in_dev(const char *path) { +int mac_smack_fix(const char *path) { int r = 0; #ifdef HAVE_SMACK diff --git a/src/shared/smack-util.h b/src/shared/smack-util.h index 6a67728c89..8b9556dce6 100644 --- a/src/shared/smack-util.h +++ b/src/shared/smack-util.h @@ -28,8 +28,9 @@ bool mac_smack_use(void); -int mac_smack_set_path(const char *path, const char *label); -int mac_smack_set_fd(int fd, const char *label); -int mac_smack_set_ip_in_fd(int fd, const char *label); -int mac_smack_set_ip_out_fd(int fd, const char *label); -int mac_smack_relabel_in_dev(const char *path); +int mac_smack_fix(const char *path); + +int mac_smack_apply(const char *path, const char *label); +int mac_smack_apply_fd(int fd, const char *label); +int mac_smack_apply_ip_in_fd(int fd, const char *label); +int mac_smack_apply_ip_out_fd(int fd, const char *label); 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 */ |