summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-08-09 20:01:35 +0000
committerJeremy Allison <jra@samba.org>2001-08-09 20:01:35 +0000
commitc604830585336ac0ad42dff4bb240fa709fb1d4c (patch)
tree25149e3ac1514b02ddd58ce659887ea6b1360c30 /source3/smbd
parent4f181227e5d53ab3ec17bde135e4316383509b7d (diff)
downloadsamba-c604830585336ac0ad42dff4bb240fa709fb1d4c.tar.gz
samba-c604830585336ac0ad42dff4bb240fa709fb1d4c.tar.bz2
samba-c604830585336ac0ad42dff4bb240fa709fb1d4c.zip
Fixed wrong placement of allocate code :-(.
Changed alignment offset to 1 to allow netmon to parse ok. Jeremy. (This used to be commit fd89261a2c74910bd1cf8271d862a7b050b49f32)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/trans2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 26b376ec2d..a1e95bce3b 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -54,7 +54,7 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
char *pp = params;
char *pd = pdata;
int params_sent_thistime, data_sent_thistime, total_sent_thistime;
- int alignment_offset = 3;
+ int alignment_offset = 1; /* JRA. This used to be 3. Set to 1 to make netmon parse ok. */
int data_alignment_offset = 0;
/* Initially set the wcnt area to be 10 - this is true for all
@@ -1925,12 +1925,12 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
} else {
ret = vfs_allocate_file_space(fsp, size);
}
- }
+ if (ret == -1)
+ return allocate_space_error(inbuf, outbuf, errno);
- if (ret == -1)
- return allocate_space_error(inbuf, outbuf, errno);
+ sbuf.st_size = size;
+ }
- sbuf.st_size = size;
break;
}