L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auth/cas MDL-16168 CAS crashes if no LDAP is set up

Browse Source 
Fix the other two potential places where CAS would crash
if no LDAP server is configured.

Thanks to Mark Nielsen for prompting me to have a deeper look at it.
This commit is contained in:
Inaki
2010-09-24 12:27:07 +00:00
parent 0e744d43dc
commit a727aabc50
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/cas/auth.php
+7 -1
View File
@@ -631,6 +631,12 @@ if ( !is_object($PHPCAS_CLIENT) ) {
*/
function sync_users ($bulk_insert_records = 1000, $do_updates = true) {
global $CFG;
if(empty($this->config->host_url)) {
echo "No LDAP server configured for CAS! Syncing disabled.\n";
return;
}
$textlib = textlib_get_instance();
$droptablesql = array(); /// sql commands to drop the table (because session scope could be a problem for
/// some persistent drivers like ODBTP (mssql) or if this function is invoked
@@ -979,7 +985,7 @@ if ( !is_object($PHPCAS_CLIENT) ) {
* @return boolean result
*/
function iscreator($username) {
if ((empty($this->config->attrcreators) && empty($this->config->groupecreators)) or empty($this->config->memberattribute)) {
if (empty($this->config->host_url) or (empty($this->config->attrcreators) && empty($this->config->groupecreators)) or empty($this->config->memberattribute)) {
return null;
}
$textlib = textlib_get_instance();