[Pkg-owncloud-commits] [owncloud] 52/95: DAV authentication: also use Owncloud's internal user for short-circuit

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.1
in repository owncloud.

commit 3c51f5ff38ae071a1116b6fa67b94df5c493261f
Author: Christian Seiler <christian at iwakd.de>
Date:   Mon Feb 16 23:47:39 2015 +0100

    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.
---
 lib/private/connector/sabre/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 6f7c429..ba2e7d6 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git