Merged change from STABLE, to fix possible $auth variable problem

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e75e65a244be6e6eaaa89c9e97f6d602e4047825..c85a0dff1ad86d0fc60af9dfdae3364e8ff25eed 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1208,6 +1208,10 @@ function authenticate_user_login($username, $password) {
         $auth = $user->auth;
     }
 
+    if (detect_munged_arguments($auth, 0)) {   // For safety on the next require
+        return false;
+    }
+
     if (!file_exists($CFG->dirroot .'/auth/'. $auth .'/lib.php')) {
         $auth = 'manual';    // Can't find auth module, default to internal
     }