CVS commit: src/sys

[Takeshi Nakayama]

Module Name:    src
Committed By:   nakayama
Date:           Sat Nov 24 19:48:25 UTC 2012

Modified Files:
        src/sys/fs/smbfs: smbfs_smb.c
        src/sys/netsmb: smb_smb.c

Log Message:
- fix endian cofusion around FID, which is used as is, so no need
  to do byte swapping.
- put right value to ByteCount of SMB_COM_NT_CREATE_ANDX request.

The fix makes smbfs actually works on big-endian port.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.32 -r1.33 src/sys/netsmb/smb_smb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.42 src/sys/fs/smbfs/smbfs_smb.c:1.43
--- src/sys/fs/smbfs/smbfs_smb.c:1.42	Tue Sep 27 02:05:10 2011
+++ src/sys/fs/smbfs/smbfs_smb.c	Sat Nov 24 19:48:24 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $	*/
+/*	$NetBSD: smbfs_smb.c,v 1.43 2012/11/24 19:48:24 nakayama Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.43 2012/11/24 19:48:24 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -689,7 +689,7 @@ smbfs_smb_create(struct smbnode *dnp, co
 			smb_rq_getreply(rqp, &mdp);
 			md_get_uint8(mdp, &wc);
 			if (wc == 1)
-				md_get_uint16le(mdp, &fid);
+				md_get_uint16(mdp, &fid);
 			else
 				error = EBADRPC;
 		}
@@ -1422,8 +1422,6 @@ smbfs_smb_ntcreatex(struct smbnode *np, 
 	mb_put_uint8(mbp, 0);		/* Security tracking mode flags */
 	smb_rq_wend(rqp);
 	smb_rq_bstart(rqp);
-	smb_rq_bend(rqp);
-	mbp->mb_count = 0;
 
 	error = smbfs_fullpath(mbp, SSTOVC(ssp), np, NULL, 0);
 	if (error)
@@ -1435,6 +1433,7 @@ smbfs_smb_ntcreatex(struct smbnode *np, 
 	flen = mbp->mb_count;
 	SMBRQ_PUTLE16(nmlen, flen);
 
+	smb_rq_bend(rqp);
 	error = smb_rq_simple(rqp);
 	if (error)
 		goto bad;

Index: src/sys/netsmb/smb_smb.c
diff -u src/sys/netsmb/smb_smb.c:1.32 src/sys/netsmb/smb_smb.c:1.33
--- src/sys/netsmb/smb_smb.c:1.32	Sun Oct 18 23:20:31 2009
+++ src/sys/netsmb/smb_smb.c	Sat Nov 24 19:48:25 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $	*/
+/*	$NetBSD: smb_smb.c,v 1.33 2012/11/24 19:48:25 nakayama Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_smb.c,v 1.33 2012/11/24 19:48:25 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -175,7 +175,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st
 					SMBERROR(("Unexpected length of security blob (%d)\n", sblen));
 					break;
 				}
-				error = md_get_uint16(mdp, &bc);
+				error = md_get_uint16le(mdp, &bc);
 				if (error)
 					break;
 				if (sp->sv_caps & SMB_CAP_EXT_SECURITY)
@@ -210,7 +210,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st
 				if (swlen > SMB_MAXCHALLENGELEN)
 					break;
 				md_get_uint16(mdp, NULL);	/* mbz */
-				if (md_get_uint16(mdp, &bc) != 0)
+				if (md_get_uint16le(mdp, &bc) != 0)
 					break;
 				if (bc < swlen)
 					break;