diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-07-01 14:54:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-01 14:54:23 +1000 |
commit | 8974bf92a84091ce4b6cd42525648a71a4ca20b4 (patch) | |
tree | 3759053b28c3484161a289ea8ba9ec43dd06d6d7 /source4/dsdb | |
parent | b3e8d3ad99141f6c1aaf7c314284bb33ca9cf2bf (diff) | |
parent | 5767b578a0ad9db91bb5f4ca5e74615c663034a7 (diff) | |
download | samba-8974bf92a84091ce4b6cd42525648a71a4ca20b4.tar.gz samba-8974bf92a84091ce4b6cd42525648a71a4ca20b4.tar.bz2 samba-8974bf92a84091ce4b6cd42525648a71a4ca20b4.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit cd5e48649ce0987952b2b55ea79c3ecceecfafd5)
Diffstat (limited to 'source4/dsdb')
-rw-r--r-- | source4/dsdb/repl/drepl_out_helpers.c | 12 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/schema_fsmo.c | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index aede6e6595..d79d94fc12 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -253,10 +253,10 @@ static void dreplsrv_op_pull_source_get_changes_send(struct dreplsrv_op_pull_sou r->in.req.req8.replica_flags = rf1->replica_flags; r->in.req.req8.max_object_count = 133; r->in.req.req8.max_ndr_size = 1336811; - r->in.req.req8.unknown4 = 0; - r->in.req.req8.h1 = 0; - r->in.req.req8.unique_ptr1 = 0; - r->in.req.req8.unique_ptr2 = 0; + r->in.req.req8.extended_op = DRSUAPI_EXOP_NONE; + r->in.req.req8.fsmo_info = 0; + r->in.req.req8.partial_attribute_set = NULL; + r->in.req.req8.partial_attribute_set_ex = NULL; r->in.req.req8.mapping_ctr.num_mappings = 0; r->in.req.req8.mapping_ctr.mappings = NULL; } else { @@ -269,8 +269,8 @@ static void dreplsrv_op_pull_source_get_changes_send(struct dreplsrv_op_pull_sou r->in.req.req5.replica_flags = rf1->replica_flags; r->in.req.req5.max_object_count = 133; r->in.req.req5.max_ndr_size = 1336770; - r->in.req.req5.unknown4 = 0; - r->in.req.req5.h1 = 0; + r->in.req.req5.extended_op = DRSUAPI_EXOP_NONE; + r->in.req.req5.fsmo_info = 0; } req = dcerpc_drsuapi_DsGetNCChanges_send(drsuapi->pipe, r, r); diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c index 8ceeba9804..bc1e60abb2 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c @@ -54,6 +54,8 @@ static int schema_fsmo_init(struct ldb_module *module) NULL }; + module->private_data = NULL; + if (dsdb_get_schema(module->ldb)) { return ldb_next_init(module); } @@ -77,7 +79,6 @@ static int schema_fsmo_init(struct ldb_module *module) ldb_oom(module->ldb); return LDB_ERR_OPERATIONS_ERROR; } - module->private_data = schema_fsmo; schema = dsdb_new_schema(mem_ctx, lp_iconv_convenience(ldb_get_opaque(module->ldb, "loadparm"))); if (!schema) { @@ -246,7 +247,7 @@ static int schema_fsmo_init(struct ldb_module *module) return LDB_ERR_OPERATIONS_ERROR; } - talloc_steal(module, schema_fsmo); + module->private_data = talloc_steal(module, schema_fsmo); ldb_debug(module->ldb, LDB_DEBUG_TRACE, "schema_fsmo_init: we are master: %s\n", |