diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-02-24 11:40:28 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-02-24 11:40:28 +1100 |
| commit | 3a1b4c00eb96634229fb730e9b38e8df5180756a (patch) | |
| tree | 2642c03cc4f0f8e52d4718b93facfe411a52d9ab /librpc/ndr/ndr_sec_helper.c | |
| parent | b9860043dc092df25d4a39074e106d7367ebbe8f (diff) | |
| parent | faa1100d229aef56da5d48f5c19ec901e520f8ef (diff) | |
| download | samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.tar.gz samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.tar.bz2 samba-3a1b4c00eb96634229fb730e9b38e8df5180756a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'librpc/ndr/ndr_sec_helper.c')
| -rw-r--r-- | librpc/ndr/ndr_sec_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/librpc/ndr/ndr_sec_helper.c b/librpc/ndr/ndr_sec_helper.c index 8f84c02f91..62194707c2 100644 --- a/librpc/ndr/ndr_sec_helper.c +++ b/librpc/ndr/ndr_sec_helper.c @@ -91,14 +91,14 @@ enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, int ndr_flags, str /* return the wire size of a security_acl */ -size_t ndr_size_security_acl(const struct security_acl *acl, struct smb_iconv_convenience *ic, int flags) +size_t ndr_size_security_acl(const struct security_acl *theacl, struct smb_iconv_convenience *ic, int flags) { size_t ret; int i; - if (!acl) return 0; + if (!theacl) return 0; ret = 8; - for (i=0;i<acl->num_aces;i++) { - ret += ndr_size_security_ace(&acl->aces[i], ic, flags); + for (i=0;i<theacl->num_aces;i++) { + ret += ndr_size_security_ace(&theacl->aces[i], ic, flags); } return ret; } |