summaryrefslogtreecommitdiff
path: root/source4/dsdb/repl
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-14 15:35:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:40:49 -0500
commitabeb80b77fbd171d18ea50881022affdb1e9abbc (patch)
tree930231f55d36fc3a657f367536888b72e5182100 /source4/dsdb/repl
parent9f876c9fae1078b71138f6b5bc8b2152b0c64d7b (diff)
downloadsamba-abeb80b77fbd171d18ea50881022affdb1e9abbc.tar.gz
samba-abeb80b77fbd171d18ea50881022affdb1e9abbc.tar.bz2
samba-abeb80b77fbd171d18ea50881022affdb1e9abbc.zip
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)
Diffstat (limited to 'source4/dsdb/repl')
-rw-r--r--source4/dsdb/repl/replicated_objects.c11
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;
}