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)

1 files changed, 6 insertions, 19 deletions

diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index 0ae16d08ab..acee40833b 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -185,11 +185,7 @@ static int server_sort_search_callback(struct ldb_context *ldb, void *context, s
 
 		ac->msgs[ac->num_msgs + 1] = NULL;
 
-		ac->msgs[ac->num_msgs] = talloc_steal(ac->msgs, ares->message);
-		if (! ac->msgs[ac->num_msgs]) {
-			goto error;
-		}
-
+		ac->msgs[ac->num_msgs] = talloc_move(ac->msgs, ares->message);
 		ac->num_msgs++;
 	}
 
@@ -200,22 +196,13 @@ static int server_sort_search_callback(struct ldb_context *ldb, void *context, s
 		}
 
 		ac->referrals[ac->num_refs + 1] = NULL;
-
-		ac->referrals[ac->num_refs] = talloc_steal(ac->referrals, ares->referral);
-		if (! ac->referrals[ac->num_refs]) {
-			goto error;
-		}
+		ac->referrals[ac->num_refs] = talloc_move(ac->referrals, ares->referral);
 
 		ac->num_refs++;
 	}
 
 	if (ares->type == LDB_REPLY_DONE) {
-		if (ares->controls) {
-			ac->controls = talloc_steal(ac, ares->controls);
-			if (! ac->controls) {
-				goto error;
-			}
-		}
+		ac->controls = talloc_move(ac, ares->controls);
 	}
 
 	talloc_free(ares);
@@ -343,7 +330,7 @@ static int server_sort_results(struct ldb_handle *handle)
 		}
 
 		ares->type = LDB_REPLY_ENTRY;
-		ares->message = talloc_steal(ares, ac->msgs[i]);
+		ares->message = talloc_move(ares, ac->msgs[i]);
 		
 		handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares);
 		if (handle->status != LDB_SUCCESS) {
@@ -359,7 +346,7 @@ static int server_sort_results(struct ldb_handle *handle)
 		}
 
 		ares->type = LDB_REPLY_REFERRAL;
-		ares->referral = talloc_steal(ares, ac->referrals[i]);
+		ares->referral = talloc_move(ares, ac->referrals[i]);
 		
 		handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares);
 		if (handle->status != LDB_SUCCESS) {
@@ -374,7 +361,7 @@ static int server_sort_results(struct ldb_handle *handle)
 	}
 
 	ares->type = LDB_REPLY_DONE;
-	ares->controls = talloc_steal(ares, ac->controls);
+	ares->controls = talloc_move(ares, ac->controls);
 		
 	handle->status = ac->up_callback(ac->module->ldb, ac->up_context, ares);
 	if (handle->status != LDB_SUCCESS) {