shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 20:25:25 +03:00
Code

sysusers: use fchmod_and_chown()

Browse Source
This commit is contained in:
Yu Watanabe 2018-06-14 11:39:55 +09:00
parent b8da477eaf
commit c039af2388
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sysusers/sysusers.c
View File

@ -212,11 +212,9 @@ static int make_backup(const char *target, const char *x) {
backup = strjoina(x, "-");
/* Copy over the access mask */
if (fchmod(fileno(dst), st.st_mode & 07777) < 0)
log_warning_errno(errno, "Failed to change mode on %s: %m", backup);
if (fchown(fileno(dst), st.st_uid, st.st_gid)< 0)
log_warning_errno(errno, "Failed to change ownership of %s: %m", backup);
r = fchmod_and_chown(fileno(dst), st.st_mode & 07777, st.st_uid, st.st_gid);
if (r < 0)
log_warning_errno(r, "Failed to change access mode or ownership of %s: %m", backup);
ts[0] = st.st_atim;
ts[1] = st.st_mtim;
@ -335,13 +333,7 @@ static int sync_rights(FILE *from, FILE *to) {
if (fstat(fileno(from), &st) < 0)
return -errno;
if (fchmod(fileno(to), st.st_mode & 07777) < 0)
return -errno;
if (fchown(fileno(to), st.st_uid, st.st_gid) < 0)
return -errno;
return 0;
return fchmod_and_chown(fileno(to), st.st_mode & 07777, st.st_uid, st.st_gid);
}
static int rename_and_apply_smack(const char *temp_path, const char *dest_path) {