Author: vlendec Date: 2007-08-28 15:09:47 +0000 (Tue, 28 Aug 2007) New Revision: 24744
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24744 Log: Increase length by what we got from recv, not from ioctl Modified: branches/SAMBA_3_2/source/lib/packet.c branches/SAMBA_3_2_0/source/lib/packet.c Changeset: Modified: branches/SAMBA_3_2/source/lib/packet.c =================================================================== --- branches/SAMBA_3_2/source/lib/packet.c 2007-08-28 15:07:13 UTC (rev 24743) +++ branches/SAMBA_3_2/source/lib/packet.c 2007-08-28 15:09:47 UTC (rev 24744) @@ -83,6 +83,8 @@ return NT_STATUS_NO_MEMORY; } + ctx->in.data = in; + res = recv(ctx->fd, in + ctx->in.length, available, 0); if (res < 0) { @@ -94,8 +96,7 @@ return NT_STATUS_END_OF_FILE; } - ctx->in.data = in; - ctx->in.length += available; + ctx->in.length += res; return NT_STATUS_OK; } Modified: branches/SAMBA_3_2_0/source/lib/packet.c =================================================================== --- branches/SAMBA_3_2_0/source/lib/packet.c 2007-08-28 15:07:13 UTC (rev 24743) +++ branches/SAMBA_3_2_0/source/lib/packet.c 2007-08-28 15:09:47 UTC (rev 24744) @@ -83,6 +83,8 @@ return NT_STATUS_NO_MEMORY; } + ctx->in.data = in; + res = recv(ctx->fd, in + ctx->in.length, available, 0); if (res < 0) { @@ -94,8 +96,7 @@ return NT_STATUS_END_OF_FILE; } - ctx->in.data = in; - ctx->in.length += available; + ctx->in.length += res; return NT_STATUS_OK; }
