diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-11-02 10:08:32 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-11-02 08:38:38 +0100 |
| commit | 6b11c9119fa3e2ea401f86873273533d673e04fa (patch) | |
| tree | fdf96707d9cd94e075e7aa08022b454703cf4c83 /lib/tdb2/open.c | |
| parent | a6ed9071b9aa75ff6f3ca2c3b24e6060c4d3f389 (diff) | |
| download | samba-6b11c9119fa3e2ea401f86873273533d673e04fa.tar.gz samba-6b11c9119fa3e2ea401f86873273533d673e04fa.tar.bz2 samba-6b11c9119fa3e2ea401f86873273533d673e04fa.zip | |
tdb2: don't be fascist when TDB_VERSION1 is specified.
We currently insist that a tdb file be a version1 file if tdb_open() is
passed the TDB_VERSION1 flag; we fail if it's actually a tdb2.
But that makes generic wrappers harder, and is unlikely to be what the
user wants: if they do, they can check tdb_get_flags() & TDB_VERSION1
after opening.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 9691464a16ef22d6acadfef209666381dfe22b2f)
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Wed Nov 2 08:38:38 CET 2011 on sn-devel-104
Diffstat (limited to 'lib/tdb2/open.c')
| -rw-r--r-- | lib/tdb2/open.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/tdb2/open.c b/lib/tdb2/open.c index 18e4cd8bb0..b76bd24b2a 100644 --- a/lib/tdb2/open.c +++ b/lib/tdb2/open.c @@ -647,12 +647,9 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, goto fail; } + /* This is a version2 tdb. */ if (tdb->flags & TDB_VERSION1) { - ecode = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, - "tdb_open:" - " %s does not need TDB_VERSION1", - name); - goto fail; + tdb->flags &= ~TDB_VERSION1; } tdb2_context_init(tdb); |