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/common/ldb.c | |
| 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/common/ldb.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 1089fb3d92..473c6324ed 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/lib/ldb/common/ldb.c @@ -528,7 +528,7 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld res->msgs[res->count + 1] = NULL; - res->msgs[res->count] = talloc_move(res->msgs, ares->message); + res->msgs[res->count] = talloc_move(res->msgs, &ares->message); res->count++; } @@ -544,7 +544,7 @@ static int ldb_search_callback(struct ldb_context *ldb, void *context, struct ld goto error; } - res->refs[n] = talloc_move(res->refs, ares->referral); + res->refs[n] = talloc_move(res->refs, &ares->referral); res->refs[n + 1] = NULL; } |