Merge commit '75245bbc807b67247234c9103b162008c5b5b326' into cweiske

[contagged] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index bbae2701b2f18402547082e66515a8d8548bdf80..301148c63b91a53693e4cf6f29e3667dd3b54297 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -344,7 +344,7 @@ function ldap_store_objectclasses($dn,$classes){
   $add['objectClass'] = $set;
 
   $r = @ldap_mod_replace($LDAP_CON,$dn,$add);
-  tpl_ldaperror();
+  tpl_ldaperror('store object classes');
 
 /*  print '<pre>';
   print_r($set);
@@ -387,7 +387,7 @@ function ldap_queryabooks($filter,$types){
   $result3 = array();
 
   // public addressbook
-  $sr      = @ldap_list($LDAP_CON,$conf['publicbook'],
+  $sr      = @ldap_search($LDAP_CON,$conf['publicbook'],
                         $filter,$types);
   tpl_ldaperror();
   $result1 = ldap_get_binentries($LDAP_CON, $sr);