diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-10-30 10:21:42 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-10-31 08:13:56 +1100 |
| commit | cc6d0decc7980028293168aee267e7610752fc80 (patch) | |
| tree | 766f0800fdfb0f3fbf7e26aaecae0f38bed3957c /lib/ldb/ldb_tdb/ldb_search.c | |
| parent | 42c379f0dfdeb36598bb2636aa2b6e3ca4410930 (diff) | |
| download | samba-cc6d0decc7980028293168aee267e7610752fc80.tar.gz samba-cc6d0decc7980028293168aee267e7610752fc80.tar.bz2 samba-cc6d0decc7980028293168aee267e7610752fc80.zip | |
ldb: Change ltdb_unpack_data to take an ldb_context
It always de-references the module to find the ldb anyway.
Andrew Bartlett
Diffstat (limited to 'lib/ldb/ldb_tdb/ldb_search.c')
| -rw-r--r-- | lib/ldb/ldb_tdb/ldb_search.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ldb/ldb_tdb/ldb_search.c b/lib/ldb/ldb_tdb/ldb_search.c index 703ad6ad0e..4fb8510377 100644 --- a/lib/ldb/ldb_tdb/ldb_search.c +++ b/lib/ldb/ldb_tdb/ldb_search.c @@ -244,9 +244,9 @@ static int ltdb_parse_data_unpack(TDB_DATA key, TDB_DATA data, { struct ltdb_parse_data_unpack_ctx *ctx = private_data; - int ret = ltdb_unpack_data(ctx->module, &data, ctx->msg); + struct ldb_context *ldb = ldb_module_get_ctx(ctx->module); + int ret = ltdb_unpack_data(ldb, &data, ctx->msg); if (ret == -1) { - struct ldb_context *ldb = ldb_module_get_ctx(ctx->module); ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid data for index %*.*s\n", (int)key.dsize, (int)key.dsize, key.dptr); return LDB_ERR_OPERATIONS_ERROR; @@ -440,7 +440,7 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi } /* unpack the record */ - ret = ltdb_unpack_data(ac->module, &data, msg); + ret = ltdb_unpack_data(ldb, &data, msg); if (ret == -1) { talloc_free(msg); return -1; |