summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-06-14 09:50:45 +0200
committerGitHub <noreply@github.com>2017-06-14 09:50:45 +0200
commitb76e43e0a321e23ecd7ec9e9c71a9b5c6ee208ec (patch)
treefad6d2a8d09ad452ea5dfb85eac2dd1060fb181e /lib
parentdc61fb999d2d4283c478c436059c68ca6b18ea44 (diff)
parent86eb23b91ec4d0189a3bc211a27e99fb3bc94020 (diff)
downloadnextcloud-server-b76e43e0a321e23ecd7ec9e9c71a9b5c6ee208ec.tar.gz
nextcloud-server-b76e43e0a321e23ecd7ec9e9c71a9b5c6ee208ec.zip
Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption
don't try to encrypt/decrypt the certificate bundle
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Encryption/Util.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index ed91c0fe549..4eefe4a4022 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -97,6 +97,7 @@ class Util {
$this->excludedPaths[] = 'files_encryption';
$this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
+ $this->excludedPaths[] = 'files_external';
}
/**