From 2345245fdf951ea3ac5f4dc876df1fac63a4fa75 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 18 Sep 2014 18:55:54 -0400 Subject: src/udev/udev-node.c: replace our error handling with upstreams eudev has had this error handling for a while. upstream finally added it with the following commit 543afdc63c02a5af3cf6bd2a264162f23474346a by Tom Gundersen . Both methods are equivalent, but we adopt upstreams for easier maintenance. Signed-off-by: Anthony G. Basile --- src/udev/udev-node.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/udev/udev-node.c') diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index c54228a609..8ef788954d 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -281,11 +281,12 @@ static int node_permissions_apply(struct udev_device *dev, bool apply, if ((stats.st_mode & 0777) != (mode & 0777) || stats.st_uid != uid || stats.st_gid != gid) { log_debug("set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid); - if((chmod(devnode, mode) !=0 ) || (chown(devnode, uid,gid) !=0)) { - err = -errno; - log_error("FAILED to set permissions %s, %#o, uid=%u, gid=%u", devnode, mode, uid, gid); - goto out; - } + err = chmod(devnode, mode); + if (err < 0) + log_warning("setting mode of %s to %#o failed: %m", devnode, mode); + err = chown(devnode, uid, gid); + if (err < 0) + log_warning("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); } -- cgit v1.2.3-54-g00ecf