svn commit: samba r12725 - in branches/SAMBA_4_0/source: include libcli/raw libcli/smb2 smb_server/smb2

[metze at samba.org]

Author: metze
Date: 2006-01-05 16:43:56 +0000 (Thu, 05 Jan 2006)
New Revision: 12725

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12725

Log:
some minor updates

metze
Modified:
   branches/SAMBA_4_0/source/include/smb.h
   branches/SAMBA_4_0/source/libcli/raw/clitransport.c
   branches/SAMBA_4_0/source/libcli/smb2/transport.c
   branches/SAMBA_4_0/source/smb_server/smb2/receive.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/smb.h
===================================================================
--- branches/SAMBA_4_0/source/include/smb.h	2006-01-05 16:42:42 UTC (rev 12724)
+++ branches/SAMBA_4_0/source/include/smb.h	2006-01-05 16:43:56 UTC (rev 12725)
@@ -576,7 +576,7 @@
 #define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16))
 #define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \
         (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
-#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
+#define _smb2_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
         (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
 
 #endif /* _SMB_H */

Modified: branches/SAMBA_4_0/source/libcli/raw/clitransport.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2006-01-05 16:42:42 UTC (rev 12724)
+++ branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2006-01-05 16:43:56 UTC (rev 12725)
@@ -184,7 +184,7 @@
 	memcpy(p, calling_blob.data, calling_blob.length);
 	p += calling_blob.length;
 
-	_smb_setlen(req->out.buffer, PTR_DIFF(p, req->out.buffer)-4);
+	_smb_setlen(req->out.buffer, PTR_DIFF(p, req->out.buffer) - NBT_HDR_SIZE);
 	SCVAL(req->out.buffer,0,0x81);
 
 	if (!smbcli_request_send(req)) {

Modified: branches/SAMBA_4_0/source/libcli/smb2/transport.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/transport.c	2006-01-05 16:42:42 UTC (rev 12724)
+++ branches/SAMBA_4_0/source/libcli/smb2/transport.c	2006-01-05 16:43:56 UTC (rev 12725)
@@ -272,7 +272,7 @@
 	DATA_BLOB blob;
 	NTSTATUS status;
 
-	_smb_setlen2(req->out.buffer, req->out.size - NBT_HDR_SIZE);
+	_smb2_setlen(req->out.buffer, req->out.size - NBT_HDR_SIZE);
 
 	DEBUG(2, ("SMB2 send seqnum=0x%llx\n", (long long)req->seqnum));
 	dump_data(5, req->out.body, req->out.body_size);

Modified: branches/SAMBA_4_0/source/smb_server/smb2/receive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/receive.c	2006-01-05 16:42:42 UTC (rev 12724)
+++ branches/SAMBA_4_0/source/smb_server/smb2/receive.c	2006-01-05 16:43:56 UTC (rev 12725)
@@ -87,7 +87,7 @@
 	NTSTATUS status;
 
 	if (req->out.size > NBT_HDR_SIZE) {
-		_smb_setlen(req->out.buffer, req->out.size - NBT_HDR_SIZE);
+		_smb2_setlen(req->out.buffer, req->out.size - NBT_HDR_SIZE);
 	}
 
 	blob = data_blob_const(req->out.buffer, req->out.size);