From owner-svn-src-head@FreeBSD.ORG  Mon Jan 25 18:35:58 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CF971065692;
	Mon, 25 Jan 2010 18:35:58 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BF1E8FC28;
	Mon, 25 Jan 2010 18:35:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PIZwJO044481;
	Mon, 25 Jan 2010 18:35:58 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0PIZwOS044479;
	Mon, 25 Jan 2010 18:35:58 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201001251835.o0PIZwOS044479@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 25 Jan 2010 18:35:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202980 - head/contrib/smbfs/smbutil
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2010 18:35:59 -0000

Author: yongari
Date: Mon Jan 25 18:35:58 2010
New Revision: 202980
URL: http://svn.freebsd.org/changeset/base/202980

Log:
  shi1_remark is in little endian format, convert it to host ordering.
  Also remove upper 16bits which always seem to be 0xFFFF. We don't
  allocate more than 64KB buffer anyway.
  This change make smbutil work on sparc64.
  
  Reviewed by:	marius, bp
  Approved by:	bp

Modified:
  head/contrib/smbfs/smbutil/view.c

Modified: head/contrib/smbfs/smbutil/view.c
==============================================================================
--- head/contrib/smbfs/smbutil/view.c	Mon Jan 25 18:15:10 2010	(r202979)
+++ head/contrib/smbfs/smbutil/view.c	Mon Jan 25 18:35:58 2010	(r202980)
@@ -69,6 +69,7 @@ cmd_view(int argc, char *argv[])
 	struct smb_ctx sctx, *ctx = &sctx;
 	struct smb_share_info_1 *rpbuf, *ep;
 	char *cp;
+	u_int32_t remark;
 	u_int16_t type;
 	int error, opt, bufsize, i, entries, total;
 	
@@ -117,11 +118,13 @@ cmd_view(int argc, char *argv[])
 	}
 	for (ep = rpbuf, i = 0; i < entries; i++, ep++) {
 		type = le16toh(ep->shi1_type);
+		remark = le32toh(ep->shi1_remark);
+		remark &= 0xFFFF;
 
-		cp = (char*)rpbuf + ep->shi1_remark;
+		cp = (char*)rpbuf + remark;
 		printf("%-12s %-10s %s\n", ep->shi1_netname,
 		    shtype[min(type, sizeof shtype / sizeof(char *) - 1)],
-		    ep->shi1_remark ? nls_str_toloc(cp, cp) : "");
+		    remark ? nls_str_toloc(cp, cp) : "");
 	}
 	printf("\n%d shares listed from %d available\n", entries, total);
 	free(rpbuf);