chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd-hwdb: introduce new tool
[elogind.git]
/
src
/
udev
/
udev-node.c
diff --git
a/src/udev/udev-node.c
b/src/udev/udev-node.c
index 803d803279f256ad706c463051f90345386392e2..c30a428ea1f710e4ea7489f2c64b94ac0e4e64d1 100644
(file)
--- 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;
err = mkdir_parents_label(slink, 0755);
if (err != 0 && err != -ENOENT)
break;
- mac_selinux_c
ontext_set
(slink, S_IFLNK);
+ mac_selinux_c
reate_file_prepare
(slink, S_IFLNK);
err = symlink(target, slink);
if (err != 0)
err = -errno;
err = symlink(target, slink);
if (err != 0)
err = -errno;
- mac_selinux_c
ontext
_clear();
+ mac_selinux_c
reate_file
_clear();
} while (err == -ENOENT);
if (err == 0)
goto exit;
} while (err == -ENOENT);
if (err == 0)
goto exit;
@@
-105,19
+105,19
@@
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;
err = mkdir_parents_label(slink_tmp, 0755);
if (err != 0 && err != -ENOENT)
break;
- mac_selinux_c
ontext_set
(slink_tmp, S_IFLNK);
+ mac_selinux_c
reate_file_prepare
(slink_tmp, S_IFLNK);
err = symlink(target, slink_tmp);
if (err != 0)
err = -errno;
err = symlink(target, slink_tmp);
if (err != 0)
err = -errno;
- mac_selinux_c
ontext
_clear();
+ mac_selinux_c
reate_file
_clear();
} while (err == -ENOENT);
if (err != 0) {
} while (err == -ENOENT);
if (err != 0) {
- log_error
(
"symlink '%s' '%s' failed: %m", target, slink_tmp);
+ log_error
_errno(errno,
"symlink '%s' '%s' failed: %m", target, slink_tmp);
goto exit;
}
err = rename(slink_tmp, slink);
if (err != 0) {
goto exit;
}
err = rename(slink_tmp, slink);
if (err != 0) {
- log_error
(
"rename '%s' '%s' failed: %m", slink_tmp, slink);
+ log_error
_errno(errno,
"rename '%s' '%s' failed: %m", slink_tmp, slink);
unlink(slink_tmp);
}
exit:
unlink(slink_tmp);
}
exit:
@@
-264,7
+264,7
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
if (lstat(devnode, &stats) != 0) {
err = -errno;
if (lstat(devnode, &stats) != 0) {
err = -errno;
- log_debug
(
"can not stat() node '%s' (%m)", devnode);
+ log_debug
_errno(errno,
"can not stat() node '%s' (%m)", devnode);
goto out;
}
goto out;
}
@@
-283,10
+283,10
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
err = chmod(devnode, mode);
if (err < 0)
log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
err = chmod(devnode, mode);
if (err < 0)
- log_warning
(
"setting mode of %s to %#o failed: %m", devnode, mode);
+ log_warning
_errno(errno,
"setting mode of %s to %#o failed: %m", devnode, mode);
err = chown(devnode, uid, gid);
if (err < 0)
err = chown(devnode, uid, gid);
if (err < 0)
- log_warning
(
"setting owner of %s to uid=%u, gid=%u failed: %m", devnode, uid, gid);
+ log_warning
_errno(errno,
"setting owner of %s to uid=%u, gid=%u failed: %m", devnode, uid, gid);
} else {
log_debug("preserve permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
}
} else {
log_debug("preserve permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid);
}
@@
-294,21
+294,26
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
/* apply SECLABEL{$module}=$label */
udev_list_entry_foreach(entry, udev_list_get_entry(seclabel_list)) {
const char *name, *label;
/* apply SECLABEL{$module}=$label */
udev_list_entry_foreach(entry, udev_list_get_entry(seclabel_list)) {
const char *name, *label;
+ int r;
name = udev_list_entry_get_name(entry);
label = udev_list_entry_get_value(entry);
if (streq(name, "selinux")) {
selinux = true;
name = udev_list_entry_get_name(entry);
label = udev_list_entry_get_value(entry);
if (streq(name, "selinux")) {
selinux = true;
- if (mac_selinux_apply(devnode, label) < 0)
- log_error("SECLABEL: failed to set SELinux label '%s'", label);
+
+ r = mac_selinux_apply(devnode, label);
+ if (r < 0)
+ log_error_errno(r, "SECLABEL: failed to set SELinux label '%s': %m", label);
else
log_debug("SECLABEL: set SELinux label '%s'", label);
} else if (streq(name, "smack")) {
smack = true;
else
log_debug("SECLABEL: set SELinux label '%s'", label);
} else if (streq(name, "smack")) {
smack = true;
- if (mac_smack_apply(devnode, label) < 0)
- log_error("SECLABEL: failed to set SMACK label '%s'", label);
+
+ r = mac_smack_apply(devnode, label);
+ if (r < 0)
+ log_error_errno(r, "SECLABEL: failed to set SMACK label '%s': %m", label);
else
log_debug("SECLABEL: set SMACK label '%s'", label);
else
log_debug("SECLABEL: set SMACK label '%s'", label);
@@
-318,7
+323,7
@@
static int node_permissions_apply(struct udev_device *dev, bool apply,
/* set the defaults */
if (!selinux)
/* set the defaults */
if (!selinux)
-
label
_fix(devnode, true, false);
+
mac_selinux
_fix(devnode, true, false);
if (!smack)
mac_smack_apply(devnode, NULL);
}
if (!smack)
mac_smack_apply(devnode, NULL);
}