diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:50:13 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:50:13 +0930 |
commit | f68a56ce8f38cc1768d8c2dca84f456f4ecfc625 (patch) | |
tree | 640d6e029579d212598615727dc03567c2d6476f /lib/tdb2/tdb.c | |
parent | cbad6e2c140e59a6ec653bcfe773599a57a5042f (diff) | |
download | samba-f68a56ce8f38cc1768d8c2dca84f456f4ecfc625.tar.gz samba-f68a56ce8f38cc1768d8c2dca84f456f4ecfc625.tar.bz2 samba-f68a56ce8f38cc1768d8c2dca84f456f4ecfc625.zip |
tdb2: unify tdb1_store into tdb_store
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 98c754ffe65bc335f66161d6cc8705d4ea2710ec)
Diffstat (limited to 'lib/tdb2/tdb.c')
-rw-r--r-- | lib/tdb2/tdb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c index 14bf059966..806fb037a4 100644 --- a/lib/tdb2/tdb.c +++ b/lib/tdb2/tdb.c @@ -116,6 +116,12 @@ enum TDB_ERROR tdb_store(struct tdb_context *tdb, struct tdb_used_record rec; enum TDB_ERROR ecode; + if (tdb->flags & TDB_VERSION1) { + if (tdb1_store(tdb, key, dbuf, flag) == -1) + return tdb->last_error; + return TDB_SUCCESS; + } + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (TDB_OFF_IS_ERR(off)) { return tdb->last_error = off; |