From owner-svn-src-all@FreeBSD.ORG  Sat Nov 29 21:42:14 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29CCE1065686;
	Sat, 29 Nov 2008 21:42:14 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1F5B48FC0C;
	Sat, 29 Nov 2008 21:42:14 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mATLgDVo063183;
	Sat, 29 Nov 2008 21:42:13 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mATLgDqJ063182;
	Sat, 29 Nov 2008 21:42:13 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200811292142.mATLgDqJ063182@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 29 Nov 2008 21:42:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185455 - in releng/7.1/contrib/smbfs: . lib/smb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Nov 2008 21:42:14 -0000

Author: rwatson
Date: Sat Nov 29 21:42:13 2008
New Revision: 185455
URL: http://svn.freebsd.org/changeset/base/185455

Log:
  Merge r185437 from stable/7 to releng/7.1:
  
    Merge r184567 from head to stable/7:
  
      When encoding an smb name, truncate one byte earlier in order than we did
      previously in order to ensure it fit properly in the bufer when encoded.
      This prevents a debugging printf from firing if a source or destination
      host name for an smb mount exceeds 15 characters.
  
      Obtained from:       Apple, Inc.
  
  Approved by:  re (kensmith)

Modified:
  releng/7.1/contrib/smbfs/   (props changed)
  releng/7.1/contrib/smbfs/lib/smb/nb_name.c

Modified: releng/7.1/contrib/smbfs/lib/smb/nb_name.c
==============================================================================
--- releng/7.1/contrib/smbfs/lib/smb/nb_name.c	Sat Nov 29 21:20:07 2008	(r185454)
+++ releng/7.1/contrib/smbfs/lib/smb/nb_name.c	Sat Nov 29 21:42:13 2008	(r185455)
@@ -169,7 +169,7 @@ nb_name_encode(struct nb_name *np, u_cha
 		memsetw(cp + 2, NB_NAMELEN - 1, NBENCODE(' '));
 		cp += NB_ENCNAMELEN;
 	} else {
-		for (i = 0; *name && i < NB_NAMELEN; i++, cp += 2, name++)
+		for (i = 0; *name && i < NB_NAMELEN - 1; i++, cp += 2, name++)
 			*(u_short*)cp = NBENCODE(toupper(*name));
 		i = NB_NAMELEN - i - 1;
 		if (i > 0) {