clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-04 07:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

uaccess: drop ACLs in case of error, just to be safe

Browse Source
This commit is contained in:
Lennart Poettering
2011-06-29 18:06:58 +02:00
parent 0b191e603c
commit f5f32cd7ad
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uaccess.c
+26 -9
View File
@@ -31,6 +31,7 @@ int main(int argc, char *argv[]) {
const char *path, *seat;
char *p, *active_uid = NULL;
unsigned long ul;
bool changed_acl = false;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
@@ -66,21 +67,37 @@ int main(int argc, char *argv[]) {
goto finish;
}
r = safe_atolu(active_uid, &ul);
if (r < 0) {
log_error("Failed to parse active UID value %s: %s", active_uid, strerror(-r));
goto finish;
}
if (active_uid) {
r = safe_atolu(active_uid, &ul);
if (r < 0) {
log_error("Failed to parse active UID value %s: %s", active_uid, strerror(-r));
goto finish;
}
r = devnode_acl(path, true, false, 0, true, (uid_t) ul);
if (r < 0) {
log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
goto finish;
r = devnode_acl(path, true, false, 0, true, (uid_t) ul);
if (r < 0) {
log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
goto finish;
}
changed_acl = true;
}
r = 0;
finish:
if (path && !changed_acl) {
int k;
/* Better be safe that sorry and reset ACL */
k = devnode_acl(path, true, false, 0, false, 0);
if (k < 0) {
log_error("Failed to apply ACL on %s: %s", path, strerror(-k));
if (r >= 0)
r = k;
}
}
free(active_uid);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;