summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-12-16 18:56:40 +0100
committerVolker Lendecke <vlendec@samba.org>2012-01-03 15:16:49 +0100
commitbed281dad774cfe3c828552740de70072b4901b5 (patch)
tree42b3d81cde8e1cecd66c2c8406c7224fa69722ce /source3
parentc01f02a4b97de453a0db7feb3c2d323f05fac7f6 (diff)
downloadsamba-bed281dad774cfe3c828552740de70072b4901b5.tar.gz
samba-bed281dad774cfe3c828552740de70072b4901b5.tar.bz2
samba-bed281dad774cfe3c828552740de70072b4901b5.zip
s3: Remove the unused "file_existed" parameter from smbd_calculate_access_mask
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Tue Jan 3 15:16:50 CET 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/fake_file.c1
-rw-r--r--source3/smbd/globals.h1
-rw-r--r--source3/smbd/open.c5
-rw-r--r--source3/smbd/smb2_create.c5
4 files changed, 2 insertions, 10 deletions
diff --git a/source3/smbd/fake_file.c b/source3/smbd/fake_file.c
index 2b31ba5ae0..95f6f932d9 100644
--- a/source3/smbd/fake_file.c
+++ b/source3/smbd/fake_file.c
@@ -130,7 +130,6 @@ NTSTATUS open_fake_file(struct smb_request *req, connection_struct *conn,
NTSTATUS status;
status = smbd_calculate_access_mask(conn, smb_fname,
- false, /* fake files do not exist */
access_mask, &access_mask);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("open_fake_file: smbd_calculate_access_mask "
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 02527e7453..631298b155 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -214,7 +214,6 @@ bool smbd_dirptr_lanman2_entry(TALLOC_CTX *ctx,
NTSTATUS smbd_calculate_access_mask(connection_struct *conn,
const struct smb_filename *smb_fname,
- bool file_existed,
uint32_t access_mask,
uint32_t *access_mask_out);
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d9491b5f04..dbc4dba448 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1534,7 +1534,6 @@ static NTSTATUS smbd_calculate_maximum_allowed_access(
NTSTATUS smbd_calculate_access_mask(connection_struct *conn,
const struct smb_filename *smb_fname,
- bool file_existed,
uint32_t access_mask,
uint32_t *access_mask_out)
{
@@ -1887,7 +1886,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
}
}
- status = smbd_calculate_access_mask(conn, smb_fname, file_existed,
+ status = smbd_calculate_access_mask(conn, smb_fname,
access_mask,
&access_mask);
if (!NT_STATUS_IS_OK(status)) {
@@ -2744,7 +2743,7 @@ static NTSTATUS open_directory(connection_struct *conn,
return NT_STATUS_NOT_A_DIRECTORY;
}
- status = smbd_calculate_access_mask(conn, smb_dname, dir_existed,
+ status = smbd_calculate_access_mask(conn, smb_dname,
access_mask, &access_mask);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("open_directory: smbd_calculate_access_mask "
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 6218592e3e..5f834cd1dd 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -745,11 +745,6 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
status = smbd_calculate_access_mask(smb1req->conn,
result->fsp_name,
- /*
- * at this stage
- * it exists
- */
- true,
SEC_FLAG_MAXIMUM_ALLOWED,
&max_access_granted);