Author: mkhl Date: 2006-08-04 23:30:10 +0000 (Fri, 04 Aug 2006) New Revision: 17410
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17410 Log: Fix swapped talloc contexts for local/remote parts of search requests. Martin Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map.c Changeset: Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map.c =================================================================== --- branches/SOC/mkhl/ldb-map/modules/ldb_map.c 2006-08-04 23:29:06 UTC (rev 17409) +++ branches/SOC/mkhl/ldb-map/modules/ldb_map.c 2006-08-04 23:30:10 UTC (rev 17410) @@ -2138,7 +2138,7 @@ /* TODO: To check merged results against the original query, * we need to have all their attributes available. */ /* That's why this code is disabled: - ret = map_attrs_partition(module, ac->remote_req, ac, &local_attrs, &remote_attrs, req->op.search.attrs); + ret = map_attrs_partition(module, ac, ac->remote_req, &local_attrs, &remote_attrs, req->op.search.attrs); if (ret) { ret = LDB_ERR_OPERATIONS_ERROR; goto failed; @@ -2151,7 +2151,7 @@ ac->remote_req->op.search.attrs = remote_attrs; /* Split local from remote tree */ - ret = ldb_parse_tree_partition(module, ac->remote_req, ac, &local_tree, &remote_tree, req->op.search.tree); + ret = ldb_parse_tree_partition(module, ac, ac->remote_req, &local_tree, &remote_tree, req->op.search.tree); if (ret) { goto failed; }
