From: Michael Adam Date: Tue, 29 Apr 2008 13:16:10 +0000 (+0200) Subject: registry: use dbwrap_fetch_bystring() in regdb_fetch_keys(). X-Git-Tag: samba-4.0.0alpha6~801^2~1569 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d933dedf931e77b9f084cb77cc7f8b90d67d35c;p=thirdparty%2Fsamba.git registry: use dbwrap_fetch_bystring() in regdb_fetch_keys(). instead of using regdb->fetch and constructing tdb data from the registry key string by hand. Michael (This used to be commit 87a58140f0073dfb5b18fb43655b255aebafbd02) --- diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index bd28eb32413..7d7f5c8eecc 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -728,7 +728,6 @@ int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr) int i; fstring subkeyname; int ret = -1; - int dbret = -1; TALLOC_CTX *frame = talloc_stackframe(); TDB_DATA value; @@ -748,10 +747,7 @@ int regdb_fetch_keys(const char *key, REGSUBKEY_CTR *ctr) ctr->seqnum = regdb_get_seqnum(); - dbret = regdb->fetch(regdb, frame, string_term_tdb_data(path), &value); - if (dbret != 0) { - goto fail; - } + value = dbwrap_fetch_bystring(regdb, frame, path); buf = value.dptr; buflen = value.dsize;