diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-24 01:02:45 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-24 01:02:45 +0100 |
commit | fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (patch) | |
tree | ba4bb09fa2c79955c247a637cdd20290a249d960 /source3/registry/reg_dispatcher.c | |
parent | b9cf189404d5ef6b0a2440dc5f9670f0f6d0c131 (diff) | |
parent | 1a9bb33a7db393aff970619f20490e755f0d282b (diff) | |
download | samba-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/registry/reg_dispatcher.c')
-rw-r--r-- | source3/registry/reg_dispatcher.c | 8 |
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; |