summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-12-02 14:37:44 +0100
committerVolker Lendecke <vl@sernet.de>2007-12-05 13:45:12 +0100
commitbef09af7579e376dac76c617750883d915ddb3c7 (patch)
tree6589043a98011b47f1ad72d2199397fcee87f9d2
parentaa6f0a01513b91ead65069734a896eb9700b6c5b (diff)
downloadsamba-bef09af7579e376dac76c617750883d915ddb3c7.tar.gz
samba-bef09af7579e376dac76c617750883d915ddb3c7.tar.bz2
samba-bef09af7579e376dac76c617750883d915ddb3c7.zip
Fix attribute calculation for ntcreate&x
(This used to be commit 9ef81cb14952cad96c71409c04a2cc6579e3311c)
-rw-r--r--source3/smbd/nttrans.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 739bf01ef9..15a05b5e83 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -470,13 +470,10 @@ static NTSTATUS create_file(connection_struct *conn,
files_struct **result,
int *pinfo,
uint8_t *poplock_granted,
- SMB_STRUCT_STAT *psbuf,
- SMB_OFF_T *pfile_len)
+ SMB_STRUCT_STAT *psbuf)
{
TALLOC_CTX *frame = talloc_stackframe();
struct case_semantics_state *case_state = NULL;
- uint32_t fattr;
- SMB_OFF_T file_len = 0;
SMB_STRUCT_STAT sbuf;
int info = FILE_WAS_OPENED;
files_struct *fsp = NULL;
@@ -809,12 +806,7 @@ static NTSTATUS create_file(connection_struct *conn,
}
}
- file_len = sbuf.st_size;
- fattr = dos_mode(conn,fname,&sbuf);
- if(fattr == 0) {
- fattr = FILE_ATTRIBUTE_NORMAL;
- }
- if (!fsp->is_directory && (fattr & aDIR)) {
+ if (!fsp->is_directory && S_ISDIR(sbuf.st_mode)) {
status = NT_STATUS_ACCESS_DENIED;
goto fail;
}
@@ -822,7 +814,7 @@ static NTSTATUS create_file(connection_struct *conn,
/* Save the requested allocation size. */
if ((info == FILE_WAS_CREATED) || (info == FILE_WAS_OVERWRITTEN)) {
if (allocation_size
- && (allocation_size > (SMB_BIG_UINT)file_len)) {
+ && (allocation_size > sbuf.st_size)) {
fsp->initial_allocation_size = smb_roundup(
fsp->conn, allocation_size);
if (fsp->is_directory) {
@@ -836,7 +828,8 @@ static NTSTATUS create_file(connection_struct *conn,
goto fail;
}
} else {
- fsp->initial_allocation_size = smb_roundup(fsp->conn,(SMB_BIG_UINT)file_len);
+ fsp->initial_allocation_size = smb_roundup(
+ fsp->conn, (SMB_BIG_UINT)sbuf.st_size);
}
}
@@ -866,14 +859,13 @@ static NTSTATUS create_file(connection_struct *conn,
}
done:
- DEBUG(10, ("create_file: info=%d, oplock_granted=%d, file_len=%lu\n",
- info, (int)oplock_granted, (unsigned long)file_len));
+ DEBUG(10, ("create_file: info=%d, oplock_granted=%d\n",
+ info, (int)oplock_granted));
*result = fsp;
*pinfo = info;
*poplock_granted = oplock_granted;
*psbuf = sbuf;
- *pfile_len = file_len;
TALLOC_FREE(frame);
return NT_STATUS_OK;
@@ -984,7 +976,7 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
access_mask, file_attributes, share_access,
create_disposition, create_options,
oplock_request, allocation_size, NULL, NULL,
- &fsp, &info, &oplock_granted, &sbuf, &file_len);
+ &fsp, &info, &oplock_granted, &sbuf);
if (!NT_STATUS_IS_OK(status)) {
if (open_was_deferred(req->mid)) {
@@ -1002,6 +994,12 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
return;
}
+ file_len = sbuf.st_size;
+ fattr = dos_mode(conn,fname,&sbuf);
+ if (fattr == 0) {
+ fattr = FILE_ATTRIBUTE_NORMAL;
+ }
+
if (flags & EXTENDED_RESPONSE_REQUIRED) {
/* This is very strange. We
* return 50 words, but only set
@@ -1420,7 +1418,7 @@ static void call_nt_transact_create(connection_struct *conn,
access_mask, file_attributes, share_access,
create_disposition, create_options,
oplock_request, allocation_size, sd, ea_list,
- &fsp, &info, &oplock_granted, &sbuf, &file_len);
+ &fsp, &info, &oplock_granted, &sbuf);
if(!NT_STATUS_IS_OK(status)) {
if (open_was_deferred(req->mid)) {
@@ -1436,6 +1434,12 @@ static void call_nt_transact_create(connection_struct *conn,
return;
}
+ file_len = sbuf.st_size;
+ fattr = dos_mode(conn,fname,&sbuf);
+ if (fattr == 0) {
+ fattr = FILE_ATTRIBUTE_NORMAL;
+ }
+
/* Realloc the size of parameters and data we will return */
if (flags & EXTENDED_RESPONSE_REQUIRED) {
/* Extended response is 32 more byyes. */