diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-21 15:33:31 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-09-21 15:33:32 +0200 |
| commit | 61f0f198bf97dca9d652eda10c81a279db5f20c9 (patch) | |
| tree | 4f5b316b70c3d29a496ad5215ed5ec08adde3c0a /src/systemd/src/basic/fs-util.c | |
| parent | 843ea77e93af230ba113adae2ed92fe80db83717 (diff) | |
| parent | eba874f859945a7a9aa22735cd20b144dc0eb918 (diff) | |
| download | NetworkManager-61f0f198bf97dca9d652eda10c81a279db5f20c9.tar.gz | |
systemd: merge branch systemd into master
Diffstat (limited to 'src/systemd/src/basic/fs-util.c')
| -rw-r--r-- | src/systemd/src/basic/fs-util.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/systemd/src/basic/fs-util.c b/src/systemd/src/basic/fs-util.c index 176a5739c8..13372c542a 100644 --- a/src/systemd/src/basic/fs-util.c +++ b/src/systemd/src/basic/fs-util.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <linux/magic.h> #include <time.h> #include <unistd.h> @@ -728,6 +729,9 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, if (fstat(child, &st) < 0) return -errno; + if ((flags & CHASE_NO_AUTOFS) && + fd_check_fstype(child, AUTOFS_SUPER_MAGIC) > 0) + return -EREMOTE; if (S_ISLNK(st.st_mode)) { char *joined; |