diff options
| author | Simo Sorce <idra@samba.org> | 2008-12-22 15:54:56 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-12-22 18:52:48 -0500 |
| commit | 41718e315ea78998fab0893fd5f148a49d8faab8 (patch) | |
| tree | ecbc13fb3abce56481ba04e13d9aa1b69b19783b /ldb/modules | |
| parent | a93a69380dc6718c49879af628ed69f8e2b70797 (diff) | |
| download | sssd-41718e315ea78998fab0893fd5f148a49d8faab8.tar.gz sssd-41718e315ea78998fab0893fd5f148a49d8faab8.tar.xz sssd-41718e315ea78998fab0893fd5f148a49d8faab8.zip | |
Rebase ldb code with all changes in samba master
Diffstat (limited to 'ldb/modules')
| -rw-r--r-- | ldb/modules/asq.c | 2 | ||||
| -rw-r--r-- | ldb/modules/operational.c | 2 | ||||
| -rw-r--r-- | ldb/modules/paged_results.c | 4 | ||||
| -rw-r--r-- | ldb/modules/paged_searches.c | 2 | ||||
| -rw-r--r-- | ldb/modules/sort.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ldb/modules/asq.c b/ldb/modules/asq.c index 835715e7d..c650970af 100644 --- a/ldb/modules/asq.c +++ b/ldb/modules/asq.c @@ -178,7 +178,7 @@ static int asq_reqs_callback(struct ldb_request *req, struct ldb_reply *ares) case LDB_REPLY_ENTRY: /* pass the message up to the original callback as we * do not have to elaborate on it any further */ - ret = ldb_module_send_entry(ac->req, ares->message); + ret = ldb_module_send_entry(ac->req, ares->message, ares->controls); if (ret != LDB_SUCCESS) { return ldb_module_done(ac->req, NULL, NULL, ret); } diff --git a/ldb/modules/operational.c b/ldb/modules/operational.c index abb1d4ca1..345441b5e 100644 --- a/ldb/modules/operational.c +++ b/ldb/modules/operational.c @@ -206,7 +206,7 @@ static int operational_callback(struct ldb_request *req, struct ldb_reply *ares) return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR); } - return ldb_module_send_entry(ac->req, ares->message); + return ldb_module_send_entry(ac->req, ares->message, ares->controls); case LDB_REPLY_REFERRAL: /* ignore referrals */ diff --git a/ldb/modules/paged_results.c b/ldb/modules/paged_results.c index d3bb83bbc..dfc565fef 100644 --- a/ldb/modules/paged_results.c +++ b/ldb/modules/paged_results.c @@ -70,7 +70,7 @@ struct private_data { }; -int store_destructor(struct results_store *del) +static int store_destructor(struct results_store *del) { struct private_data *priv = del->priv; struct results_store *loop; @@ -147,7 +147,7 @@ static int paged_results(struct paged_context *ac) while (ac->store->num_entries > 0 && ac->size > 0) { msg = ac->store->first; - ret = ldb_module_send_entry(ac->req, msg->r->message); + ret = ldb_module_send_entry(ac->req, msg->r->message, msg->r->controls); if (ret != LDB_SUCCESS) { return ret; } diff --git a/ldb/modules/paged_searches.c b/ldb/modules/paged_searches.c index 7a728e3bb..56f9b1cac 100644 --- a/ldb/modules/paged_searches.c +++ b/ldb/modules/paged_searches.c @@ -161,7 +161,7 @@ static int ps_callback(struct ldb_request *req, struct ldb_reply *ares) switch (ares->type) { case LDB_REPLY_ENTRY: - ret = ldb_module_send_entry(ac->req, ares->message); + ret = ldb_module_send_entry(ac->req, ares->message, ares->controls); if (ret != LDB_SUCCESS) { return ldb_module_done(ac->req, NULL, NULL, ret); } diff --git a/ldb/modules/sort.c b/ldb/modules/sort.c index 64d60f370..25e56b24c 100644 --- a/ldb/modules/sort.c +++ b/ldb/modules/sort.c @@ -152,7 +152,7 @@ static int server_sort_results(struct sort_context *ac) ares->type = LDB_REPLY_ENTRY; ares->message = talloc_move(ares, &ac->msgs[i]); - ret = ldb_module_send_entry(ac->req, ares->message); + ret = ldb_module_send_entry(ac->req, ares->message, ares->controls); if (ret != LDB_SUCCESS) { return ret; } |