summaryrefslogtreecommitdiffstats
path: root/lib/private/connector
diff options
context:
space:
mode:
authorChristian Seiler <christian@iwakd.de>2015-02-16 23:47:39 +0100
committerChristian Seiler <christian@iwakd.de>2015-02-16 23:47:39 +0100
commit535757bc427d91a6b96b7b3a145d83e1fefef43a (patch)
treea96c3f37e5c7303bb82478dbbb84d35ef74f3793 /lib/private/connector
parent1377ebc7e9b9a5bed36b5a1ca8da2c6ef35eb74a (diff)
downloadnextcloud-server-535757bc427d91a6b96b7b3a145d83e1fefef43a.tar.gz
nextcloud-server-535757bc427d91a6b96b7b3a145d83e1fefef43a.zip
DAV authentication: also use Owncloud's internal user for short-circuit
It still works otherwise, but without this, the performance optimization of #13416 is defeated in these situations.
Diffstat (limited to 'lib/private/connector')
-rw-r--r--lib/private/connector/sabre/auth.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 6f7c429fd38..ba2e7d6327b 100644
--- a/lib/private/connector/sabre/auth.php
+++ b/lib/private/connector/sabre/auth.php
@@ -52,7 +52,7 @@ class OC_Connector_Sabre_Auth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
*/
protected function validateUserPass($username, $password) {
if (OC_User::isLoggedIn() &&
- $this->isDavAuthenticated($username)
+ $this->isDavAuthenticated(OC_User::getUser())
) {
OC_Util::setupFS(OC_User::getUser());
\OC::$server->getSession()->close();