diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2016-12-23 14:18:13 +1300 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2017-02-09 03:17:15 +0100 |
| commit | 10e8bc103a2167082a6aa6f47d9511ac4f8b6339 (patch) | |
| tree | bb888e680fa891af906e8338a7c1731864deacef | |
| parent | 996aafdbff392775716c272301b38958367d7b1e (diff) | |
| download | samba-10e8bc103a2167082a6aa6f47d9511ac4f8b6339.tar.gz | |
replmd: Fix some whitespace in repl_meta_data.c
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 92afaff05b0..58fa9070e85 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -1522,7 +1522,7 @@ static int replmd_update_rpmd(struct ldb_module *module, bool rmd_is_provided; bool rmd_is_just_resorted = false; const char *not_rename_attrs[4 + msg->num_elements]; - + if (rename_attrs) { attrs = rename_attrs; } else { @@ -4128,9 +4128,9 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct * We are on an RODC, or were a GC for this * partition, so we have to fail this until * someone who owns the partition sorts it - * out + * out */ - ldb_asprintf_errstring(ldb_module_get_ctx(ar->module), + ldb_asprintf_errstring(ldb_module_get_ctx(ar->module), "Conflict adding object '%s' from incoming replication as we are read only for the partition. \n" " - We must fail the operation until a master for this partition resolves the conflict", ldb_dn_get_linearized(conflict_dn)); @@ -4552,7 +4552,7 @@ static int replmd_replicated_apply_search_for_parent_callback(struct ldb_request ldb_dn_get_linearized(parent_msg->dn)); return ldb_module_done(ar->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR); } - + ret = dsdb_wellknown_dn(ldb_module_get_ctx(ar->module), msg, nc_root, DS_GUID_LOSTANDFOUND_CONTAINER, @@ -4682,7 +4682,7 @@ static int replmd_replicated_apply_search_for_parent(struct replmd_replicated_re ar->req); LDB_REQ_SET_LOCATION(search_req); - ret = dsdb_request_add_controls(search_req, + ret = dsdb_request_add_controls(search_req, DSDB_SEARCH_SHOW_RECYCLED| DSDB_SEARCH_SHOW_DELETED| DSDB_SEARCH_SHOW_EXTENDED_DN); |