diff options
| author | Jeremy Allison <jra@samba.org> | 2002-03-23 02:57:44 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-03-23 02:57:44 +0000 |
| commit | c90cd26e9430b2fc065f620bdb6aaf4be0372fcc (patch) | |
| tree | 24d94d8df7d083923998f92d07202fa5cae66c3b /source3/smbd/dir.c | |
| parent | ce236d1dbf2673e2ff921683554cee41fca33249 (diff) | |
| download | samba-c90cd26e9430b2fc065f620bdb6aaf4be0372fcc.tar.gz samba-c90cd26e9430b2fc065f620bdb6aaf4be0372fcc.tar.bz2 samba-c90cd26e9430b2fc065f620bdb6aaf4be0372fcc.zip | |
Fix the mp3 rename bug - also tidy up our open code and remove the special
cases for rename and unlink. Had to add desired_access into the share mode record.
Jeremy.
(This used to be commit 3b1b8ac43535fb0839c5474fa55bf7150f6cde31)
Diffstat (limited to 'source3/smbd/dir.c')
| -rw-r--r-- | source3/smbd/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 40b198ed72..0bf234dd3e 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -687,7 +687,7 @@ static BOOL user_can_read_file(connection_struct *conn, char *name) /* Pseudo-open the file (note - no fd's created). */ if(S_ISDIR(ste.st_mode)) - fsp = open_directory(conn, name, &ste, SET_DENY_MODE(DENY_NONE), (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN), + fsp = open_directory(conn, name, &ste, 0, SET_DENY_MODE(DENY_NONE), (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN), unix_mode(conn,aRONLY|aDIR, name), &smb_action); else fsp = open_file_shared1(conn, name, &ste, FILE_READ_ATTRIBUTES, SET_DENY_MODE(DENY_NONE), @@ -698,7 +698,7 @@ static BOOL user_can_read_file(connection_struct *conn, char *name) /* Get NT ACL -allocated in main loop talloc context. No free needed here. */ sd_size = conn->vfs_ops.fget_nt_acl(fsp, fsp->fd, &psd); - close_file(fsp, True); + close_file(fsp, False); /* No access if SD get failed. */ if (!sd_size) |