From 0d9bbabf47f0958d61262015ab0a45db163b614a Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 27 Sep 2012 16:16:46 +0000 Subject: [PATCH] fixed problem with ppolicy unlocking --- lam/lib/modules.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 2b3115f4..7746de23 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -1643,7 +1643,7 @@ class accountContainer { unset($attributes[$this->dn_orig]); } // remove pwdAccountLockedTime attribute change if also userPassword is changed (PPolicy will remove this attribute itself) - if (isset($attributes[$this->finalDN]['modify']['userPassword'])) { + if (isset($attributes[$this->finalDN]['modify']['userPassword']) || isset($attributes[$this->finalDN]['remove']['userPassword'])) { if (isset($attributes[$this->finalDN]['modify']['pwdAccountLockedTime'])) { unset($attributes[$this->finalDN]['modify']['pwdAccountLockedTime']); }