diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-13 02:33:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:29 -0500 |
| commit | 05cdd9ccafeeb384792b9ce7ca044bcec1bfc839 (patch) | |
| tree | 5e34e06ecfa90d4248e4d511af80f67636c759ac /source4/lib/ldb/ldb_ildap | |
| parent | 24fe49a3d10633fa9be5547e89d10be1d5f9ccb1 (diff) | |
| download | samba-05cdd9ccafeeb384792b9ce7ca044bcec1bfc839.tar.gz samba-05cdd9ccafeeb384792b9ce7ca044bcec1bfc839.tar.bz2 samba-05cdd9ccafeeb384792b9ce7ca044bcec1bfc839.zip | |
r18439: 2nd try at a talloc_move() api. This type with the ** ptr interface
exposed.
Unfortunately this generates a large number of type punning
warnings. We'll have to find some magic to hide those.
(This used to be commit 254cbf09dee5a1e20c47e47a298f1a8d172b41b9)
Diffstat (limited to 'source4/lib/ldb/ldb_ildap')
| -rw-r--r-- | source4/lib/ldb/ldb_ildap/ldb_ildap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 49a8e8627a..5b69ac06c9 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -249,7 +249,7 @@ static void ildb_callback(struct ldap_request *req) return; } - ares->controls = talloc_move(ares, msg->controls); + ares->controls = talloc_move(ares, &msg->controls); if (msg->r.SearchResultDone.resultcode) { if (msg->r.SearchResultDone.errormessage) { ldb_set_errstring(ac->module->ldb, msg->r.SearchResultDone.errormessage); @@ -278,7 +278,8 @@ static void ildb_callback(struct ldap_request *req) return; } ares->message->num_elements = search->num_attributes; - ares->message->elements = talloc_move(ares->message, search->attributes); + ares->message->elements = talloc_move(ares->message, + &search->attributes); handle->status = LDB_SUCCESS; handle->state = LDB_ASYNC_PENDING; @@ -391,7 +392,7 @@ static int ildb_request_send(struct ldb_module *module, struct ldap_message *msg req->async.fn = ildb_callback; req->async.private_data = (void *)h; - ildb_ac->req = talloc_move(ildb_ac, req); + ildb_ac->req = talloc_move(ildb_ac, &req); *handle = h; return LDB_SUCCESS; |