From owner-svn-src-all@FreeBSD.ORG  Thu Sep 27 04:06:21 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6F87B106566B;
	Thu, 27 Sep 2012 04:06:21 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 598218FC0A;
	Thu, 27 Sep 2012 04:06:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8R46LBB048316;
	Thu, 27 Sep 2012 04:06:21 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R46LPE048313;
	Thu, 27 Sep 2012 04:06:21 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201209270406.q8R46LPE048313@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 27 Sep 2012 04:06:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240980 - in stable/8: lib/libc/rpc sys/rpc
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: Thu, 27 Sep 2012 04:06:21 -0000

Author: pfg
Date: Thu Sep 27 04:06:20 2012
New Revision: 240980
URL: http://svn.freebsd.org/changeset/base/240980

Log:
  MFC	240880:
  
  Revert a change from Bull's NFSv4 libtirpc implementation:
  
  libtirpc: be sure to free cl_netid and cl_tp
  
  This change is causing rpc.lockd to exit after startup.
  
  Reported by:	David Wolfskill

Modified:
  stable/8/lib/libc/rpc/clnt_vc.c
  stable/8/sys/rpc/clnt_vc.c
Directory Properties:
  stable/8/lib/libc/rpc/   (props changed)
  stable/8/sys/rpc/   (props changed)

Modified: stable/8/lib/libc/rpc/clnt_vc.c
==============================================================================
--- stable/8/lib/libc/rpc/clnt_vc.c	Thu Sep 27 04:05:39 2012	(r240979)
+++ stable/8/lib/libc/rpc/clnt_vc.c	Thu Sep 27 04:06:20 2012	(r240980)
@@ -672,10 +672,6 @@ clnt_vc_destroy(cl)
 	if (ct->ct_addr.buf)
 		free(ct->ct_addr.buf);
 	mem_free(ct, sizeof(struct ct_data));
-	if (cl->cl_netid && cl->cl_netid[0])
-		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
-	if (cl->cl_tp && cl->cl_tp[0])
-		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
 	mem_free(cl, sizeof(CLIENT));
 	mutex_unlock(&clnt_fd_lock);
 	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);

Modified: stable/8/sys/rpc/clnt_vc.c
==============================================================================
--- stable/8/sys/rpc/clnt_vc.c	Thu Sep 27 04:05:39 2012	(r240979)
+++ stable/8/sys/rpc/clnt_vc.c	Thu Sep 27 04:06:20 2012	(r240980)
@@ -836,10 +836,6 @@ clnt_vc_destroy(CLIENT *cl)
 		soclose(so);
 	}
 	mem_free(ct, sizeof(struct ct_data));
-	if (cl->cl_netid && cl->cl_netid[0])
-		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
-	if (cl->cl_tp && cl->cl_tp[0])
-		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
 	mem_free(cl, sizeof(CLIENT));
 }