From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 27 04:05:40 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62CCD1065670; Thu, 27 Sep 2012 04:05:40 +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 4D9398FC0A; Thu, 27 Sep 2012 04:05:40 +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 q8R45eWd048179; Thu, 27 Sep 2012 04:05:40 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R45eBc048176; Thu, 27 Sep 2012 04:05:40 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201209270405.q8R45eBc048176@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Thu, 27 Sep 2012 04:05:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240979 - in stable/9: lib/libc/rpc sys/rpc X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 04:05:40 -0000 Author: pfg Date: Thu Sep 27 04:05:39 2012 New Revision: 240979 URL: http://svn.freebsd.org/changeset/base/240979 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/9/lib/libc/rpc/clnt_vc.c stable/9/sys/rpc/clnt_vc.c Modified: stable/9/lib/libc/rpc/clnt_vc.c ============================================================================== --- stable/9/lib/libc/rpc/clnt_vc.c Thu Sep 27 00:27:58 2012 (r240978) +++ stable/9/lib/libc/rpc/clnt_vc.c Thu Sep 27 04:05:39 2012 (r240979) @@ -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/9/sys/rpc/clnt_vc.c ============================================================================== --- stable/9/sys/rpc/clnt_vc.c Thu Sep 27 00:27:58 2012 (r240978) +++ stable/9/sys/rpc/clnt_vc.c Thu Sep 27 04:05:39 2012 (r240979) @@ -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)); }