diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 18:40:32 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 11:18:35 +0200 |
| commit | 9eaaf1fc67697a640260169ec26510806105e91f (patch) | |
| tree | a25282ee45490a20e96efe562902838ad3b6a929 | |
| parent | 42506c4a3e2da46d8df013e2bc17398b3193b381 (diff) | |
| download | samba-9eaaf1fc67697a640260169ec26510806105e91f.tar.gz samba-9eaaf1fc67697a640260169ec26510806105e91f.tar.bz2 samba-9eaaf1fc67697a640260169ec26510806105e91f.zip | |
tdb2: tdb_parse_record() returns negative errors, not -1.
Fixup callers to tdb_parse_record() to be compatible with tdb2.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | source3/lib/dbwrap_tdb.c | 2 | ||||
| -rw-r--r-- | source3/lib/gencache.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap_tdb.c index 0832b06a15..2b5f58a56d 100644 --- a/source3/lib/dbwrap_tdb.c +++ b/source3/lib/dbwrap_tdb.c @@ -183,7 +183,7 @@ static int db_tdb_parse(struct db_context *db, TDB_DATA key, struct db_tdb_ctx *ctx = talloc_get_type_abort( db->private_data, struct db_tdb_ctx); - return tdb_parse_record(ctx->wtdb->tdb, key, parser, private_data); + return tdb_parse_record(ctx->wtdb->tdb, key, parser, private_data) ? -1 : 0; } static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag) diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index c00cc115af..31ead7be7e 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -344,11 +344,11 @@ bool gencache_parse(const char *keystr, state.private_data = private_data; ret = tdb_parse_record(cache_notrans, key, gencache_parse_fn, &state); - if (ret != -1) { + if (ret == 0) { return true; } ret = tdb_parse_record(cache, key, gencache_parse_fn, &state); - return (ret != -1); + return (ret == 0); } struct gencache_get_data_blob_state { |