summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-06-01 21:00:37 +0000
committerJeremy Allison <jra@samba.org>2000-06-01 21:00:37 +0000
commitb9fedcb2de5612bdb4e763fe0788e1a4a9c16d33 (patch)
tree088f062c58a4fe3d5a57b98b279ae8bf97bf2cb5 /source3/smbd
parent61ab5b46cfb93939651b4426016845a035315bf7 (diff)
downloadsamba-b9fedcb2de5612bdb4e763fe0788e1a4a9c16d33.tar.gz
samba-b9fedcb2de5612bdb4e763fe0788e1a4a9c16d33.tar.bz2
samba-b9fedcb2de5612bdb4e763fe0788e1a4a9c16d33.zip
param/loadparm.c: Looks like someone ran indent on this !
passdb/smbpass.c: Insure uninitialized memory reference fix. printing/nt_printing.c: rpc_server/srv_spoolss_nt.c: Insure memory leak fixes. smbd/unix_acls.c: Shadow ref fix. Jeremy. (This used to be commit d175d3ebefc053e9badd91ca5f2d8bd03eb6705d)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/unix_acls.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/unix_acls.c b/source3/smbd/unix_acls.c
index 08dfbc0006..40bb281c74 100644
--- a/source3/smbd/unix_acls.c
+++ b/source3/smbd/unix_acls.c
@@ -338,7 +338,7 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
SEC_ACE ace_list[6];
DOM_SID owner_sid;
DOM_SID group_sid;
- size_t sec_desc_size;
+ size_t sd_size;
SEC_ACL *psa = NULL;
SEC_ACCESS owner_access;
int owner_acl_type;
@@ -429,16 +429,16 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
}
}
- *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, psa, &sec_desc_size);
+ *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, psa, &sd_size);
if(!*ppdesc) {
DEBUG(0,("get_nt_acl: Unable to malloc space for security descriptor.\n"));
- sec_desc_size = 0;
+ sd_size = 0;
}
free_sec_acl(&psa);
- return sec_desc_size;
+ return sd_size;
}
/****************************************************************************