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)

2 files changed, 6 insertions, 16 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;
 		}
diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index e6b8a48a95..181d857efc 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -81,12 +81,7 @@ static int store_message(struct ldb_message *msg, struct search_context *sctx) {
 		return -1;
 	}
 
-	sctx->store[sctx->num_stored] = talloc_steal(sctx->store, msg);
-	if (!sctx->store[sctx->num_stored]) {
-		fprintf(stderr, "talloc_steal failed while storing messages\n");
-		return -1;
-	}
-
+	sctx->store[sctx->num_stored] = talloc_move(sctx->store, msg);
 	sctx->num_stored++;
 	sctx->store[sctx->num_stored] = NULL;
 
@@ -101,12 +96,7 @@ static int store_referral(char *referral, struct search_context *sctx) {
 		return -1;
 	}
 
-	sctx->refs_store[sctx->refs] = talloc_steal(sctx->refs_store, referral);
-	if (!sctx->refs_store[sctx->refs]) {
-		fprintf(stderr, "talloc_steal failed while storing referrals\n");
-		return -1;
-	}
-
+	sctx->refs_store[sctx->refs] = talloc_move(sctx->refs_store, referral);
 	sctx->refs++;
 	sctx->refs_store[sctx->refs] = NULL;