diff options
Diffstat (limited to 'source4/lib/ldb/modules')
| -rw-r--r-- | source4/lib/ldb/modules/asq.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/objectclass.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/paged_results.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/modules/sort.c | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c index 75afae2c7e..229a6eacd9 100644 --- a/source4/lib/ldb/modules/asq.c +++ b/source4/lib/ldb/modules/asq.c @@ -117,7 +117,7 @@ static int asq_terminate(struct ldb_handle *handle) if (ac->controls) { for (i = 0; ac->controls[i]; i++); - ares->controls = talloc_move(ares, ac->controls); + ares->controls = talloc_move(ares, &ac->controls); } else { i = 0; } @@ -162,7 +162,7 @@ static int asq_base_callback(struct ldb_context *ldb, void *context, struct ldb_ /* we are interested only in the single reply (base search) we receive here */ if (ares->type == LDB_REPLY_ENTRY) { - ac->base_res = talloc_move(ac, ares); + ac->base_res = talloc_move(ac, &ares); } else { talloc_free(ares); } diff --git a/source4/lib/ldb/modules/objectclass.c b/source4/lib/ldb/modules/objectclass.c index fb7cd5db5e..493ecdaad4 100644 --- a/source4/lib/ldb/modules/objectclass.c +++ b/source4/lib/ldb/modules/objectclass.c @@ -439,7 +439,7 @@ static int get_self_callback(struct ldb_context *ldb, void *context, struct ldb_ return LDB_ERR_OPERATIONS_ERROR; } - ac->search_res = talloc_move(ac, ares); + ac->search_res = talloc_move(ac, &ares); } else { talloc_free(ares); } diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c index 6636efcccb..133ee1fb78 100644 --- a/source4/lib/ldb/modules/paged_results.c +++ b/source4/lib/ldb/modules/paged_results.c @@ -210,7 +210,7 @@ static int paged_search_callback(struct ldb_context *ldb, void *context, struct } if (ares->type == LDB_REPLY_DONE) { - ac->store->controls = talloc_move(ac->store, ares->controls); + ac->store->controls = talloc_move(ac->store, &ares->controls); talloc_free(ares); } @@ -383,7 +383,7 @@ static int paged_results(struct ldb_handle *handle) ares->controls = ac->store->controls; while (ares->controls[i]) i++; /* counting */ - ares->controls = talloc_move(ares, ac->store->controls); + ares->controls = talloc_move(ares, &ac->store->controls); num_ctrls += i; } diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c index acee40833b..3a0598c528 100644 --- a/source4/lib/ldb/modules/sort.c +++ b/source4/lib/ldb/modules/sort.c @@ -185,7 +185,7 @@ static int server_sort_search_callback(struct ldb_context *ldb, void *context, s ac->msgs[ac->num_msgs + 1] = NULL; - ac->msgs[ac->num_msgs] = talloc_move(ac->msgs, ares->message); + ac->msgs[ac->num_msgs] = talloc_move(ac->msgs, &ares->message); ac->num_msgs++; } @@ -196,13 +196,13 @@ static int server_sort_search_callback(struct ldb_context *ldb, void *context, s } ac->referrals[ac->num_refs + 1] = NULL; - ac->referrals[ac->num_refs] = talloc_move(ac->referrals, ares->referral); + ac->referrals[ac->num_refs] = talloc_move(ac->referrals, &ares->referral); ac->num_refs++; } if (ares->type == LDB_REPLY_DONE) { - ac->controls = talloc_move(ac, ares->controls); + ac->controls = talloc_move(ac, &ares->controls); } talloc_free(ares); @@ -330,7 +330,7 @@ static int server_sort_results(struct ldb_handle *handle) } ares->type = LDB_REPLY_ENTRY; - ares->message = talloc_move(ares, ac->msgs[i]); + ares->message = talloc_move(ares, &ac->msgs[i]); handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares); if (handle->status != LDB_SUCCESS) { @@ -346,7 +346,7 @@ static int server_sort_results(struct ldb_handle *handle) } ares->type = LDB_REPLY_REFERRAL; - ares->referral = talloc_move(ares, ac->referrals[i]); + ares->referral = talloc_move(ares, &ac->referrals[i]); handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares); if (handle->status != LDB_SUCCESS) { @@ -361,7 +361,7 @@ static int server_sort_results(struct ldb_handle *handle) } ares->type = LDB_REPLY_DONE; - ares->controls = talloc_move(ares, ac->controls); + ares->controls = talloc_move(ares, &ac->controls); handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares); if (handle->status != LDB_SUCCESS) { |