summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-03-15 05:52:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:23 -0500
commit90e27768eff17c321cad64fd834bc23f5c74df29 (patch)
tree1da3684d53b66c45726934614bf93d1ec380d43f /source4/lib
parent737d05bfb3538ac33a81efc2f3d8dfaa35a6ef86 (diff)
downloadsamba-90e27768eff17c321cad64fd834bc23f5c74df29.tar.gz
samba-90e27768eff17c321cad64fd834bc23f5c74df29.tar.bz2
samba-90e27768eff17c321cad64fd834bc23f5c74df29.zip
r14433: sort_result must be initialised when we call do_result
(This used to be commit a33f6a9832c7ae03e630d33120cfa048a51089d5)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/modules/sort.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index 820ba1c1f7..3e1bbe92bd 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -244,6 +244,8 @@ static int server_sort_search(struct ldb_module *module, struct ldb_control *con
return ret;
}
+ sort_result = req->op.search.res;
+
/* SORT HERE */
if (do_sort) {
struct opaque *data;
@@ -257,7 +259,6 @@ static int server_sort_search(struct ldb_module *module, struct ldb_control *con
data->ldb = module->ldb;
data->h = ldb_attrib_handler(data->ldb, data->attribute);
data->result = 0;
- sort_result = req->op.search.res;
ldb_qsort(sort_result->msgs,
sort_result->count,