summaryrefslogtreecommitdiff
path: root/source3/services
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-02-24 01:02:45 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-02-24 01:02:45 +0100
commitfff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (patch)
treeba4bb09fa2c79955c247a637cdd20290a249d960 /source3/services
parentb9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 (diff)
parent1a9bb33a7db393aff970619f20490e755f0d282b (diff)
downloadsamba-fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf.tar.gz
samba-fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf.tar.bz2
samba-fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/services')
-rw-r--r--source3/services/services_db.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index 6d1b5d5b95..ef975cfbc4 100644
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -91,7 +91,7 @@ static SEC_DESC* construct_service_sd( TALLOC_CTX *ctx )
SEC_ACE ace[4];
size_t i = 0;
SEC_DESC *sd = NULL;
- SEC_ACL *acl = NULL;
+ SEC_ACL *theacl = NULL;
size_t sd_size;
/* basic access for Everyone */
@@ -109,12 +109,12 @@ static SEC_DESC* construct_service_sd( TALLOC_CTX *ctx )
/* create the security descriptor */
- if ( !(acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
+ if ( !(theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
return NULL;
if ( !(sd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL,
- acl, &sd_size)) )
+ theacl, &sd_size)) )
return NULL;
return sd;