diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 2f84d3d6c2..543fba7cdb 100644 --- a/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |||
@@ -34,7 +34,7 @@ diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | |||
34 | index 932d003f19..33215dbf5f 100644 | 34 | index 932d003f19..33215dbf5f 100644 |
35 | --- a/src/basic/fs-util.h | 35 | --- a/src/basic/fs-util.h |
36 | +++ b/src/basic/fs-util.h | 36 | +++ b/src/basic/fs-util.h |
37 | @@ -50,8 +50,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); | 37 | @@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); |
38 | int fd_warn_permissions(const char *path, int fd); | 38 | int fd_warn_permissions(const char *path, int fd); |
39 | int stat_warn_permissions(const char *path, const struct stat *st); | 39 | int stat_warn_permissions(const char *path, const struct stat *st); |
40 | 40 | ||
@@ -67,16 +67,16 @@ diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c | |||
67 | index be6dd1654a..2726dc946a 100644 | 67 | index be6dd1654a..2726dc946a 100644 |
68 | --- a/src/shared/base-filesystem.c | 68 | --- a/src/shared/base-filesystem.c |
69 | +++ b/src/shared/base-filesystem.c | 69 | +++ b/src/shared/base-filesystem.c |
70 | @@ -131,7 +131,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 70 | @@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { |
71 | return log_error_errno(errno, "Failed to open root file system: %m"); | 71 | /* The "root" parameter is decoration only – it's only used as part of log messages */ |
72 | 72 | ||
73 | for (size_t i = 0; i < ELEMENTSOF(table); i++) { | 73 | for (size_t i = 0; i < ELEMENTSOF(table); i++) { |
74 | - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) | 74 | - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) |
75 | + if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) | 75 | + if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) |
76 | continue; | 76 | continue; |
77 | 77 | ||
78 | if (table[i].target) { | 78 | if (table[i].target) { /* Create as symlink? */ |
79 | @@ -139,7 +139,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 79 | @@ -153,7 +153,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { |
80 | 80 | ||
81 | /* check if one of the targets exists */ | 81 | /* check if one of the targets exists */ |
82 | NULSTR_FOREACH(s, table[i].target) { | 82 | NULSTR_FOREACH(s, table[i].target) { |
@@ -85,7 +85,7 @@ index be6dd1654a..2726dc946a 100644 | |||
85 | continue; | 85 | continue; |
86 | 86 | ||
87 | /* check if a specific file exists at the target path */ | 87 | /* check if a specific file exists at the target path */ |
88 | @@ -150,7 +150,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 88 | @@ -164,7 +164,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { |
89 | if (!p) | 89 | if (!p) |
90 | return log_oom(); | 90 | return log_oom(); |
91 | 91 | ||