From: Arvid Requate <requate@univention.de>
Date: Tue, 8 Jul 2014 15:25:53 +0000 (+0200)
Subject: s4-backupkey: consistent naming of werr variable
X-Git-Tag: samba-4.2.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ff5c42bbbffc1a84d64a536cf235cca93de7a46;p=thirdparty%2Fsamba.git

s4-backupkey: consistent naming of werr variable

Signed-off-by: Arvid Requate <requate@univention.de>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit e6e9e490ae1352b0d572dbd3d546c14d367cbedb)
---

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 4e4beab0c40..fb558755cdb 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -931,11 +931,11 @@ static WERROR create_req(TALLOC_CTX *ctx, hx509_context *hctx, hx509_request *re
 	SubjectPublicKeyInfo key;
 
 	hx509_name name;
-	WERROR w_err;
+	WERROR werr;
 
-	w_err = create_heimdal_rsa_key(ctx, hctx, signer, rsa);
-	if (!W_ERROR_IS_OK(w_err)) {
-		return w_err;
+	werr = create_heimdal_rsa_key(ctx, hctx, signer, rsa);
+	if (!W_ERROR_IS_OK(werr)) {
+		return werr;
 	}
 
 	hx509_request_init(*hctx, req);
@@ -983,7 +983,7 @@ static WERROR create_req(TALLOC_CTX *ctx, hx509_context *hctx, hx509_request *re
 static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_call, struct ldb_context *ldb_ctx, const char *dn)
 {
 	heim_octet_string data;
-	WERROR w_err;
+	WERROR werr;
 	RSA *rsa;
 	hx509_context hctx;
 	hx509_private_key pk;
@@ -1003,10 +1003,10 @@ static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_
 
 	DEBUG(6, ("Trying to generate a certificate\n"));
 	hx509_context_init(&hctx);
-	w_err = create_req(ctx, &hctx, &req, &pk, &rsa, dn);
-	if (!W_ERROR_IS_OK(w_err)) {
+	werr = create_req(ctx, &hctx, &req, &pk, &rsa, dn);
+	if (!W_ERROR_IS_OK(werr)) {
 		hx509_context_free(&hctx);
-		return w_err;
+		return werr;
 	}
 
 	status = GUID_to_ndr_blob(&guid, ctx, &blob);
@@ -1017,8 +1017,8 @@ static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_
 		return WERR_INVALID_DATA;
 	}
 
-	w_err = self_sign_cert(ctx, &hctx, &req, nb_seconds_validity, &pk, &cert, &blob);
-	if (!W_ERROR_IS_OK(w_err)) {
+	werr = self_sign_cert(ctx, &hctx, &req, nb_seconds_validity, &pk, &cert, &blob);
+	if (!W_ERROR_IS_OK(werr)) {
 		hx509_private_key_free(&pk);
 		hx509_context_free(&hctx);
 		return WERR_INVALID_DATA;