sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s4-dsdb: Improve tracing in repl_meta_data

Browse Source 
When we call ldb_module_done() rather than just calling the callback, we make log entries
that are critical in debugging.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-07-31 10:18:43 +10:00
parent bc5be09bae
commit fcb54ca25f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
View File

@ -3410,15 +3410,18 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct
struct replPropertyMetaData1 *rmd_name, *omd_name; struct replPropertyMetaData1 *rmd_name, *omd_name;
struct ldb_message *msg; struct ldb_message *msg;
req->callback = callback;
if (ares->error != LDB_ERR_ENTRY_ALREADY_EXISTS) { if (ares->error != LDB_ERR_ENTRY_ALREADY_EXISTS) {
/* call the normal callback for everything except /* call the normal callback for everything except
conflicts */ conflicts */
return callback(req, ares); return ldb_module_done(req, ares->controls, ares->response, ares->error);
} }
ret = samdb_rodc(ldb_module_get_ctx(ar->module), &rodc); ret = samdb_rodc(ldb_module_get_ctx(ar->module), &rodc);
if (ret != LDB_SUCCESS) { if (ret != LDB_SUCCESS) {
return ret; ldb_asprintf_errstring(ldb_module_get_ctx(ar->module), "Failed to determine if we are an RODC when attempting to form conflict DN: %s", ldb_errstring(ldb_module_get_ctx(ar->module)));
return ldb_module_done(req, ares->controls, ares->response, LDB_ERR_OPERATIONS_ERROR);
} }
/* /*
* we have a conflict, and need to decide if we will keep the * we have a conflict, and need to decide if we will keep the
@ -3435,7 +3438,7 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct
conflict_dn = req->op.rename.newdn; conflict_dn = req->op.rename.newdn;
break; break;
default: default:
return ldb_module_operr(ar->module); return ldb_module_done(req, ares->controls, ares->response, ldb_module_operr(ar->module));
} }
if (rodc) { if (rodc) {
@ -3589,8 +3592,6 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct
goto failed; goto failed;
} }
req->callback = callback;
return ldb_next_request(ar->module, req); return ldb_next_request(ar->module, req);
} }
@ -3599,7 +3600,7 @@ failed:
* will stop with an error, but there is not much else we can * will stop with an error, but there is not much else we can
* do * do
*/ */
return callback(req, ares); return ldb_module_done(req, ares->controls, ares->response, ares->error);
} }
/* /*