From 0bc5a03b667c9ab38c6e0dff89a3f11c20b346e1 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 16 Aug 2005 12:04:09 +0000 Subject: [PATCH] fixed password conflict with posixAccount --- lam/lib/modules/inetOrgPerson.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 150be651..549d30bd 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -372,7 +372,18 @@ class inetOrgPerson extends baseModule { * lamdaemon are lamdaemon commands to modify homedir, quotas, ... */ function save_attributes() { - return $_SESSION[$this->base]->save_module_attributes($this->attributes, $this->orig); + $return = $_SESSION[$this->base]->save_module_attributes($this->attributes, $this->orig); + // do not set password if posixAccount is active + $modules = $_SESSION['config']->get_AccountModules($this->get_scope()); + if (in_array('posixAccount', $modules)) { + if (isset($return[$_SESSION[$this->base]->dn]['modify']['userPassword'])) { + unset($return[$_SESSION[$this->base]->dn]['modify']['userPassword']); + } + if (isset($return[$_SESSION[$this->base]->dn]['add']['userPassword'])) { + unset($return[$_SESSION[$this->base]->dn]['add']['userPassword']); + } + } + return $return; } function process_attributes(&$post) {