summaryrefslogtreecommitdiff
path: root/source3/registry
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-02-23 15:03:29 -0800
committerJeremy Allison <jra@samba.org>2009-02-23 15:03:29 -0800
commit0b62cdbed0867d0712821953700062727f668c65 (patch)
tree4eb21582c3cf112c285ef9a5b4c7c3de2dcc4504 /source3/registry
parent1cd7fe71940b7420dd478321b8368a31ae713917 (diff)
downloadsamba-0b62cdbed0867d0712821953700062727f668c65.tar.gz
samba-0b62cdbed0867d0712821953700062727f668c65.tar.bz2
samba-0b62cdbed0867d0712821953700062727f668c65.zip
Quieten down a boatload of shadowed variable warnings on Solaris.
Makes real problems easier to spot. Jeremy.
Diffstat (limited to 'source3/registry')
-rw-r--r--source3/registry/reg_dispatcher.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c
index 7d950c3c4e..c160622054 100644
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -39,7 +39,7 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, SEC_DESC **psd)
SEC_ACE ace[3];
size_t i = 0;
SEC_DESC *sd;
- SEC_ACL *acl;
+ SEC_ACL *theacl;
size_t sd_size;
/* basic access for Everyone */
@@ -59,14 +59,14 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, SEC_DESC **psd)
/* create the security descriptor */
- acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace);
- if (acl == NULL) {
+ theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace);
+ if (theacl == NULL) {
return WERR_NOMEM;
}
sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
&global_sid_Builtin_Administrators,
- &global_sid_System, NULL, acl,
+ &global_sid_System, NULL, theacl,
&sd_size);
if (sd == NULL) {
return WERR_NOMEM;