From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 17 Aug 2009 14:22:31 +0000 (+0000)
Subject: Revert changeset:14072.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=058b337f6b9d73fda1a3d46eb04d8719e6a4bb9e;p=gosa.git

Revert changeset:14072.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14078 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index faa963ae6..f3baf144d 100644
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -120,10 +120,7 @@ class LDAP{
      requests. I.e. member=....                                               */
   static function prepare4filter($dn)
   {
-    $str = normalizeLdap(str_replace('\\\\', '\\\\\\', LDAP::fix($dn))); 
-    /* Special-case '\,' for filters */ 
-    $str = str_replace('\\,', '\\5C2C', $str); 
-    return $str;
+    return normalizeLdap(str_replace('\\\\', '\\\\\\', LDAP::fix($dn)));
   }
 
 
diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 696ce9c9e..f58df50bc 100644
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -968,9 +968,7 @@ class plugin
             if($o_ogroup == NULL){
               $o_ogroup = new ogroup($this->config,$ogroup['dn']);
             }              
-            /* Members are stored with their converted names, so convert $c_mem as well 
-               to have it match in case of special characters in its name. */ 
-            unset($o_ogroup->member[LDAP::convert($c_mem)]); 
+            unset($o_ogroup->member[$c_mem]);
             $o_ogroup->member[$d_mem]= $d_mem;
           }
         }