From 44c66435bafc786f8a4c10e3652c7de168f642b1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 28 Jan 2014 12:42:31 +0100 Subject: [PATCH] dbwrap: explicitly use DBWRAP_LOCK_ORDER_NONE in tdb->ntdb conversion Make lack of lock order checking more visible. Signed-off-by: Michael Adam Reviewed-by: Stefan Metzmacher --- lib/dbwrap/dbwrap_local_open.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/dbwrap/dbwrap_local_open.c b/lib/dbwrap/dbwrap_local_open.c index a6f494e313d..6e40139962b 100644 --- a/lib/dbwrap/dbwrap_local_open.c +++ b/lib/dbwrap/dbwrap_local_open.c @@ -103,7 +103,8 @@ static bool tdb_to_ntdb(TALLOC_CTX *ctx, struct loadparm_context *lp_ctx, return false; } tdb = db_open_tdb(ctx, lp_ctx, tdbname, 0, - TDB_DEFAULT, O_RDONLY, 0, 0, DBWRAP_FLAG_NONE); + TDB_DEFAULT, O_RDONLY, 0, DBWRAP_LOCK_ORDER_NONE, + DBWRAP_FLAG_NONE); if (!tdb) { DEBUG(0, ("tdb_to_ntdb: could not open %s: %s\n", tdbname, strerror(errno))); @@ -111,7 +112,8 @@ static bool tdb_to_ntdb(TALLOC_CTX *ctx, struct loadparm_context *lp_ctx, } ntdb = db_open_ntdb(ctx, lp_ctx, ntdbname, dbwrap_hash_size(tdb), TDB_DEFAULT, O_RDWR|O_CREAT|O_EXCL, - st.st_mode & 0777, 0, DBWRAP_FLAG_NONE); + st.st_mode & 0777, DBWRAP_LOCK_ORDER_NONE, + DBWRAP_FLAG_NONE); if (!ntdb) { DEBUG(0, ("tdb_to_ntdb: could not create %s: %s\n", ntdbname, strerror(errno))); -- 2.11.4.GIT