r20767: don't pass a dsdb_schema to dsdb_extended_replicated_objects_commit()

anymore it should use the dsdb_schema attached to the ldb_context
via dsdb_get_schema()

metze
(This used to be commit efa31bbc3717fbf087ff76c4396975f131b16b92)

1 files changed, 8 insertions, 3 deletions

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 94805c1150..9a9fd40d4b 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -169,7 +169,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
 
 WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
 					       const char *partition_dn,
-					       const struct dsdb_schema *schema,
 					       const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
 					       uint32_t object_count,
 					       const struct drsuapi_DsReplicaObjectListItemEx *first_object,
@@ -181,12 +180,18 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
 					       struct dsdb_extended_replicated_objects **_out)
 {
 	WERROR status;
+	const struct dsdb_schema *schema;
 	struct dsdb_extended_replicated_objects *out;
 	struct ldb_result *ext_res;
 	const struct drsuapi_DsReplicaObjectListItemEx *cur;
 	uint32_t i;
 	int ret;
 
+	schema = dsdb_get_schema(ldb);
+	if (!schema) {
+		return WERR_DS_SCHEMA_NOT_LOADED;
+	}
+
 	status = dsdb_verify_oid_mappings_drsuapi(schema, mapping_ctr);
 	W_ERROR_NOT_OK_RETURN(status);
 
@@ -222,8 +227,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
 
 	ret = ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, out, &ext_res);
 	if (ret != LDB_SUCCESS) {
-		DEBUG(0,("Failed to apply records: %d\n",
-			ret));
+		DEBUG(0,("Failed to apply records: %d: %s\n",
+			ret, ldb_strerror(ret)));
 		talloc_free(out);
 		return WERR_FOOBAR;
 	}