diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-07 06:29:56 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-07 06:29:56 -0700 |
| commit | b48dffa9a302881e8d1effe9d03bc97e96adc23b (patch) | |
| tree | a9bcc7299561960b637afc716f445093688cf3a4 /lib/private/connector | |
| parent | 0d492afee1ed6a6c032451181c20fd0b90f3105e (diff) | |
| parent | 47ed6a5135dd1c6bc01169f430ebb243e29f2694 (diff) | |
| download | nextcloud-server-b48dffa9a302881e8d1effe9d03bc97e96adc23b.tar.gz nextcloud-server-b48dffa9a302881e8d1effe9d03bc97e96adc23b.zip | |
Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
Diffstat (limited to 'lib/private/connector')
| -rw-r--r-- | lib/private/connector/sabre/auth.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php index bf3a49593cb..d2fd74c44f9 100644 --- a/lib/private/connector/sabre/auth.php +++ b/lib/private/connector/sabre/auth.php @@ -72,6 +72,11 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { * @return bool */ public function authenticate(Sabre_DAV_Server $server, $realm) { + + if (OC_User::handleApacheAuth()) { + return true; + } + if (OC_User::isLoggedIn()) { $user = OC_User::getUser(); OC_Util::setupFS($user); |