From d6d5c5954dfe7a3aacfc93a58714c2e5bfd08229 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 12 Nov 2005 10:18:54 +0000
Subject: [PATCH] fixed removing of postalAddress and facsimileTelephoneNumber

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

diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index 008c5283..8a8b09a0 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -401,6 +401,15 @@ class inetOrgPerson extends baseModule {
 				unset($return[$_SESSION[$this->base]->dn]['add']['userPassword']);
 			}
 		}
+		// postalAddress and facsimileTelephoneNumber need special removing
+		if (isset($return[$_SESSION[$this->base]->dn]['remove']['postalAddress'])) {
+			$return[$_SESSION[$this->base]->dn]['modify']['postalAddress'] = array();
+			unset($return[$_SESSION[$this->base]->dn]['remove']['postalAddress']);
+		}
+		if (isset($return[$_SESSION[$this->base]->dn]['remove']['facsimileTelephoneNumber'])) {
+			$return[$_SESSION[$this->base]->dn]['modify']['facsimileTelephoneNumber'] = array();
+			unset($return[$_SESSION[$this->base]->dn]['remove']['facsimileTelephoneNumber']);
+		}
 		return $return;
 	}