chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: never follow symlinks in rm_rf_children()
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index 20cbc2b0db4a2b77d1b2146cf3f687265732298a..dfc1dc6b85a94a7dec0bf01cc2b74dfc08938c9f 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-3593,7
+3593,8
@@
static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
if (is_dir) {
int subdir_fd;
if (is_dir) {
int subdir_fd;
- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
+ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
+ if (subdir_fd < 0) {
if (ret == 0 && errno != ENOENT)
ret = -errno;
continue;
if (ret == 0 && errno != ENOENT)
ret = -errno;
continue;