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/tools/ad2oLschema.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/tools/ad2oLschema.c')
| -rw-r--r-- | source4/lib/ldb/tools/ad2oLschema.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c index dae3778d82..23cf892930 100644 --- a/source4/lib/ldb/tools/ad2oLschema.c +++ b/source4/lib/ldb/tools/ad2oLschema.c @@ -139,7 +139,8 @@ static int fetch_oc_recursive(struct ldb_context *ldb, struct ldb_dn *schemadn, if (!res_list->msgs) { return LDB_ERR_OPERATIONS_ERROR; } - res_list->msgs[res_list->count] = talloc_move(res_list, search_from->msgs[i]); + res_list->msgs[res_list->count] = talloc_move(res_list, + &search_from->msgs[i]); res_list->count++; res_list->msgs[res_list->count] = NULL; @@ -191,7 +192,7 @@ static int fetch_objectclass_schema(struct ldb_context *ldb, struct ldb_dn *sche return LDB_ERR_OPERATIONS_ERROR; } - *objectclasses_res = talloc_move(mem_ctx, ret_res); + *objectclasses_res = talloc_move(mem_ctx, &ret_res); return ret; } @@ -280,7 +281,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_ p++; oid_map = talloc_realloc(mem_ctx, oid_map, struct oid_map, num_maps + 2); trim_string(line, " ", " "); - oid_map[num_maps].old_oid = talloc_move(oid_map, line); + oid_map[num_maps].old_oid = talloc_move(oid_map, &line); trim_string(p, " ", " "); oid_map[num_maps].new_oid = p; num_maps++; @@ -288,7 +289,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_ } else { attrs_skip = talloc_realloc(mem_ctx, attrs_skip, const char *, num_skip + 2); trim_string(line, " ", " "); - attrs_skip[num_skip] = talloc_move(attrs_skip, line); + attrs_skip[num_skip] = talloc_move(attrs_skip, &line); num_skip++; attrs_skip[num_skip] = NULL; } |