From d60350c3a1ca0bdf0dad6be9786727f3bdbb38e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 1 Jun 2006 18:17:58 +0000
Subject: [PATCH] Avoid more shadowing.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17606 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/pkinit.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index a2aa6b9bd..3d133be95 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -69,7 +69,7 @@ struct krb5_pk_identity {
     hx509_certs certs;
     hx509_certs anchors;
     hx509_certs certpool;
-    hx509_revoke_ctx revoke;
+    hx509_revoke_ctx revokectx;
 };
 
 struct krb5_pk_cert {
@@ -1439,14 +1439,16 @@ _krb5_pk_load_id(krb5_context context,
     }
 
     if (revoke_list) {
-	ret = hx509_revoke_init(id->hx509ctx, &id->revoke);
+	ret = hx509_revoke_init(id->hx509ctx, &id->revokectx);
 	if (ret) {
 	    krb5_set_error_string(context, "revoke failed to init");
 	    goto out;
 	}
 
 	while (*revoke_list) {
-	    ret = hx509_revoke_add_crl(id->hx509ctx, id->revoke, *revoke_list);
+	    ret = hx509_revoke_add_crl(id->hx509ctx, 
+				       id->revokectx,
+				       *revoke_list);
 	    if (ret) {
 		krb5_set_error_string(context,
 				      "pkinit failed to load revoke %s",
@@ -1463,7 +1465,7 @@ _krb5_pk_load_id(krb5_context context,
 	goto out;
 
     hx509_verify_attach_anchors(id->verify_ctx, id->anchors);
-    hx509_verify_attach_revoke(id->verify_ctx, id->revoke);
+    hx509_verify_attach_revoke(id->verify_ctx, id->revokectx);
 
 out:
     if (ret) {
@@ -1471,7 +1473,7 @@ out:
 	hx509_certs_free(&id->certs);
 	hx509_certs_free(&id->anchors);
 	hx509_certs_free(&id->certpool);
-	hx509_revoke_free(&id->revoke);
+	hx509_revoke_free(&id->revokectx);
 	hx509_context_free(&id->hx509ctx);
 	free(id);
     } else
@@ -1779,7 +1781,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
 				   const char *user_id,
 				   const char *x509_anchors,
 				   char * const * pool,
-				   char * const * revoke,
+				   char * const * pki_revoke,
 				   int flags,
 				   krb5_prompter_fct prompter,
 				   void *prompter_data,
@@ -1815,11 +1817,11 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
 				       "pkinit-pool", 
 				       NULL);
 
-    if (revoke == NULL)
-	revoke = krb5_config_get_strings(context, NULL,
-					 "appdefaults", 
-					 "pkinit-revoke", 
-					 NULL);
+    if (pki_revoke == NULL)
+	pki_revoke = krb5_config_get_strings(context, NULL,
+					     "appdefaults", 
+					     "pkinit-revoke", 
+					     NULL);
 
     if (x509_anchors == NULL) {
 	krb5_appdefault_string(context, "kinit",
@@ -1833,7 +1835,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
 			   user_id,
 			   x509_anchors,
 			   pool,
-			   revoke,
+			   pki_revoke,
 			   prompter,
 			   prompter_data,
 			   password);