From: Michael Adam <obnox@samba.org>
Date: Thu, 20 Mar 2008 13:24:12 +0000 (+0100)
Subject: registry: untangle assignment and if-statement in regdb_init().
X-Git-Tag: samba-3.3.0pre1~3222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=504058df9706ee4e4c2e7fb1b1e41710bce2f87d;p=thirdparty%2Fsamba.git

registry: untangle assignment and if-statement in regdb_init().

Michael
---

diff --git a/source/registry/reg_backend_db.c b/source/registry/reg_backend_db.c
index 04b01797f72..a86edf0ff9a 100644
--- a/source/registry/reg_backend_db.c
+++ b/source/registry/reg_backend_db.c
@@ -329,8 +329,8 @@ bool regdb_init( void )
 		return true;
 	}
 
-	if ( !(regdb = db_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600)) )
-	{
+	regdb = db_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600);
+	if (!regdb) {
 		regdb = db_open(NULL, state_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600);
 		if ( !regdb ) {
 			DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",