summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-24 07:12:14 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-24 10:35:40 -0700
commitbaf93360a869a55617e1b29f2d954320967f8f71 (patch)
tree4c1f9055f11f72d3836d9cbb9064620b9a9ac0f5
parent1fa735cc86cc4f05a6e53bf0ef17bd8562a94d00 (diff)
downloadsamba-baf93360a869a55617e1b29f2d954320967f8f71.tar.gz
samba-baf93360a869a55617e1b29f2d954320967f8f71.tar.bz2
samba-baf93360a869a55617e1b29f2d954320967f8f71.zip
s4-drs: include deleted objects in getncchanges reply
Even though we don't create deleted objects ourselves yet, we need to pass along deleted objects we receive from other replication partners
-rw-r--r--source4/rpc_server/drsuapi/drsutil.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/rpc_server/drsuapi/drsutil.c b/source4/rpc_server/drsuapi/drsutil.c
index 9aef3172b9..410563cf58 100644
--- a/source4/rpc_server/drsuapi/drsutil.c
+++ b/source4/rpc_server/drsuapi/drsutil.c
@@ -88,6 +88,11 @@ int drsuapi_search_with_extended_dn(struct ldb_context *ldb,
return ret;
}
+ ret = ldb_request_add_control(req, LDB_CONTROL_SHOW_DELETED_OID, true, NULL);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
if (sort_attrib) {
struct ldb_server_sort_control **sort_control;
sort_control = talloc_array(req, struct ldb_server_sort_control *, 2);
@@ -114,7 +119,7 @@ int drsuapi_search_with_extended_dn(struct ldb_context *ldb,
}
talloc_free(req);
- *_res = res;
+ *_res = talloc_steal(mem_ctx, res);
return ret;
}