diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-13 00:10:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:29 -0500 |
| commit | 7f63cebd331793d059b1dbfd2f7d7ce38105c4fe (patch) | |
| tree | b23bdbb55ec7f8b4598bd3da0022a25873e49afe /source4/lib/ldb/ldb_ildap | |
| parent | 1a5978445199a1d8697a5604761899aa065059fe (diff) | |
| download | samba-7f63cebd331793d059b1dbfd2f7d7ce38105c4fe.tar.gz samba-7f63cebd331793d059b1dbfd2f7d7ce38105c4fe.tar.bz2 samba-7f63cebd331793d059b1dbfd2f7d7ce38105c4fe.zip | |
r18436: converted ldb to use talloc_move() instead of talloc_steal() when
appropriate.
Note that I also removed the error checks that were being done on the
result of talloc_steal(). They are pointless as talloc_steal() doesn't
have any failure modes that wouldn't cause a segv anyway, and they
tend to clutter the code
(This used to be commit c0d9e7d473b8e3eb2524a9fc29cf88680f994b36)
Diffstat (limited to 'source4/lib/ldb/ldb_ildap')
| -rw-r--r-- | source4/lib/ldb/ldb_ildap/ldb_ildap.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 0f6391d7eb..b826a31b40 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -249,9 +249,7 @@ static void ildb_callback(struct ldap_request *req) return; } - if (msg->controls) { - ares->controls = talloc_steal(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); @@ -280,7 +278,7 @@ static void ildb_callback(struct ldap_request *req) return; } ares->message->num_elements = search->num_attributes; - ares->message->elements = talloc_steal(ares->message, search->attributes); + ares->message->elements = talloc_move(ares->message, search->attributes); handle->status = LDB_SUCCESS; handle->state = LDB_ASYNC_PENDING; @@ -383,7 +381,7 @@ static int ildb_request_send(struct ldb_module *module, struct ldap_message *msg return LDB_ERR_OPERATIONS_ERROR; } - ildb_ac->req = talloc_steal(ildb_ac, req); + ildb_ac->req = talloc_move(ildb_ac, req); talloc_free(req->time_event); req->time_event = NULL; if (timeout) { |