From owner-svn-src-all@FreeBSD.ORG  Sun Apr  4 07:02:10 2010
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 D19251065673;
	Sun,  4 Apr 2010 07:02:10 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C18DA8FC16;
	Sun,  4 Apr 2010 07:02:10 +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 o3472Aid031485;
	Sun, 4 Apr 2010 07:02:10 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3472AZW031483;
	Sun, 4 Apr 2010 07:02:10 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201004040702.o3472AZW031483@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sun, 4 Apr 2010 07:02:10 +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: r206152 - head/lib/libc/net
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: Sun, 04 Apr 2010 07:02:10 -0000

Author: ume
Date: Sun Apr  4 07:02:10 2010
New Revision: 206152
URL: http://svn.freebsd.org/changeset/base/206152

Log:
  Stop adding trailing '\n'.  The servent_unpack() doesn't expect
  lines terminated with '\n'.
  
  MFC after:	2 weeks

Modified:
  head/lib/libc/net/getservent.c

Modified: head/lib/libc/net/getservent.c
==============================================================================
--- head/lib/libc/net/getservent.c	Sat Apr  3 23:51:41 2010	(r206151)
+++ head/lib/libc/net/getservent.c	Sun Apr  4 07:02:10 2010	(r206152)
@@ -594,15 +594,13 @@ nis_servent(void *retval, void *mdata, v
 			break;
 		};
 
-		/* we need a room for additional \n symbol */
-		if (bufsize <=
-		    resultbuflen + 1 + _ALIGNBYTES + sizeof(char *)) {
+		if (bufsize <= resultbuflen + _ALIGNBYTES + sizeof(char *)) {
 			*errnop = ERANGE;
 			rv = NS_RETURN;
 			break;
 		}
 
-		aliases = (char **)_ALIGN(&buffer[resultbuflen + 2]);
+		aliases = (char **)_ALIGN(&buffer[resultbuflen + 1]);
 		aliases_size =
 		    (buffer + bufsize - (char *)aliases) / sizeof(char *);
 		if (aliases_size < 1) {
@@ -611,13 +609,8 @@ nis_servent(void *retval, void *mdata, v
 			break;
 		}
 
-		/*
-		 * servent_unpack expects lines terminated with \n --
-		 * make it happy
-		 */
 		memcpy(buffer, resultbuf, resultbuflen);
-		buffer[resultbuflen] = '\n';
-		buffer[resultbuflen + 1] = '\0';
+		buffer[resultbuflen] = '\0';
 
 		if (servent_unpack(buffer, serv, aliases, aliases_size,
 		    errnop) != 0) {