From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 9 Aug 2012 06:16:03 +0000 (+1000)
Subject: s4-dsdb: Remove strcasecmp() fallback in replmd_ldb_message_element_attid_sort
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=d799b25dd3ed0f72ee03949225ba241c5538d7d6;p=metze%2Fsamba%2Fwip.git

s4-dsdb: Remove strcasecmp() fallback in replmd_ldb_message_element_attid_sort

In all callers, we must already have a attributeID for each of the
values or else we would have already given an error, or could not have
obtained the message over DRS.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Aug  9 11:39:54 CEST 2012 on sn-devel-104
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 4bfbee17609c..6b5e1219f80c 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -661,13 +661,6 @@ static int replmd_ldb_message_element_attid_sort(const struct ldb_message_elemen
 	a1 = dsdb_attribute_by_lDAPDisplayName(schema, e1->name);
 	a2 = dsdb_attribute_by_lDAPDisplayName(schema, e2->name);
 
-	/*
-	 * TODO: remove this check, we should rely on e1 and e2 having valid attribute names
-	 *       in the schema
-	 */
-	if (!a1 || !a2) {
-		return strcasecmp(e1->name, e2->name);
-	}
 	if (a1->attributeID_id == a2->attributeID_id) {
 		return 0;
 	}