svn commit: samba r15880 - in branches/SAMBA_4_0/source/ntvfs/ipc: .

tridge at samba.org tridge at samba.org
Thu May 25 04:46:38 GMT 2006


Author: tridge
Date: 2006-05-25 04:46:38 +0000 (Thu, 25 May 2006)
New Revision: 15880

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

Log:

the ntvfs_handle changes broke rpc on big-endian boxes, as the
uint16_t fnum was being byte order converted twice in the ipc server.

Metze, can you have a look at this? This change does make rpc work
again, but perhaps you might like to approach it differently

Modified:
   branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2006-05-25 02:09:00 UTC (rev 15879)
+++ branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c	2006-05-25 04:46:38 UTC (rev 15880)
@@ -658,9 +658,11 @@
 	struct ipc_private *private = ntvfs->private_data;
 	NTSTATUS status;
 	DATA_BLOB fnum_key;
+	uint16_t fnum;
 
-	/* the fnum is in setup[1] */
-	fnum_key = data_blob_const(&trans->in.setup[1], sizeof(trans->in.setup[1]));
+	/* the fnum is in setup[1], a 16 bit value */
+	SSVAL(&fnum, 0, trans->in.setup[1]);
+	fnum_key = data_blob_const(&fnum, 2);
 
 	p = pipe_state_find_key(private, req, &fnum_key);
 	if (!p) {



More information about the samba-cvs mailing list