Date: Sat, 29 Nov 2008 21:42:13 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r185455 - in releng/7.1/contrib/smbfs: . lib/smb Message-ID: <200811292142.mATLgDqJ063182@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811292142.mATLgDqJ063182>