From 7d49253f40c19af1cb34ff65657ed1fc3c48d6ca Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Tue, 26 Sep 2006 01:26:27 +0000 Subject: [PATCH] Here's a little patch for auth/ldap/lib.php... just stops some errors from popping up. Credit: Alastair Pharo --- auth/ldap/lib.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php index c314ea1b4ba..d2ab22d8468 100644 --- a/auth/ldap/lib.php +++ b/auth/ldap/lib.php @@ -410,6 +410,11 @@ function auth_sync_users ($bulk_insert_records = 1000, $do_updates=1) { print "connecting to ldap\n"; $ldapconnection = auth_ldap_connect(); + if (!$ldapconnection) { + @ldap_close($ldapconnection); + notify("LDAP-module cannot connect to server: $CFG->ldap_host_url"); + return false; + } //// //// get user's list from ldap to sql in a scalable fashion @@ -447,19 +452,20 @@ function auth_sync_users ($bulk_insert_records = 1000, $do_updates=1) { array($CFG->ldap_user_attribute)); } - $entry = ldap_first_entry($ldapconnection, $ldap_result); - do { - $value = ldap_get_values_len($ldapconnection, $entry,$CFG->ldap_user_attribute); - $value = $value[0]; - $count++; - array_push($fresult, $value); - if(count($fresult) >= $bulk_insert_records){ - auth_ldap_bulk_insert($fresult); - //print var_dump($fresult); - $fresult=array(); - } + if ($entry = ldap_first_entry($ldapconnection, $ldap_result)) { + do { + $value = ldap_get_values_len($ldapconnection, $entry,$CFG->ldap_user_attribute); + $value = $value[0]; + $count++; + array_push($fresult, $value); + if(count($fresult) >= $bulk_insert_records){ + auth_ldap_bulk_insert($fresult); + //print var_dump($fresult); + $fresult=array(); + } + } + while ($entry = ldap_next_entry($ldapconnection, $entry)); } - while ($entry = ldap_next_entry($ldapconnection, $entry)); // insert any remaining users and release mem if(count($fresult)){