diff options
| author | Jeremy Allison <jra@samba.org> | 2000-01-14 01:41:04 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-01-14 01:41:04 +0000 |
| commit | 3a6c2069d77176bfa2b379ef711034396c477791 (patch) | |
| tree | 87597146847db54925106d9e40b90b31ad86c852 /source3/smbd/nttrans.c | |
| parent | 2afd5d5eb5c176f09a9f4f00ea3b517e89ef0ddf (diff) | |
| download | samba-3a6c2069d77176bfa2b379ef711034396c477791.tar.gz samba-3a6c2069d77176bfa2b379ef711034396c477791.tar.bz2 samba-3a6c2069d77176bfa2b379ef711034396c477791.zip | |
Added "inherit permissions" patch.
Fixed locking bug found by Andrew.
Jeremy.
(This used to be commit 38dffd360dc2e44bfc9e751f017e24f81ff0f2fa)
Diffstat (limited to 'source3/smbd/nttrans.c')
| -rw-r--r-- | source3/smbd/nttrans.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 9615c5ada2..81536156e5 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -726,7 +726,7 @@ int reply_ntcreate_and_X(connection_struct *conn, return(UNIXERROR(ERRDOS,ERRnoaccess)); } - unixmode = unix_mode(conn,smb_attr | aARCH); + unixmode = unix_mode(conn,smb_attr | aARCH, fname); /* * If it's a request for a directory open, deal with it separately. @@ -1073,7 +1073,7 @@ static int call_nt_transact_create(connection_struct *conn, return(UNIXERROR(ERRDOS,ERRnoaccess)); } - unixmode = unix_mode(conn,smb_attr | aARCH); + unixmode = unix_mode(conn,smb_attr | aARCH, fname); /* * If it's a request for a directory open, deal with it separately. @@ -1834,7 +1834,7 @@ static size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc) * ACE entries. These are the permissions a file would get when * being created in the directory. */ - mode_t mode = unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE); + mode_t mode = unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE, fsp->fsp_name); owner_access = map_unix_perms(&owner_acl_type, mode, S_IRUSR, S_IWUSR, S_IXUSR, fsp->is_directory); |