From: exe-cutor <exe-cutor>
Date: Wed, 12 Apr 2006 14:54:01 +0000 (+0000)
Subject: Fixed the case where a user would manually log in with an unknown username
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=f26baa3e2b02a711217915f215182f6552e01a29;p=moodle.git

Fixed the case where a user would manually log in with an unknown username
---

diff --git a/auth/shibboleth/lib.php b/auth/shibboleth/lib.php
index 45c5e8f02c..37f04b9e0f 100755
--- a/auth/shibboleth/lib.php
+++ b/auth/shibboleth/lib.php
@@ -8,17 +8,13 @@ function auth_user_login($username, $password) {
 
     $pluginconfig   = get_config('auth/shibboleth');
     
-/// If we are in the shibboleth directory then we trust the server var
+    // If we are in the shibboleth directory then we trust the server var
     if (!empty($_SERVER[$pluginconfig->shib_user_attribute])) {
         return ($_SERVER[$pluginconfig->shib_user_attribute] == $username);
     } else {
-    /// If we are not, then the server is probably set to not be Shibboleth-only
-    /// and the user has used the normal login screen, so we redirect to the shibboleth
-    /// directory for a proper check
-        redirect($CFG->wwwroot.'/auth/shibboleth/index.php');
-    
-    /// There's no point doing anything further here
-        exit;
+    // If we are not, the user has used the manual login and the login name is
+    // unknown, so we return false.
+        return false;
     }
 }