diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-15 13:19:17 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-16 14:15:04 +0200 |
| commit | b25c06f5769fbcd90a780cbce90998a38c112043 (patch) | |
| tree | 3e132d33eacce05ec0ee021a0f1efa953538892a /lib/private/encryption/keys | |
| parent | 67500d5f2fa9eae33a33095b3e0ddc723dae69c5 (diff) | |
| download | nextcloud-server-b25c06f5769fbcd90a780cbce90998a38c112043.tar.gz nextcloud-server-b25c06f5769fbcd90a780cbce90998a38c112043.zip | |
detect system wide mount points correctly
Diffstat (limited to 'lib/private/encryption/keys')
| -rw-r--r-- | lib/private/encryption/keys/storage.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index 9d978193130..925c20c74c8 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -266,7 +266,7 @@ class Storage implements \OCP\Encryption\Keys\IStorage { $filename = $this->util->stripPartialFileExtension($filename); // in case of system wide mount points the keys are stored directly in the data directory - if ($this->util->isSystemWideMountPoint($filename)) { + if ($this->util->isSystemWideMountPoint($filename, $owner)) { $keyPath = $this->keys_base_dir . $filename . '/'; } else { $keyPath = '/' . $owner . $this->keys_base_dir . $filename . '/'; @@ -287,7 +287,7 @@ class Storage implements \OCP\Encryption\Keys\IStorage { list($owner, $source) = $this->util->getUidAndFilename($source); list(, $target) = $this->util->getUidAndFilename($target); - $systemWide = $this->util->isSystemWideMountPoint($target); + $systemWide = $this->util->isSystemWideMountPoint($target, $owner); if ($systemWide) { $sourcePath = $this->keys_base_dir . $source . '/'; @@ -315,7 +315,7 @@ class Storage implements \OCP\Encryption\Keys\IStorage { list($owner, $source) = $this->util->getUidAndFilename($source); list(, $target) = $this->util->getUidAndFilename($target); - $systemWide = $this->util->isSystemWideMountPoint($target); + $systemWide = $this->util->isSystemWideMountPoint($target, $owner); if ($systemWide) { $sourcePath = $this->keys_base_dir . $source . '/'; |