picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tmpfiles: change ownership of symlinks too

Browse source 
Ownership is supported for symlinks, too, only file modes are not.
Support that too.

Fixes: #7509
This commit is contained in:
Lennart Poettering 2018-01-22 21:03:53 +01:00
parent 1c4fdc4092
commit 51207ca134
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/tmpfiles/tmpfiles.c
View file

@ -754,6 +754,7 @@ finish:
} }
static int path_set_perms(Item *i, const char *path) { static int path_set_perms(Item *i, const char *path) {
char fn[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)];
_cleanup_close_ int fd = -1; _cleanup_close_ int fd = -1;
struct stat st; struct stat st;
@ -784,14 +785,12 @@ static int path_set_perms(Item *i, const char *path) {
if (fstatat(fd, "", &st, AT_EMPTY_PATH) < 0) if (fstatat(fd, "", &st, AT_EMPTY_PATH) < 0)
return log_error_errno(errno, "Failed to fstat() file %s: %m", path); return log_error_errno(errno, "Failed to fstat() file %s: %m", path);
if (S_ISLNK(st.st_mode)) xsprintf(fn, "/proc/self/fd/%i", fd);
log_debug("Skipping mode and owner fix for symlink %s.", path);
else {
char fn[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)];
xsprintf(fn, "/proc/self/fd/%i", fd);
/* not using i->path directly because it may be a glob */ if (i->mode_set) {
if (i->mode_set) { if (S_ISLNK(st.st_mode))
log_debug("Skipping mode fix for symlink %s.", path);
else {
mode_t m = i->mode; mode_t m = i->mode;
if (i->mask_perms) { if (i->mask_perms) {
@ -806,25 +805,27 @@ static int path_set_perms(Item *i, const char *path) {
} }
if (m == (st.st_mode & 07777)) if (m == (st.st_mode & 07777))
log_debug("\"%s\" has right mode %o", path, st.st_mode); log_debug("\"%s\" has correct mode %o already.", path, st.st_mode);
else { else {
log_debug("chmod \"%s\" to mode %o", path, m); log_debug("Changing \"%s\" to mode %o.", path, m);
if (chmod(fn, m) < 0) if (chmod(fn, m) < 0)
return log_error_errno(errno, "chmod() of %s via %s failed: %m", path, fn); return log_error_errno(errno, "chmod() of %s via %s failed: %m", path, fn);
} }
} }
}
if ((i->uid != st.st_uid || i->gid != st.st_gid) && if ((i->uid != st.st_uid || i->gid != st.st_gid) &&
(i->uid_set || i->gid_set)) { (i->uid_set || i->gid_set)) {
log_debug("chown \"%s\" to "UID_FMT"."GID_FMT, log_debug("Changing \"%s\" to owner "UID_FMT":"GID_FMT,
path, path,
i->uid_set ? i->uid : UID_INVALID, i->uid_set ? i->uid : UID_INVALID,
i->gid_set ? i->gid : GID_INVALID); i->gid_set ? i->gid : GID_INVALID);
if (chown(fn,
i->uid_set ? i->uid : UID_INVALID, if (chown(fn,
i->gid_set ? i->gid : GID_INVALID) < 0) i->uid_set ? i->uid : UID_INVALID,
return log_error_errno(errno, "chown() of %s via %s failed: %m", path, fn); i->gid_set ? i->gid : GID_INVALID) < 0)
} return log_error_errno(errno, "chown() of %s via %s failed: %m", path, fn);
} }
fd = safe_close(fd); fd = safe_close(fd);