[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  5ba91ff s3:registry: untangle assignment from check in reg_enumkey()
       via  e481afc s3:registry: untangle assignment from check in reg_enumvalue()
      from  bb4995b s4/heimdal: fix make-proto.pl with perl 5.16

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5ba91fff9483acf93ed99d16027111df7430f87e
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 3 14:42:46 2012 +0200

    s3:registry: untangle assignment from check in reg_enumkey()
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Thu Jul  5 17:57:16 CEST 2012 on sn-devel-104

commit e481afc0fec0a66fba133657de41b370e028f76a
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 3 14:42:12 2012 +0200

    s3:registry: untangle assignment from check in reg_enumvalue()

-----------------------------------------------------------------------

Summary of changes:
 source3/registry/reg_api.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index b962920..c263174 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -306,7 +306,8 @@ WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
 		return WERR_ACCESS_DENIED;
 	}
 
-	if (!W_ERROR_IS_OK(err = fill_subkey_cache(key))) {
+	err = fill_subkey_cache(key);
+	if (!W_ERROR_IS_OK(err)) {
 		return err;
 	}
 
@@ -338,7 +339,8 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 		return WERR_ACCESS_DENIED;
 	}
 
-	if (!(W_ERROR_IS_OK(err = fill_value_cache(key)))) {
+	err = fill_value_cache(key);
+	if (!(W_ERROR_IS_OK(err))) {
 		return err;
 	}
 


-- 
Samba Shared Repository