sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r25704: Handle the chicken-and-egg problem of setting up the LDB before we get

Browse Source 
a schema.  perhaps i need to look into metze's 'load a schema from
ldif' code.

Andrew Bartlett
(This used to be commit f350ef5f19)
This commit is contained in:
Andrew Bartlett 2007-10-19 06:47:54 +02:00 committed by Stefan Metzmacher
parent e85370e703
commit 35dc4d9999
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,15 +217,22 @@ static int objectclass_sort(struct ldb_module *module,
* the bottom here */
} while (parent_class);
if (unsorted) {
/* This shouldn't happen, and would break MMC, but we can't
* afford to loose objectClasses. Perhaps there was no 'top',
* or some other schema error?
*/
ldb_asprintf_errstring(module->ldb, "objectclass %s is not a valid objectClass in objectClass chain", unsorted->objectclass);
return LDB_ERR_OBJECT_CLASS_VIOLATION;
if (!unsorted) {
return LDB_SUCCESS;
}
return LDB_SUCCESS;
if (!schema) {
/* If we don't have schema yet, then just merge the lists again */
DLIST_CONCATENATE(sorted, unsorted, struct class_list *);
return LDB_SUCCESS;
}
/* This shouldn't happen, and would break MMC, perhaps there
* was no 'top', a conflict in the objectClasses or some other
* schema error?
*/
ldb_asprintf_errstring(module->ldb, "objectclass %s is not a valid objectClass in objectClass chain", unsorted->objectclass);
return LDB_ERR_OBJECT_CLASS_VIOLATION;
}
static DATA_BLOB *get_sd(struct ldb_module *module, TALLOC_CTX *mem_ctx,