summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-12-29 14:08:53 +0100
committerGitHub <noreply@github.com>2020-12-29 14:08:53 +0100
commitd2e67312bb5190f9079a7696af1ca64d3b8b047e (patch)
treed28275b9ad99e6151451d5ad305714d8a9da193d
parent83ab996b1698efed3d9c6e06a6bf3f6284bb019b (diff)
parent8501cf9b5c45bec19e4ceb2a6030c2a3aa3ba0f4 (diff)
downloadnextcloud-server-d2e67312bb5190f9079a7696af1ca64d3b8b047e.tar.gz
nextcloud-server-d2e67312bb5190f9079a7696af1ca64d3b8b047e.zip
Merge pull request #22921 from nextcloud/no-root-encryption-wrapper
dont apply encryption wrapper for root mount
-rw-r--r--lib/private/Encryption/EncryptionWrapper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Encryption/EncryptionWrapper.php b/lib/private/Encryption/EncryptionWrapper.php
index edbdc692b45..0ae9c2c9357 100644
--- a/lib/private/Encryption/EncryptionWrapper.php
+++ b/lib/private/Encryption/EncryptionWrapper.php
@@ -81,7 +81,7 @@ class EncryptionWrapper {
'mount' => $mount
];
- if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class)) {
+ if (!$storage->instanceOfStorage(Storage\IDisableEncryptionStorage::class) && $mountPoint !== '/') {
$user = \OC::$server->getUserSession()->getUser();
$mountManager = Filesystem::getMountManager();
$uid = $user ? $user->getUID() : null;