diff options
| author | bubulle <bubulle@alioth.debian.org> | 2012-12-12 21:11:47 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2012-12-12 21:11:47 +0000 |
| commit | 63f07bb10f08040c39530bdc6aaea46c7c0ac9dd (patch) | |
| tree | 72e23ab4ded614b11b21fb13aea9f8eb58727a65 /source3/smbd/open.c | |
| parent | 2cf876031f5616a1de04777c978d7847887b45ac (diff) | |
| download | samba-63f07bb10f08040c39530bdc6aaea46c7c0ac9dd.tar.gz | |
Load samba-3.6.10 into branches/samba/upstream.upstream/3.6.10
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@4179 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source3/smbd/open.c')
| -rw-r--r-- | source3/smbd/open.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 6b94a6d247..d10b6978be 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -58,6 +58,13 @@ NTSTATUS smb1_file_se_access_check(struct connection_struct *conn, return NT_STATUS_OK; } + /* + * If we can access the path to this file, by + * default we have FILE_READ_ATTRIBUTES from the + * containing directory. See the section: + * "Algorithm to Check Access to an Existing File" + * in MS-FSA.pdf. + */ return se_access_check(sd, token, (access_desired & ~FILE_READ_ATTRIBUTES), @@ -1416,7 +1423,14 @@ NTSTATUS smbd_calculate_access_mask(connection_struct *conn, } } - access_mask = access_granted; + /* + * If we can access the path to this file, by + * default we have FILE_READ_ATTRIBUTES from the + * containing directory. See the section. + * "Algorithm to Check Access to an Existing File" + * in MS-FSA.pdf. + */ + access_mask = access_granted | FILE_READ_ATTRIBUTES; } else { access_mask = FILE_GENERIC_ALL; } @@ -2752,8 +2766,8 @@ static NTSTATUS open_directory(connection_struct *conn, mtimespec = smb_dname->st.st_ex_mtime; - /* Temporary access mask used to open the directory fd. */ - fsp->access_mask = FILE_READ_DATA | FILE_READ_ATTRIBUTES; + fsp->access_mask = access_mask; + #ifdef O_DIRECTORY status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0); #else |