summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-06 18:48:02 +0100
committerMichael Adam <obnox@samba.org>2008-01-06 23:08:00 +0100
commit05352cf2cb7f9710444d340f3f14ac6917fb0416 (patch)
tree0331bf1c94f0dbd1053cad7b686c23f1b6eb297c /source3/smbd
parentb55171c1d7ae7d8f3218086fe14cc258065f9a41 (diff)
downloadsamba-05352cf2cb7f9710444d340f3f14ac6917fb0416.tar.gz
samba-05352cf2cb7f9710444d340f3f14ac6917fb0416.tar.bz2
samba-05352cf2cb7f9710444d340f3f14ac6917fb0416.zip
Remove superfluous parameter fd from SMB_VFS_FSET_NT_ACL().
Michael (This used to be commit 4f2d139a186048f08180378a877b69d2f80ad51f)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/nttrans.c3
-rw-r--r--source3/smbd/open.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index e7f9f0d36c..ae64c06215 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -769,8 +769,7 @@ static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
}
if (fsp->fh->fd != -1) {
- status = SMB_VFS_FSET_NT_ACL(fsp, fsp->fh->fd,
- security_info_sent, psd);
+ status = SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, psd);
}
else {
status = SMB_VFS_SET_NT_ACL(fsp, fsp->fsp_name,
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index f178102fdd..23d0223446 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2621,8 +2621,7 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
fsp->access_mask = FILE_GENERIC_ALL;
- status = SMB_VFS_FSET_NT_ACL(
- fsp, fsp->fh->fd, sec_info_sent, sd);
+ status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd);
fsp->access_mask = saved_access_mask;