sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s4:objectclass LDB module - fix up the sorting in respect to structural or 88 objectclasses

Browse Source 
Please have a look at MS-ADTS 3.1.1.1.4.

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Matthias Dieter Wallnöfer 2012-03-25 22:51:51 +02:00 committed by Andrew Bartlett
parent 52340b86a2
commit 0f8ffa9ce1
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source4/dsdb/samdb/ldb_modules/objectclass.c
View File

@ -100,7 +100,9 @@ static int objectclass_sort(struct ldb_module *module,
{
struct ldb_context *ldb;
unsigned int i, lowest;
struct class_list *unsorted = NULL, *sorted = NULL, *current = NULL, *poss_parent = NULL, *new_parent = NULL, *current_lowest = NULL;
struct class_list *unsorted = NULL, *sorted = NULL, *current = NULL,
*poss_parent = NULL, *new_parent = NULL,
*current_lowest = NULL, *current_lowest_struct = NULL;
ldb = ldb_module_get_ctx(module);
@ -190,13 +192,25 @@ static int objectclass_sort(struct ldb_module *module,
/* For each object: order by hierarchy */
while (unsorted != NULL) {
lowest = UINT_MAX;
current_lowest = NULL;
current_lowest = current_lowest_struct = NULL;
for (current = unsorted; current != NULL; current = current->next) {
if(current->objectclass->subClass_order < lowest) {
current_lowest = current;
if (current->objectclass->subClass_order <= lowest) {
/*
* According to MS-ADTS 3.1.1.1.4 structural
* and 88 object classes are always listed after
* the other class types in a subclass hierarchy
*/
if (current->objectclass->objectClassCategory > 1) {
current_lowest = current;
} else {
current_lowest_struct = current;
}
lowest = current->objectclass->subClass_order;
}
}
if (current_lowest == NULL) {
current_lowest = current_lowest_struct;
}
if (current_lowest != NULL) {
DLIST_REMOVE(unsorted,current_lowest);