diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2014-03-01 06:08:32 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2014-03-01 06:08:32 +0100 |
| commit | eff7667d2665474776dc8a51b17c5bfaaa411118 (patch) | |
| tree | 04487aad023a0d2491c4f835bd848c9f536932c2 /lib | |
| parent | 88c9ae129e7dcc0e10aee682c8d4fa31b93b614c (diff) | |
| parent | da19109f403d4d41a417181f5e1de67972334bad (diff) | |
| download | nextcloud-server-eff7667d2665474776dc8a51b17c5bfaaa411118.tar.gz nextcloud-server-eff7667d2665474776dc8a51b17c5bfaaa411118.zip | |
Merge pull request #7433 from owncloud/config_basic_auth
Config to disable basic_auth username checking
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 49cbb1279d1..351b91b7dfa 100644 --- a/lib/base.php +++ b/lib/base.php @@ -554,7 +554,8 @@ class OC { OC_User::useBackend(new OC_User_Database()); OC_Group::useBackend(new OC_Group_Database()); - if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname') + $basic_auth = OC_Config::getValue('basic_auth', true); + if ($basic_auth && isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname') && $_SERVER['PHP_AUTH_USER'] !== self::$session->get('loginname')) { $sessionUser = self::$session->get('loginname'); $serverUser = $_SERVER['PHP_AUTH_USER']; |