← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ldb/saucy

« back to all changes in this revision

Viewing changes to ldb_tdb/ldb_search.c

  • Committer: Package Import Robot
  • Author(s): Andrew Bartlett
  • Date: 2013-02-12 19:02:05 UTC
  • mfrom: (1.4.3)
  • Revision ID: package-import@ubuntu.com-20130212190205-gkz9ztqkv1k1v07x
Tags: 1:1.1.15-1.1
* Non-maintainer upload.
* New upstream release.
* Drop 01_exclude_symbols, now upstream 

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldb_tdb/ldb_search.c
32
32
 */
33
33
 
34
34
#include "ldb_tdb.h"
 
35
#include "ldb_private.h"
35
36
#include <tdb.h>
36
37
 
37
38
/*
244
245
{
245
246
        struct ltdb_parse_data_unpack_ctx *ctx = private_data;
246
247
 
247
 
        int ret = ltdb_unpack_data(ctx->module, &data, ctx->msg);
 
248
        struct ldb_context *ldb = ldb_module_get_ctx(ctx->module);
 
249
        int ret = ldb_unpack_data(ldb, (struct ldb_val *)&data, ctx->msg);
248
250
        if (ret == -1) {
249
 
                struct ldb_context *ldb = ldb_module_get_ctx(ctx->module);
250
251
                ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid data for index %*.*s\n",
251
252
                          (int)key.dsize, (int)key.dsize, key.dptr);
252
253
                return LDB_ERR_OPERATIONS_ERROR;                
440
441
        }
441
442
 
442
443
        /* unpack the record */
443
 
        ret = ltdb_unpack_data(ac->module, &data, msg);
 
444
        ret = ldb_unpack_data(ldb, (struct ldb_val *)&data, msg);
444
445
        if (ret == -1) {
445
446
                talloc_free(msg);
446
447
                return -1;