diff options
author | Kamen Mazdrashki <kamenim@samba.org> | 2010-11-26 02:38:39 +0200 |
---|---|---|
committer | Kamen Mazdrashki <kamenim@samba.org> | 2010-12-01 13:01:16 +0200 |
commit | 4041791d01b10b250dab5b356f0477fb8a40907e (patch) | |
tree | 23352a1fd93e391d72ac3bb5ead4acd0861552dc /source4/dsdb/repl/replicated_objects.c | |
parent | 4cd16dde148662700311501e62ba3ee9bf80765a (diff) | |
download | samba-4041791d01b10b250dab5b356f0477fb8a40907e.tar.gz samba-4041791d01b10b250dab5b356f0477fb8a40907e.tar.bz2 samba-4041791d01b10b250dab5b356f0477fb8a40907e.zip |
s4-repl: Let dsdb_replicated_objects_convert() to accept schema from caller
This allows us to use schema that is different than the one
set to 'ldb' to decode objects.
Diffstat (limited to 'source4/dsdb/repl/replicated_objects.c')
-rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 58243349b9..8864706934 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -199,6 +199,7 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb, } WERROR dsdb_replicated_objects_convert(struct ldb_context *ldb, + const struct dsdb_schema *schema, const char *partition_dn_str, const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr, uint32_t object_count, @@ -213,7 +214,6 @@ WERROR dsdb_replicated_objects_convert(struct ldb_context *ldb, { WERROR status; struct ldb_dn *partition_dn; - const struct dsdb_schema *schema; struct dsdb_schema_prefixmap *pfm_remote; struct dsdb_extended_replicated_objects *out; const struct drsuapi_DsReplicaObjectListItemEx *cur; @@ -223,12 +223,11 @@ WERROR dsdb_replicated_objects_convert(struct ldb_context *ldb, W_ERROR_HAVE_NO_MEMORY(out); out->version = DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION; - /* Get the schema, and ensure it's kept valid for as long as 'out' which may contain pointers to it */ - schema = dsdb_get_schema(ldb, out); - if (!schema) { - talloc_free(out); - return WERR_DS_SCHEMA_NOT_LOADED; - } + /* + * Ensure schema is kept valid for as long as 'out' + * which may contain pointers to it + */ + talloc_reference(out, schema); partition_dn = ldb_dn_new(out, ldb, partition_dn_str); W_ERROR_HAVE_NO_MEMORY_AND_FREE(partition_dn, out); |