summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/tools/ad2oLschema.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-13 00:10:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:29 -0500
commit7f63cebd331793d059b1dbfd2f7d7ce38105c4fe (patch)
treeb23bdbb55ec7f8b4598bd3da0022a25873e49afe /source4/lib/ldb/tools/ad2oLschema.c
parent1a5978445199a1d8697a5604761899aa065059fe (diff)
downloadsamba-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/tools/ad2oLschema.c')
-rw-r--r--source4/lib/ldb/tools/ad2oLschema.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c
index c25839290f..dae3778d82 100644
--- a/source4/lib/ldb/tools/ad2oLschema.c
+++ b/source4/lib/ldb/tools/ad2oLschema.c
@@ -139,7 +139,7 @@ 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_steal(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 +191,7 @@ static int fetch_objectclass_schema(struct ldb_context *ldb, struct ldb_dn *sche
return LDB_ERR_OPERATIONS_ERROR;
}
- *objectclasses_res = talloc_steal(mem_ctx, ret_res);
+ *objectclasses_res = talloc_move(mem_ctx, ret_res);
return ret;
}
@@ -280,7 +280,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_steal(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 +288,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_steal(attrs_skip, line);
+ attrs_skip[num_skip] = talloc_move(attrs_skip, line);
num_skip++;
attrs_skip[num_skip] = NULL;
}