Add TALLOC_CTX pointer to strhex_to_data_blob for consistency with Samba

3.

4 files changed, 7 insertions, 12 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c
index 88a8887056..a0602d9281 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c
@@ -424,7 +424,7 @@ static int extended_search(struct ldb_module *module, struct ldb_request *req)
 				valstr = str;
 			} else {
 				DATA_BLOB binary;
-				binary = strhex_to_data_blob(str);
+				binary = strhex_to_data_blob(NULL, str);
 				if (!binary.data) {
 					ldb_oom(module->ldb);
 					return LDB_ERR_OPERATIONS_ERROR;
@@ -471,7 +471,7 @@ static int extended_search(struct ldb_module *module, struct ldb_request *req)
 				valstr = str;
 			} else {
 				DATA_BLOB binary;
-				binary = strhex_to_data_blob(str);
+				binary = strhex_to_data_blob(NULL, str);
 				if (!binary.data) {
 					ldb_oom(module->ldb);
 					return LDB_ERR_OPERATIONS_ERROR;
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index c4451d1355..5ed7f1fbad 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -482,12 +482,11 @@ static int setup_primary_kerberos(struct setup_password_fields_io *io,
 	if (old_scp) {
 		DATA_BLOB blob;
 
-		blob = strhex_to_data_blob(old_scp->data);
+		blob = strhex_to_data_blob(io->ac, old_scp->data);
 		if (!blob.data) {
 			ldb_oom(io->ac->module->ldb);
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
-		talloc_steal(io->ac, blob.data);
 
 		/* TODO: use ndr_pull_struct_blob_all(), when the ndr layer handles it correct with relative pointers */
 		ndr_err = ndr_pull_struct_blob(&blob, io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), &_old_pkb,
@@ -596,12 +595,11 @@ static int setup_primary_kerberos_newer(struct setup_password_fields_io *io,
 	if (old_scp) {
 		DATA_BLOB blob;
 
-		blob = strhex_to_data_blob(old_scp->data);
+		blob = strhex_to_data_blob(io->ac, old_scp->data);
 		if (!blob.data) {
 			ldb_oom(io->ac->module->ldb);
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
-		talloc_steal(io->ac, blob.data);
 
 		/* TODO: use ndr_pull_struct_blob_all(), when the ndr layer handles it correct with relative pointers */
 		ndr_err = ndr_pull_struct_blob(&blob, io->ac,
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index 93697a3df0..69d4c2ce80 100644
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -199,9 +199,8 @@ WERROR dsdb_get_oid_mappings_ldb(const struct dsdb_schema *schema,
 		return ntstatus_to_werror(nt_status);
 	}
 
-	*schemaInfo = strhex_to_data_blob(schema->schema_info);
+	*schemaInfo = strhex_to_data_blob(mem_ctx, schema->schema_info);
 	W_ERROR_HAVE_NO_MEMORY(schemaInfo->data);
-	talloc_steal(mem_ctx, schemaInfo->data);
 
 	return WERR_OK;
 }
@@ -819,12 +818,11 @@ int dsdb_schema_from_ldb_results(TALLOC_CTX *mem_ctx, struct ldb_context *ldb,
 	}
 	info_val = ldb_msg_find_ldb_val(schema_res->msgs[0], "schemaInfo");
 	if (!info_val) {
-		info_val_default = strhex_to_data_blob("FF0000000000000000000000000000000000000000");
+		info_val_default = strhex_to_data_blob(mem_ctx, "FF0000000000000000000000000000000000000000");
 		if (!info_val_default.data) {
 			dsdb_oom(error_string, mem_ctx);
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
-		talloc_steal(mem_ctx, info_val_default.data);
 		info_val = &info_val_default;
 	}
 
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index f8de82e56a..d0aae4e221 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -328,11 +328,10 @@ WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf
 
 	info_val = ldb_msg_find_ldb_val(msg, "schemaInfo");
 	if (!info_val) {
-		info_val_default = strhex_to_data_blob("FF0000000000000000000000000000000000000000");
+		info_val_default = strhex_to_data_blob(mem_ctx, "FF0000000000000000000000000000000000000000");
 		if (!info_val_default.data) {
 			goto nomem;
 		}
-		talloc_steal(mem_ctx, info_val_default.data);
 		info_val = &info_val_default;
 	}