From 034d9d6753c22db6fb38a9cf85f550a0b376ca9f Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Fri, 28 Mar 2008 14:47:53 -0400
Subject: [PATCH] Do case-less comparisons when considering objectclass but
 store the current value to prevent unnecessary LPAP updates (and failed
 writes)

Don't check against these lists on updates, only add them on new entries.

Disable the ability to configure in the UI these values for now.

438256
---
 ipa-server/ipa-gui/ipagui/templates/ipapolicyeditform.kid | 2 ++
 ipa-server/ipa-gui/ipagui/templates/ipapolicyshow.kid     | 2 ++
 ipa-server/xmlrpc-server/funcs.py                         | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ipa-server/ipa-gui/ipagui/templates/ipapolicyeditform.kid b/ipa-server/ipa-gui/ipagui/templates/ipapolicyeditform.kid
index 26eba5651..a608829c0 100644
--- a/ipa-server/ipa-gui/ipagui/templates/ipapolicyeditform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/ipapolicyeditform.kid
@@ -199,6 +199,7 @@ from ipagui.helpers import ipahelper
               py:content="tg.errors.get('ipadefaultemaildomain')" />
           </td>
         </tr>
+      <!--
       <tr>
         <th>
           <label class="fieldlabel" for="${ipapolicy_fields.userobjectclasses.field_id}"
@@ -265,6 +266,7 @@ from ipagui.helpers import ipahelper
           <a id="${ipapolicy_fields.groupobjectclasses.field_id}_doclink" href="javascript:ExpandingForm.addItem('${ipapolicy_fields.groupobjectclasses.field_id}');">Add Group Object Class</a>
         </td>
       </tr>
+      -->
     </table>
 
     <hr/>
diff --git a/ipa-server/ipa-gui/ipagui/templates/ipapolicyshow.kid b/ipa-server/ipa-gui/ipagui/templates/ipapolicyshow.kid
index 98fc69623..3549a9f13 100644
--- a/ipa-server/ipa-gui/ipagui/templates/ipapolicyshow.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/ipapolicyshow.kid
@@ -135,6 +135,7 @@ edit_url = tg.url('/ipapolicy/edit')
           </th>
           <td>${ipapolicy.get("ipadefaultemaildomain")}</td>
         </tr>
+        <!--
         <tr>
           <th>
             <label class="fieldlabel" py:content="fields.ipauserobjectclasses.label" />:
@@ -175,6 +176,7 @@ edit_url = tg.url('/ipapolicy/edit')
           </table>
           </td>
         </tr>
+        -->
     </table>
 <hr />
     <input class="submitbutton" type="button"
diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py
index 879ff6bee..11b4e9fb5 100644
--- a/ipa-server/xmlrpc-server/funcs.py
+++ b/ipa-server/xmlrpc-server/funcs.py
@@ -998,7 +998,7 @@ class IPAServer:
         config = self.get_ipa_config(opts)
 
         # Make sure we have the latest object classes
-        newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipauserobjectclasses'))
+        # newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipauserobjectclasses'))
         
         try:
            rv = self.update_entry(oldentry, newentry, opts)
@@ -1628,7 +1628,7 @@ class IPAServer:
         config = self.get_ipa_config(opts)
 
         # Make sure we have the latest object classes
-        newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipagroupobjectclasses'))
+        # newentry['objectclass'] = uniq_list(newentry.get('objectclass') + config.get('ipagroupobjectclasses'))
 
         try:
            rv = self.update_entry(oldentry, newentry, opts)
@@ -2136,4 +2136,4 @@ def ldap_search_escape(match):
 def uniq_list(x):
     """Return a unique list, preserving order and ignoring case"""
     set = {}
-    return [set.setdefault(e.lower(),e.lower()) for e in x if e.lower() not in set]
+    return [set.setdefault(e.lower(),e) for e in x if e.lower() not in set]