From 74a83be540c8fa0dd0f91da25b1f9d7ccc4ec568 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 26 Mar 2014 12:46:57 +1300 Subject: [PATCH] dsdb: Improve missing objectClass handling This attempts to permit deletion of objects that have no objectClass to allow dbcheck to clean up a corrupt database. It is not complete, the replmd_replPropertyMetaDataCtr1_sort_and_verify() call will still fail, but this is as much as is safe to do without a way to replicate the original issue. Andrew Bartlett Change-Id: If0b6c7f18e8aee587e6b3b4af878a0145f5eac37 Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 4f276b39910..4e5d8f0597c 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -1523,19 +1523,19 @@ static int replmd_update_rpmd(struct ldb_module *module, * corruption if we don't have this! */ objectclass_el = ldb_msg_find_element(res->msgs[0], "objectClass"); - if (objectclass_el == NULL) { - ldb_debug_set(ldb, LDB_DEBUG_FATAL, - __location__ ": objectClass missing on %s\n", - ldb_dn_get_linearized(msg->dn)); - return LDB_ERR_OPERATIONS_ERROR; - } - - /* - * Now check if this objectClass means we need to do urgent replication - */ - if (!*is_urgent && replmd_check_urgent_objectclass(objectclass_el, - situation)) { - *is_urgent = true; + if (objectclass_el != NULL) { + /* + * Now check if this objectClass means we need to do urgent replication + */ + if (!*is_urgent && replmd_check_urgent_objectclass(objectclass_el, + situation)) { + *is_urgent = true; + } + } else if (!ldb_request_get_control(req, DSDB_CONTROL_DBCHECK)) { + ldb_asprintf_errstring(ldb, __location__ + ": objectClass missing on %s\n", + ldb_dn_get_linearized(msg->dn)); + return LDB_ERR_OBJECT_CLASS_VIOLATION; } /* -- 2.11.4.GIT