sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

dbwrap: explicitly use DBWRAP_LOCK_ORDER_NONE in tdb->ntdb conversion

Browse Source 
Make lack of lock order checking more visible.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Michael Adam 2014-01-28 12:42:31 +01:00 committed by Stefan Metzmacher
parent 31c2336519
commit 44c66435ba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/dbwrap/dbwrap_local_open.c
View File

@ -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)));