[PATCH] Fix scope in backupkey

[Andreas Schneider]

On Thursday, 10 August 2017 11:00:45 CEST Andreas Schneider via samba-
technical wrote:
> Hi,
> 
> attached patch fixes scope of some variables.
> 

I've opened a bug and added it so we can get it in 4.7.

> Review and push appreciated.
> 
> Thanks,
> 
> 
> 	Andreas


-- 
Andreas Schneider                   GPG-ID: CC014E3D
Samba Team                             asn at samba.org
www.samba.org
-------------- next part --------------
>From e4075b8d6c72c929c943bf243edfb7b5243a212e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Tue, 18 Jul 2017 12:49:05 +0200
Subject: [PATCH] s4:rpc_server:backupkey: Move variable into scope

CID: #1415510

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12959

Signed-off-by: Andreas Schneider <asn at samba.org>
---
 source4/rpc_server/backupkey/dcesrv_backupkey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 444910bf409..cf9af1fbc31 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -360,6 +360,8 @@ static WERROR get_and_verify_access_check(TALLOC_CTX *sub_ctx,
 					  uint32_t access_check_len,
 					  struct auth_session_info *session_info)
 {
+	struct bkrp_access_check_v2 uncrypted_accesscheckv2;
+	struct bkrp_access_check_v3 uncrypted_accesscheckv3;
 	gnutls_cipher_hd_t cipher_handle = { 0 };
 	gnutls_cipher_algorithm_t cipher_algo;
 	DATA_BLOB blob_us;
@@ -422,7 +424,6 @@ static WERROR get_and_verify_access_check(TALLOC_CTX *sub_ctx,
 		uint32_t hash_size = 20;
 		uint8_t hash[hash_size];
 		gnutls_hash_hd_t dig_ctx;
-		struct bkrp_access_check_v2 uncrypted_accesscheckv2;
 
 		ndr_err = ndr_pull_struct_blob(&blob_us, sub_ctx, &uncrypted_accesscheckv2,
 					(ndr_pull_flags_fn_t)ndr_pull_bkrp_access_check_v2);
@@ -457,7 +458,6 @@ static WERROR get_and_verify_access_check(TALLOC_CTX *sub_ctx,
 		uint32_t hash_size = 64;
 		uint8_t hash[hash_size];
 		gnutls_hash_hd_t dig_ctx;
-		struct bkrp_access_check_v3 uncrypted_accesscheckv3;
 
 		ndr_err = ndr_pull_struct_blob(&blob_us, sub_ctx, &uncrypted_accesscheckv3,
 					(ndr_pull_flags_fn_t)ndr_pull_bkrp_access_check_v3);
-- 
2.14.0