[PATCH 2/4] s4-backupkey: consistent naming of werr variable

Arvid Requate requate at univention.de
Tue Jul 8 10:23:26 MDT 2014


Signed-off-by: Arvid Requate <requate at univention.de>
---
 source4/rpc_server/backupkey/dcesrv_backupkey.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c 
b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 528af01..850735d 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);
@@ -984,7 +984,7 @@ static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct 
dcesrv_call_state *dce_
 {
 
        struct heim_octet_string data;
-       WERROR w_err;
+       WERROR werr;
        RSA *rsa;
        hx509_context hctx;
        hx509_private_key pk;
@@ -1004,10 +1004,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);
@@ -1018,8 +1018,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;
-- 
2.0.0.rc2



More information about the samba-technical mailing list