aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption/lib/Services
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption/lib/Services')
-rw-r--r--apps/encryption/lib/Services/PassphraseService.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/encryption/lib/Services/PassphraseService.php b/apps/encryption/lib/Services/PassphraseService.php
index 0786cd3399a..bdcc3f1108a 100644
--- a/apps/encryption/lib/Services/PassphraseService.php
+++ b/apps/encryption/lib/Services/PassphraseService.php
@@ -55,6 +55,11 @@ class PassphraseService {
return true;
}
+ if ($this->util->isMasterKeyEnabled()) {
+ $this->logger->error('setPassphraseForUser should never be called when master key is enabled');
+ return true;
+ }
+
// Check user exists on backend
$user = $this->userManager->get($userId);
if ($user === null) {