From owner-p4-projects@FreeBSD.ORG  Sun Jan 15 20:05:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB18D16A422; Sun, 15 Jan 2006 20:05:04 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AC3E916A41F
	for <perforce@freebsd.org>; Sun, 15 Jan 2006 20:05:04 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 669A443D45
	for <perforce@freebsd.org>; Sun, 15 Jan 2006 20:05:04 +0000 (GMT)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0FK54GN012930
	for <perforce@freebsd.org>; Sun, 15 Jan 2006 20:05:04 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0FK54GM012927
	for perforce@freebsd.org; Sun, 15 Jan 2006 20:05:04 GMT
	(envelope-from csjp@freebsd.org)
Date: Sun, 15 Jan 2006 20:05:04 GMT
Message-Id: <200601152005.k0FK54GM012927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89741 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2006 20:05:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=89741

Change 89741 by csjp@csjp_xor on 2006/01/15 20:04:03

	Remove deallocations of the ucred here. The ucred will presist as
	as long as the NFS descriptor will. This simplifies the code.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#24 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#24 (text+ko) ====

@@ -375,8 +375,6 @@
 		len = fxdr_unsigned(int, *tl);
 		if (len < 0 || len > RPCAUTH_UNIXGIDS) {
 			m_freem(mrep);
-			crfree(nd->nd_cr);
-			nd->nd_cr = NULL;
 			return (EBADRPC);
 		}
 		tl = nfsm_dissect_nonblock(u_int32_t *, (len + 2) * NFSX_UNSIGNED);
@@ -391,8 +389,6 @@
 		len = fxdr_unsigned(int, *++tl);
 		if (len < 0 || len > RPCAUTH_MAXSIZ) {
 			m_freem(mrep);
-			crfree(nd->nd_cr);
-			nd->nd_cr = NULL;
 			return (EBADRPC);
 		}
 		if (len > 0)
@@ -400,10 +396,6 @@
 	} else {
 		nd->nd_repstat = (NFSERR_AUTHERR | AUTH_REJECTCRED);
 		nd->nd_procnum = NFSPROC_NOOP;
-		if (nd->nd_cr != NULL) {
-			crfree(nd->nd_cr);
-			nd->nd_cr = NULL;
-		}
 		return (0);
 	}