summaryrefslogtreecommitdiffstats
path: root/source/smbd/nttrans.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-01-14 01:41:04 +0000
committerJeremy Allison <jra@samba.org>2000-01-14 01:41:04 +0000
commit38dffd360dc2e44bfc9e751f017e24f81ff0f2fa (patch)
treef29c9edb3d18eb8d569500710127df300f4768b8 /source/smbd/nttrans.c
parentf8bebf91abcaa5bda3ec8701f9242f220da8943a (diff)
downloadsamba-38dffd360dc2e44bfc9e751f017e24f81ff0f2fa.tar.gz
samba-38dffd360dc2e44bfc9e751f017e24f81ff0f2fa.tar.xz
samba-38dffd360dc2e44bfc9e751f017e24f81ff0f2fa.zip
Added "inherit permissions" patch.
Fixed locking bug found by Andrew. Jeremy.
Diffstat (limited to 'source/smbd/nttrans.c')
-rw-r--r--source/smbd/nttrans.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index 9615c5ada25..81536156e54 100644
--- a/source/smbd/nttrans.c
+++ b/source/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);