1 files changed, 8 insertions, 8 deletions

diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c
index 2f0ba22268..114eadaff5 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_cache.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c
@@ -203,7 +203,7 @@ static int ltdb_baseinfo_init(struct ldb_module *module)
 
 	ltdb->sequence_number = atof(initial_sequence_number);
 
-	msg = talloc(ltdb, struct ldb_message);
+	msg = ldb_msg_new(ltdb);
 	if (msg == NULL) {
 		goto failed;
 	}
@@ -287,15 +287,15 @@ int ltdb_cache_load(struct ldb_module *module)
 	if (ltdb->cache == NULL) {
 		ltdb->cache = talloc_zero(ltdb, struct ltdb_cache);
 		if (ltdb->cache == NULL) goto failed;
-		ltdb->cache->indexlist = talloc_zero(ltdb->cache, struct ldb_message);
-		ltdb->cache->attributes = talloc_zero(ltdb->cache, struct ldb_message);
+		ltdb->cache->indexlist = ldb_msg_new(ltdb->cache);
+		ltdb->cache->attributes = ldb_msg_new(ltdb->cache);
 		if (ltdb->cache->indexlist == NULL ||
 		    ltdb->cache->attributes == NULL) {
 			goto failed;
 		}
 	}
 
-	baseinfo = talloc(ltdb->cache, struct ldb_message);
+	baseinfo = ldb_msg_new(ltdb->cache);
 	if (baseinfo == NULL) goto failed;
 
 	baseinfo_dn = ldb_dn_new(module, ldb, LTDB_BASEINFO);
@@ -327,7 +327,7 @@ int ltdb_cache_load(struct ldb_module *module)
 	ltdb->sequence_number = seq;
 
 	/* Read an interpret database options */
-	options = talloc(ltdb->cache, struct ldb_message);
+	options = ldb_msg_new(ltdb->cache);
 	if (options == NULL) goto failed;
 
 	options_dn = ldb_dn_new(options, ldb, LTDB_OPTIONS);
@@ -352,8 +352,8 @@ int ltdb_cache_load(struct ldb_module *module)
 
 	talloc_free(ltdb->cache->indexlist);
 
-	ltdb->cache->indexlist = talloc_zero(ltdb->cache, struct ldb_message);
-	ltdb->cache->attributes = talloc_zero(ltdb->cache, struct ldb_message);
+	ltdb->cache->indexlist = ldb_msg_new(ltdb->cache);
+	ltdb->cache->attributes = ldb_msg_new(ltdb->cache);
 	if (ltdb->cache->indexlist == NULL ||
 	    ltdb->cache->attributes == NULL) {
 		goto failed;
@@ -414,7 +414,7 @@ int ltdb_increase_sequence_number(struct ldb_module *module)
 
 	ldb = ldb_module_get_ctx(module);
 
-	msg = talloc(ltdb, struct ldb_message);
+	msg = ldb_msg_new(ltdb);
 	if (msg == NULL) {
 		errno = ENOMEM;
 		return LDB_ERR_OPERATIONS_ERROR;