diff options
author | Jeremy Allison <jra@samba.org> | 2009-02-23 15:42:52 -0800 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-02-24 08:35:17 +0100 |
commit | 733d4b54546d6c7c9350cf522d4980877edac6d4 (patch) | |
tree | 07dc7cde7c82b7a73b40fc63cc95671f95d89d21 /source/utils/profiles.c | |
parent | 1dd4404782ca2d12b3815e7e0fcb6e6045d690b0 (diff) | |
download | samba-733d4b54546d6c7c9350cf522d4980877edac6d4.tar.gz |
More warning fixes for Solaris.
Jeremy.
(cherry picked from commit 6306dd0cab617930176fdde91641344ef403429b)
Diffstat (limited to 'source/utils/profiles.c')
-rw-r--r-- | source/utils/profiles.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/utils/profiles.c b/source/utils/profiles.c index 5dd788ad5ff..bbbaaf089f8 100644 --- a/source/utils/profiles.c +++ b/source/utils/profiles.c @@ -57,7 +57,7 @@ static void verbose_output(const char *format, ...) static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 ) { - SEC_ACL *acl; + SEC_ACL *theacl; int i; bool update = False; @@ -78,30 +78,30 @@ static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 ) sid_string_tos(sd->group_sid)); } - acl = sd->dacl; - verbose_output(" DACL: %d entries:\n", acl->num_aces); - for ( i=0; i<acl->num_aces; i++ ) { + theacl = sd->dacl; + verbose_output(" DACL: %d entries:\n", theacl->num_aces); + for ( i=0; i<theacl->num_aces; i++ ) { verbose_output(" Trustee SID: %s\n", - sid_string_tos(&acl->aces[i].trustee)); - if ( sid_equal( &acl->aces[i].trustee, s1 ) ) { - sid_copy( &acl->aces[i].trustee, s2 ); + sid_string_tos(&theacl->aces[i].trustee)); + if ( sid_equal( &theacl->aces[i].trustee, s1 ) ) { + sid_copy( &theacl->aces[i].trustee, s2 ); update = True; verbose_output(" New Trustee SID: %s\n", - sid_string_tos(&acl->aces[i].trustee)); + sid_string_tos(&theacl->aces[i].trustee)); } } #if 0 - acl = sd->sacl; - verbose_output(" SACL: %d entries: \n", acl->num_aces); - for ( i=0; i<acl->num_aces; i++ ) { + theacl = sd->sacl; + verbose_output(" SACL: %d entries: \n", theacl->num_aces); + for ( i=0; i<theacl->num_aces; i++ ) { verbose_output(" Trustee SID: %s\n", - sid_string_tos(&acl->aces[i].trustee)); - if ( sid_equal( &acl->aces[i].trustee, s1 ) ) { - sid_copy( &acl->aces[i].trustee, s2 ); + sid_string_tos(&theacl->aces[i].trustee)); + if ( sid_equal( &theacl->aces[i].trustee, s1 ) ) { + sid_copy( &theacl->aces[i].trustee, s2 ); update = True; verbose_output(" New Trustee SID: %s\n", - sid_string_tos(&acl->aces[i].trustee)); + sid_string_tos(&theacl->aces[i].trustee)); } } #endif |