summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-17 23:58:49 +0200
committerMichael Adam <obnox@samba.org>2008-06-17 23:58:49 +0200
commitb172eb1d478aef1f1e6c8ea40486fe9895b0f9de (patch)
tree7f9f7597b961b65b87861fa755087530e76a2030 /source3
parent92c983292e3dda06952ef6a01d3f2a23f1c323ec (diff)
downloadsamba-b172eb1d478aef1f1e6c8ea40486fe9895b0f9de.tar.gz
samba-b172eb1d478aef1f1e6c8ea40486fe9895b0f9de.tar.bz2
samba-b172eb1d478aef1f1e6c8ea40486fe9895b0f9de.zip
file_access: remove unneeded stat buf parameter from can_access_file_acl().
This is a security descriptor level function only. Michael (This used to be commit 5931540fa1681f026fed42df387d17e43c493c47)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/smbd/dir.c2
-rw-r--r--source3/smbd/file_access.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index de40ff6912..70eaf325be 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -9641,7 +9641,7 @@ NTSTATUS close_fake_file(files_struct *fsp);
/* The following definitions come from smbd/file_access.c */
bool can_access_file_acl(struct connection_struct *conn,
- const char * fname, SMB_STRUCT_STAT *psbuf,
+ const char * fname,
uint32_t access_mask);
bool can_delete_file_in_directory(connection_struct *conn, const char *fname);
bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf, uint32 access_mask);
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index caa1c41a4f..2d9e7e7527 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -934,7 +934,7 @@ static bool user_can_read_file(connection_struct *conn, char *name, SMB_STRUCT_S
SMB_ASSERT(VALID_STAT(*pst));
- return can_access_file_acl(conn, name, pst, FILE_READ_DATA);
+ return can_access_file_acl(conn, name, FILE_READ_DATA);
}
/*******************************************************************
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index f72d6d1292..aaa114b950 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -24,7 +24,7 @@
#define DBGC_CLASS DBGC_ACLS
bool can_access_file_acl(struct connection_struct *conn,
- const char * fname, SMB_STRUCT_STAT *psbuf,
+ const char * fname,
uint32_t access_mask)
{
bool result;
@@ -114,7 +114,7 @@ bool can_delete_file_in_directory(connection_struct *conn, const char *fname)
/* now for ACL checks */
- return can_access_file_acl(conn, dname, &sbuf, FILE_WRITE_DATA);
+ return can_access_file_acl(conn, dname, FILE_WRITE_DATA);
}
/****************************************************************************
@@ -168,7 +168,7 @@ bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT
/* now for ACL checks */
- return can_access_file_acl(conn, fname, psbuf, access_mask);
+ return can_access_file_acl(conn, fname, access_mask);
}
/****************************************************************************