summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-12-16 20:45:40 +1100
committerAndrew Tridgell <tridge@samba.org>2009-12-16 20:56:24 +1100
commit8d3fc23157376af5657a09324509abace3c5ee4f (patch)
tree43612a64ed59cab8b22314b5cccbc8c62e25587e /source4
parent558a38671af5ea05d9ee1d815f0c1c2dab41a80c (diff)
downloadsamba-8d3fc23157376af5657a09324509abace3c5ee4f.tar.gz
samba-8d3fc23157376af5657a09324509abace3c5ee4f.tar.bz2
samba-8d3fc23157376af5657a09324509abace3c5ee4f.zip
s4-dsdb: also mark the relax control non-critical when done
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c8
1 files changed, 3 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 27e4ce0d44..3ae165c6da 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -405,7 +405,6 @@ static int replmd_add(struct ldb_module *module, struct ldb_request *req)
{
struct ldb_context *ldb;
struct ldb_control *control;
- struct ldb_control **saved_controls;
struct replmd_replicated_request *ac;
enum ndr_err_code ndr_err;
struct ldb_request *down_req;
@@ -639,10 +638,9 @@ static int replmd_add(struct ldb_module *module, struct ldb_request *req)
return ret;
}
- /* if a control is there remove if from the modified request */
- if (control && !save_controls(control, down_req, &saved_controls)) {
- talloc_free(ac);
- return LDB_ERR_OPERATIONS_ERROR;
+ /* mark the control done */
+ if (control) {
+ control->critical = 0;
}
/* go on with the call chain */