From e4fc313293c35dda0ff35392dbcdccbfda0e1d24 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 23 Apr 2012 15:29:41 +0200
Subject: [PATCH] s3:registry: untangle assignment from check in
 regkey_open_onelevel() (cherry picked from commit
 52d3c5c14898b5f2514d1512289370eb6f6fd369)

---
 source3/registry/reg_api.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 69b987a723d..c81d05da7ea 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -151,7 +151,8 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 
-	if ( !(W_ERROR_IS_OK(result = regdb_open())) ) {
+	result = regdb_open();
+	if (!(W_ERROR_IS_OK(result))) {
 		goto done;
 	}
 
-- 
2.11.4.GIT