From c604830585336ac0ad42dff4bb240fa709fb1d4c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 9 Aug 2001 20:01:35 +0000 Subject: Fixed wrong placement of allocate code :-(. Changed alignment offset to 1 to allow netmon to parse ok. Jeremy. (This used to be commit fd89261a2c74910bd1cf8271d862a7b050b49f32) --- source3/smbd/trans2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/smbd') 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; } -- cgit