From 5d11bb28fe787bc3c980f922bd91ec7119143645 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sun, 28 Feb 2010 14:36:29 +0000 Subject: [PATCH] load internal attributes, too added some more debug output --- lam/lib/modules.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index d63a2e49..9ace754a 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -1652,7 +1652,7 @@ class accountContainer { $this->module = array(); $modules = $_SESSION['config']->get_AccountModules($this->type); $search = substr($dn, 0, strpos($dn, ',')); - $result = @ldap_read($_SESSION['ldap']->server(), escapeDN($dn), escapeDN($search), array(), 0, 0, 0, LDAP_DEREF_NEVER); + $result = @ldap_read($_SESSION['ldap']->server(), escapeDN($dn), escapeDN($search), array('*', '+'), 0, 0, 0, LDAP_DEREF_NEVER); if (!$result) { return array(array("ERROR", _("Unable to load LDAP entry:") . " " . $dn, ldap_error($_SESSION['ldap']->server()))); } @@ -1893,6 +1893,7 @@ class accountContainer { if (strtolower($this->finalDN) != strtolower($this->dn_orig)) { // move existing DN if ($this->dn_orig!='') { + logNewMessage(LOG_DEBUG, 'Rename ' . $this->dn_orig . ' to ' . $this->finalDN); $success = ldap_rename($_SESSION['ldap']->server(), $this->dn_orig, $this->getRDN($this->finalDN), $this->getParentDN($this->finalDN), false); if ($success) { logNewMessage(LOG_NOTICE, '[' . $ldapUser .'] Renamed DN ' . $this->dn_orig . " to " . $this->finalDN); @@ -1924,6 +1925,7 @@ class accountContainer { $DNs = array_keys($attributes); for ($i=0; $iserver(), $DNs[$i], $attributes[$DNs[$i]]['modify']);