Author: jpeach Date: 2007-06-01 19:34:08 +0000 (Fri, 01 Jun 2007) New Revision: 23299
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23299 Log: Fix the build for !WITH_SENDFILE. Modified: branches/SAMBA_3_0/source/smbd/reply.c branches/SAMBA_3_0_26/source/smbd/reply.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/reply.c =================================================================== --- branches/SAMBA_3_0/source/smbd/reply.c 2007-06-01 19:28:13 UTC (rev 23298) +++ branches/SAMBA_3_0/source/smbd/reply.c 2007-06-01 19:34:08 UTC (rev 23299) @@ -2246,11 +2246,10 @@ return; } - - normal_readbraw: - #endif +normal_readbraw: + if (nread > 0) { ret = read_file(fsp,outbuf+4,startpos,nread); #if 0 /* mincount appears to be ignored in a W2K server. JRA. */ @@ -2646,7 +2645,7 @@ #endif - normal_read: +normal_read: if ((smb_maxcnt & 0xFF0000) > 0x10000) { int sendlen = setup_readX_header(inbuf,outbuf,smb_maxcnt) - smb_maxcnt; Modified: branches/SAMBA_3_0_26/source/smbd/reply.c =================================================================== --- branches/SAMBA_3_0_26/source/smbd/reply.c 2007-06-01 19:28:13 UTC (rev 23298) +++ branches/SAMBA_3_0_26/source/smbd/reply.c 2007-06-01 19:34:08 UTC (rev 23299) @@ -2246,10 +2246,10 @@ return; } - normal_readbraw: - #endif +normal_readbraw: + if (nread > 0) { ret = read_file(fsp,outbuf+4,startpos,nread); #if 0 /* mincount appears to be ignored in a W2K server. JRA. */ @@ -2641,11 +2641,10 @@ /* Returning -1 here means successful sendfile. */ return -1; } - - normal_read: - #endif +normal_read: + if ((smb_maxcnt & 0xFF0000) > 0x10000) { int sendlen = setup_readX_header(outbuf,smb_maxcnt) - smb_maxcnt; /* Send out the header. */
