diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2016-07-27 16:09:22 +1200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-07-28 10:06:09 +0200 |
| commit | 2bb5f7d3ce86aca9b9e365b585027f72ca9691af (patch) | |
| tree | 46ed663be7e10dd4be0a09cb95857c0f5092832a /source4 | |
| parent | 032fc2762ea47df069e02a55ad8d586ec75ff73c (diff) | |
| download | samba-2bb5f7d3ce86aca9b9e365b585027f72ca9691af.tar.gz | |
replmd: Remove data field on DSDB_CONTROL_REPLICATED_UPDATE_OID
There were no users of the data, and it added additional complexity
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 11 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb.h | 3 |
2 files changed, 1 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 7d098355cff..fc62c442dc7 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -5886,7 +5886,6 @@ static int replmd_extended_replicated_objects(struct ldb_module *module, struct uint32_t i; struct replmd_private *replmd_private = talloc_get_type(ldb_module_get_private(module), struct replmd_private); - struct dsdb_control_replicated_update *rep_update; ldb = ldb_module_get_ctx(module); @@ -5927,15 +5926,7 @@ static int replmd_extended_replicated_objects(struct ldb_module *module, struct if (!req->controls) return replmd_replicated_request_werror(ar, WERR_NOMEM); } - /* This allows layers further down to know if a change came in - over replication and what the replication flags were */ - rep_update = talloc_zero(ar, struct dsdb_control_replicated_update); - if (rep_update == NULL) { - return ldb_module_oom(module); - } - rep_update->dsdb_repl_flags = objs->dsdb_repl_flags; - - ret = ldb_request_add_control(req, DSDB_CONTROL_REPLICATED_UPDATE_OID, false, rep_update); + ret = ldb_request_add_control(req, DSDB_CONTROL_REPLICATED_UPDATE_OID, false, NULL); if (ret != LDB_SUCCESS) { return ret; } diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 497f1da61aa..0acffa1d0d6 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -66,9 +66,6 @@ struct dsdb_control_current_partition { #define DSDB_CONTROL_REPLICATED_UPDATE_OID "1.3.6.1.4.1.7165.4.3.3" -struct dsdb_control_replicated_update { - uint32_t dsdb_repl_flags; -}; #define DSDB_CONTROL_DN_STORAGE_FORMAT_OID "1.3.6.1.4.1.7165.4.3.4" /* DSDB_CONTROL_DN_STORAGE_FORMAT_OID has NULL data and behaves very |