diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-01-29 15:52:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 15:52:14 +0100 |
| commit | 98c8cd508944c054d08c6acde5e2d64867d84fb9 (patch) | |
| tree | 525c7e1f959cda74a591113db073dfbf9c31614c /apps/dav/lib | |
| parent | 8fcc0e8d8c463496009762e7759ac230cbe62cfa (diff) | |
| parent | e9ae943bbaeda07724dd52cb238caad015504a6f (diff) | |
| download | nextcloud-server-98c8cd508944c054d08c6acde5e2d64867d84fb9.tar.gz nextcloud-server-98c8cd508944c054d08c6acde5e2d64867d84fb9.zip | |
Merge pull request #25383 from nextcloud/bugfix/24893
Properly handle SMB ACL blocking scanning a directory
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/Directory.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php index 990e57eea58..98705c57792 100644 --- a/apps/dav/lib/Connector/Sabre/Directory.php +++ b/apps/dav/lib/Connector/Sabre/Directory.php @@ -41,6 +41,7 @@ use OCA\DAV\Connector\Sabre\Exception\InvalidPath; use OCP\Files\FileInfo; use OCP\Files\ForbiddenException; use OCP\Files\InvalidPathException; +use OCP\Files\NotPermittedException; use OCP\Files\StorageNotAvailableException; use OCP\Lock\ILockingProvider; use OCP\Lock\LockedException; @@ -343,6 +344,8 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol return [0, 0]; } catch (\OCP\Files\StorageNotAvailableException $e) { return [0, 0]; + } catch (NotPermittedException $e) { + return [0, 0]; } } |