ldb:ldb_tdb submodule - use "ldb_msg_new" where appropriate

It is saver than a manual "talloc".

diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c
index 2f0ba22268d0201c0020be600aebb20bb8093e9e..114eadaff52dff4cf83554ddd2473a2ddf108a0a 100644 (file)
--- 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;

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 1637c66734e352a8a3718c2e092b994c9507c4ac..25ec1b0bf25e557d63137d5b91376c2497d9d45d 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -373,7 +373,7 @@ static int ltdb_delete_internal(struct ldb_module *module, struct ldb_dn *dn)
        struct ldb_message *msg;
        int ret = LDB_SUCCESS;
 
-       msg = talloc(module, struct ldb_message);
+       msg = ldb_msg_new(module);
        if (msg == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
@@ -629,7 +629,7 @@ int ltdb_modify_internal(struct ldb_module *module,
                return ltdb_err_map(tdb_error(ltdb->tdb));
        }
 
-       msg2 = talloc(tdb_key.dptr, struct ldb_message);
+       msg2 = ldb_msg_new(tdb_key.dptr);
        if (msg2 == NULL) {
                free(tdb_data.dptr);
                ret = LDB_ERR_OTHER;
@@ -912,7 +912,7 @@ static int ltdb_rename(struct ltdb_context *ctx)
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       msg = talloc(ctx, struct ldb_message);
+       msg = ldb_msg_new(ctx);
        if (msg == NULL) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
@@ -1070,7 +1070,7 @@ static int ltdb_sequence_number(struct ltdb_context *ctx,
 
        dn = ldb_dn_new(tmp_ctx, ldb, LTDB_BASEINFO);
 
-       msg = talloc(tmp_ctx, struct ldb_message);
+       msg = ldb_msg_new(tmp_ctx);
        if (msg == NULL) {
                ret = LDB_ERR_OPERATIONS_ERROR;
                goto done;