r15132: Fix some shadowed variable warnings

(This used to be commit 97d2c20b0b37ac07b6e37e9614ff41ab7e131c98)

2 files changed, 28 insertions, 28 deletions

diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 69a4c8eda3..76e49ee96a 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -774,7 +774,7 @@ static void wcache_save_lockout_policy(struct winbindd_domain *domain, NTSTATUS
 	centry_free(centry);
 }
 
-static void wcache_save_password_policy(struct winbindd_domain *domain, NTSTATUS status, SAM_UNK_INFO_1 *password_policy)
+static void wcache_save_password_policy(struct winbindd_domain *domain, NTSTATUS status, SAM_UNK_INFO_1 *policy)
 {
 	struct cache_entry *centry;
 
@@ -782,11 +782,11 @@ static void wcache_save_password_policy(struct winbindd_domain *domain, NTSTATUS
 	if (!centry)
 		return;
 
-	centry_put_uint16(centry, password_policy->min_length_password);
-	centry_put_uint16(centry, password_policy->password_history);
-	centry_put_uint32(centry, password_policy->password_properties);
-	centry_put_nttime(centry, password_policy->expire);
-	centry_put_nttime(centry, password_policy->min_passwordage);
+	centry_put_uint16(centry, policy->min_length_password);
+	centry_put_uint16(centry, policy->password_history);
+	centry_put_uint32(centry, policy->password_properties);
+	centry_put_nttime(centry, policy->expire);
+	centry_put_nttime(centry, policy->min_passwordage);
 
 	centry_end(centry, "PWD_POL/%s", domain->name);
 	
@@ -1735,7 +1735,7 @@ skip_save:
 /* get lockout policy */
 static NTSTATUS lockout_policy(struct winbindd_domain *domain,
  			       TALLOC_CTX *mem_ctx,
-			       SAM_UNK_INFO_12 *lockout_policy){
+			       SAM_UNK_INFO_12 *policy){
  	struct winbind_cache *cache = get_cache(domain);
  	struct cache_entry *centry = NULL;
  	NTSTATUS status;
@@ -1748,9 +1748,9 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain,
 	if (!centry)
  		goto do_query;
  
-	lockout_policy->duration = centry_nttime(centry);
-	lockout_policy->reset_count = centry_nttime(centry);
-	lockout_policy->bad_attempt_lockout = centry_uint16(centry);
+	policy->duration = centry_nttime(centry);
+	policy->reset_count = centry_nttime(centry);
+	policy->bad_attempt_lockout = centry_uint16(centry);
  
  	status = centry->status;
  
@@ -1761,7 +1761,7 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain,
  	return status;
  
 do_query:
-	ZERO_STRUCTP(lockout_policy);
+	ZERO_STRUCTP(policy);
  
 	/* Return status value returned by seq number check */
 
@@ -1771,11 +1771,11 @@ do_query:
 	DEBUG(10,("lockout_policy: [Cached] - doing backend query for info for domain %s\n",
 		domain->name ));
  
-	status = domain->backend->lockout_policy(domain, mem_ctx, lockout_policy); 
+	status = domain->backend->lockout_policy(domain, mem_ctx, policy); 
  
 	/* and save it */
  	refresh_sequence_number(domain, False);
-	wcache_save_lockout_policy(domain, status, lockout_policy);
+	wcache_save_lockout_policy(domain, status, policy);
  
  	return status;
 }
@@ -1783,7 +1783,7 @@ do_query:
 /* get password policy */
 static NTSTATUS password_policy(struct winbindd_domain *domain,
 				TALLOC_CTX *mem_ctx,
-				SAM_UNK_INFO_1 *password_policy)
+				SAM_UNK_INFO_1 *policy)
 {
 	struct winbind_cache *cache = get_cache(domain);
 	struct cache_entry *centry = NULL;
@@ -1797,11 +1797,11 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
 	if (!centry)
 		goto do_query;
 
-	password_policy->min_length_password = centry_uint16(centry);
-	password_policy->password_history = centry_uint16(centry);
-	password_policy->password_properties = centry_uint32(centry);
-	password_policy->expire = centry_nttime(centry);
-	password_policy->min_passwordage = centry_nttime(centry);
+	policy->min_length_password = centry_uint16(centry);
+	policy->password_history = centry_uint16(centry);
+	policy->password_properties = centry_uint32(centry);
+	policy->expire = centry_nttime(centry);
+	policy->min_passwordage = centry_nttime(centry);
 
 	status = centry->status;
 
@@ -1812,7 +1812,7 @@ static NTSTATUS password_policy(struct winbindd_domain *domain,
 	return status;
 
 do_query:
-	ZERO_STRUCTP(password_policy);
+	ZERO_STRUCTP(policy);
 
 	/* Return status value returned by seq number check */
 
@@ -1822,11 +1822,11 @@ do_query:
 	DEBUG(10,("password_policy: [Cached] - doing backend query for info for domain %s\n",
 		domain->name ));
 
-	status = domain->backend->password_policy(domain, mem_ctx, password_policy); 
+	status = domain->backend->password_policy(domain, mem_ctx, policy); 
 
 	/* and save it */
 	refresh_sequence_number(domain, False);
-	wcache_save_password_policy(domain, status, password_policy);
+	wcache_save_password_policy(domain, status, policy);
 
 	return status;
 }
diff --git a/source3/nsswitch/winbindd_reconnect.c b/source3/nsswitch/winbindd_reconnect.c
index e37bfcad97..7bc8be1213 100644
--- a/source3/nsswitch/winbindd_reconnect.c
+++ b/source3/nsswitch/winbindd_reconnect.c
@@ -223,14 +223,14 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq)
 /* find the lockout policy of a domain */
 static NTSTATUS lockout_policy(struct winbindd_domain *domain, 
 			       TALLOC_CTX *mem_ctx,
-			       SAM_UNK_INFO_12 *lockout_policy)
+			       SAM_UNK_INFO_12 *policy)
 {
 	NTSTATUS result;
 
-	result = msrpc_methods.lockout_policy(domain, mem_ctx, lockout_policy);
+	result = msrpc_methods.lockout_policy(domain, mem_ctx, policy);
 
 	if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
-		result = msrpc_methods.lockout_policy(domain, mem_ctx, lockout_policy);
+		result = msrpc_methods.lockout_policy(domain, mem_ctx, policy);
 
 	return result;
 }
@@ -238,14 +238,14 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain,
 /* find the password policy of a domain */
 static NTSTATUS password_policy(struct winbindd_domain *domain, 
 				TALLOC_CTX *mem_ctx,
-				SAM_UNK_INFO_1 *password_policy)
+				SAM_UNK_INFO_1 *policy)
 {
  	NTSTATUS result;
  
-	result = msrpc_methods.password_policy(domain, mem_ctx, password_policy);
+	result = msrpc_methods.password_policy(domain, mem_ctx, policy);
 
 	if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
-		result = msrpc_methods.password_policy(domain, mem_ctx, password_policy);
+		result = msrpc_methods.password_policy(domain, mem_ctx, policy);
 	
 	return result;
 }