diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:15:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 03:15:59 +0100 |
| commit | c165770f943d157c11d44566558ae07bf901bd26 (patch) | |
| tree | faa9e7bfe5242aa7661c69b991ad7fa213806f8f /source3/smbd/trans2.c | |
| parent | 2c81fd70ca4997947275ce823f08c895000fbc3d (diff) | |
| parent | 54eaf2de74b4779919ae97b54abceb3878894bf6 (diff) | |
| download | samba-c165770f943d157c11d44566558ae07bf901bd26.tar.gz samba-c165770f943d157c11d44566558ae07bf901bd26.tar.xz samba-c165770f943d157c11d44566558ae07bf901bd26.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 1da45a8b58..a450a56e72 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3846,7 +3846,6 @@ static void call_trans2qfilepathinfo(connection_struct *conn, files_struct *fsp = NULL; struct file_id fileid; struct ea_list *ea_list = NULL; - uint32 access_mask = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */ char *lock_data = NULL; bool ms_dfs_link = false; TALLOC_CTX *ctx = talloc_tos(); @@ -3939,7 +3938,6 @@ static void call_trans2qfilepathinfo(connection_struct *conn, pos = fsp->fh->position_information; fileid = vfs_file_id_from_sbuf(conn, &sbuf); get_file_infos(fileid, &delete_pending, &write_time_ts); - access_mask = fsp->access_mask; } } else { @@ -4403,7 +4401,12 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd case SMB_FILE_ACCESS_INFORMATION: DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n")); - SIVAL(pdata,0,access_mask); + if (fsp) { + SIVAL(pdata,0,fsp->access_mask); + } else { + /* GENERIC_EXECUTE mapping from Windows */ + SIVAL(pdata,0,0x12019F); + } data_size = 4; break; |