SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11540 from taro-yamada/mytest

Browse Source 
ReFix #11128
This commit is contained in:
Lennart Poettering
2019-01-29 11:27:42 +01:00
committed by GitHub
parent f90bf549f7 6cff72eb0a
commit 92dc48ac45
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execute.c
+8 -1
View File
@@ -2161,10 +2161,17 @@ static int setup_exec_directory(
if (r < 0 && r != -EEXIST)
goto fail;
if (r == -EEXIST) {
if (chmod(p, context->directories[type].mode) < 0) {
struct stat st;
if (stat(p, &st) < 0) {
r = -errno;
goto fail;
}
if (((st.st_mode ^ context->directories[type].mode) & 07777) != 0)
log_warning("%s \'%s\' already exists but the mode is different. "
"(filesystem: %o %sMode: %o)",
exec_directory_type_to_string(type), *rt,
st.st_mode & 07777, exec_directory_type_to_string(type), context->directories[type].mode & 07777);
if (!context->dynamic_user)
continue;
}