From 3deba6349ca751d669e2af817ec7e2c7eb6195b3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 25 Feb 2010 16:31:12 +0100 Subject: s3: Make the difference between r/o and r/w in connections_db_ctx more obvious --- source3/lib/conn_tdb.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'source3') diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c index 90e455a73e..e95ada4c6a 100644 --- a/source3/lib/conn_tdb.c +++ b/source3/lib/conn_tdb.c @@ -22,21 +22,16 @@ static struct db_context *connections_db_ctx(bool rw) { static struct db_context *db_ctx; + int open_flags; if (db_ctx != NULL) { return db_ctx; } - if (rw) { - db_ctx = db_open(NULL, lock_path("connections.tdb"), 0, - TDB_CLEAR_IF_FIRST|TDB_DEFAULT, - O_RDWR | O_CREAT, 0644); - } - else { - db_ctx = db_open(NULL, lock_path("connections.tdb"), 0, - TDB_CLEAR_IF_FIRST|TDB_DEFAULT, O_RDONLY, 0); - } + open_flags = rw ? (O_RDWR|O_CREAT) : O_RDONLY; + db_ctx = db_open(NULL, lock_path("connections.tdb"), 0, + TDB_CLEAR_IF_FIRST|TDB_DEFAULT, open_flags, 0644); return db_ctx; } -- cgit