From 9b1896f26cafbc75091716397e914dabbd7b4f29 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 27 Sep 2012 16:14:19 +0000
Subject: [PATCH] fixed problem with ppolicy unlocking

---
 lam/lib/modules.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index 54f407e2..2b3115f4 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -1642,6 +1642,15 @@ class accountContainer {
 			$attributes[$this->finalDN] = $attributes[$this->dn_orig];
 			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']['pwdAccountLockedTime'])) {
+				unset($attributes[$this->finalDN]['modify']['pwdAccountLockedTime']);
+			}
+			if (isset($attributes[$this->finalDN]['remove']['pwdAccountLockedTime'])) {
+				unset($attributes[$this->finalDN]['remove']['pwdAccountLockedTime']);
+			}
+		}
 		// pre modify actions
 		$prePostModifyAttributes = array();
 		if (isset($attributes[$this->finalDN]) && is_array($attributes[$this->finalDN])) {