diff options
| author | blizzz <blizzz@owncloud.com> | 2013-11-19 13:51:12 -0800 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2013-11-19 13:51:12 -0800 |
| commit | 93ff86e31f30798b1e841863690290a8fd9a36de (patch) | |
| tree | d639c2dd80d8d14d23ce80d5d0b7c50835da45e3 | |
| parent | 5f6f78ee0342b6afd5c1a6ad4f1866267067ff00 (diff) | |
| parent | b823505bd1190f5e8920373fc043d6735e640d01 (diff) | |
| download | nextcloud-server-93ff86e31f30798b1e841863690290a8fd9a36de.tar.gz nextcloud-server-93ff86e31f30798b1e841863690290a8fd9a36de.zip | |
Merge pull request #5951 from owncloud/ldap_encryption_fix
fix encryption with LDAP, make sure that the owners home is mounted correctly
| -rw-r--r-- | apps/files_encryption/lib/util.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 1af5e56e10b..f9beb9de670 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -84,6 +84,8 @@ class Util { $this->privateKeyPath = '/owncloud_private_key/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key $this->isPublic = true; + // make sure that the owners home is mounted + \OC\Files\Filesystem::initMountPoints($GLOBALS['fileOwner']); } } else { @@ -99,6 +101,8 @@ class Util { $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key $this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key + // make sure that the owners home is mounted + \OC\Files\Filesystem::initMountPoints($this->userId); } } |