summaryrefslogtreecommitdiffstats
path: root/apps/files_external/service
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2015-08-19 14:40:20 +0100
committerRobin McCorkell <rmccorkell@owncloud.com>2015-08-19 14:41:43 +0100
commit118cb7df1a906ce003fd80c1d64b357f45afcf02 (patch)
treefa7ebaaedf7a98362faed6d4f9cee069aaa705ac /apps/files_external/service
parent3bb793b6a711c6dcba266982b8aea4c6d3fe4bc5 (diff)
downloadnextcloud-server-118cb7df1a906ce003fd80c1d64b357f45afcf02.tar.gz
nextcloud-server-118cb7df1a906ce003fd80c1d64b357f45afcf02.zip
Allow builtin auth mechanism to be overridden
The builtin mechanism is used exclusively for legacy external storages, which when upgraded to the new registration need to fallback to the defined legacy authentication mechanism instead.
Diffstat (limited to 'apps/files_external/service')
-rw-r--r--apps/files_external/service/storagesservice.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index e89af6bc756..f655d990454 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -87,7 +87,7 @@ abstract class StoragesService {
}
$storageConfig->setBackend($backend);
- if (isset($storageOptions['authMechanism'])) {
+ if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') {
$authMechanism = $this->backendService->getAuthMechanism($storageOptions['authMechanism']);
} else {
$authMechanism = $backend->getLegacyAuthMechanism($storageOptions);