samdb: use compat wrappers for tdb_fetch().
authorRusty Russell <rusty@rustcorp.com.au>
Sun, 29 Jan 2012 23:37:17 +0000 (10:07 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sun, 29 Jan 2012 23:37:17 +0000 (10:07 +1030)
TDB2's tdb_fetch() returns an error code; use tdb_fetch_compat() for now.
Similarly, tdb_errorstr() -> tdb_errorstr_compat().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
source4/dsdb/samdb/ldb_modules/partition_metadata.c

index 05f87d053c7e306f0244418436ed31cad973c1de..acf414b1c2442b38e92ccb0082c184e80104fe66 100644 (file)
@@ -54,14 +54,14 @@ static int partition_metadata_get_uint64(struct ldb_module *module,
        tdb_key.dptr = (uint8_t *)discard_const_p(char, key);
        tdb_key.dsize = strlen(key);
 
-       tdb_data = tdb_fetch(tdb, tdb_key);
+       tdb_data = tdb_fetch_compat(tdb, tdb_key);
        if (!tdb_data.dptr) {
                if (tdb_error(tdb) == TDB_ERR_NOEXIST) {
                        *value = default_value;
                        return LDB_SUCCESS;
                } else {
                        return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
-                                               tdb_errorstr(tdb));
+                                               tdb_errorstr_compat(tdb));
                }
        }
 
@@ -131,7 +131,7 @@ static int partition_metadata_set_uint64(struct ldb_module *module,
        if (tdb_store(tdb, tdb_key, tdb_data, tdb_flag) != 0) {
                talloc_free(tmp_ctx);
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
-                                       tdb_errorstr(tdb));
+                                       tdb_errorstr_compat(tdb));
        }
 
        talloc_free(tmp_ctx);
@@ -392,7 +392,7 @@ int partition_metadata_start_trans(struct ldb_module *module)
 
        if (tdb_transaction_start(tdb) != 0) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
-                                       tdb_errorstr(tdb));
+                                       tdb_errorstr_compat(tdb));
        }
 
        data->metadata->in_transaction++;
@@ -424,7 +424,7 @@ int partition_metadata_prepare_commit(struct ldb_module *module)
 
        if (tdb_transaction_prepare_commit(tdb) != 0) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
-                                       tdb_errorstr(tdb));
+                                       tdb_errorstr_compat(tdb));
        }
 
        return LDB_SUCCESS;
@@ -456,7 +456,7 @@ int partition_metadata_end_trans(struct ldb_module *module)
 
        if (tdb_transaction_commit(tdb) != 0) {
                return ldb_module_error(module, LDB_ERR_OPERATIONS_ERROR,
-                                       tdb_errorstr(tdb));
+                                       tdb_errorstr_compat(tdb));
        }
 
        return LDB_SUCCESS;