svn commit: r240979 - in stable/9: lib/libc/rpc sys/rpc

[Pedro F. Giffuni]

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));
 }